[jhbuild] [3.0] move pyclutter to external deps; add caribou as proposed module

[Frederic Peters <fpeters src gnome org>]

commit 8f072204a86d729132365d124155c33f9e220c29
Author: Frédéric Péters <fpeters 0d be>
Date:   Tue May 4 21:03:40 2010 +0200

    [3.0] move pyclutter to external deps; add caribou as proposed module

 modulesets/gnome-3.0.modules               |   12 ------------
 modulesets/gnome-external-deps-3.0.modules |   12 ++++++++++++
 modulesets/gnome-suites-3.0.modules        |    9 +++++++++
 3 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/modulesets/gnome-3.0.modules b/modulesets/gnome-3.0.modules
index 0f11df6..fffc5e7 100644
--- a/modulesets/gnome-3.0.modules
+++ b/modulesets/gnome-3.0.modules
@@ -1267,18 +1267,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="pyclutter">
-    <branch repo="git.clutter-project.org" module="bindings/pyclutter" checkoutdir="pyclutter"/>
-    <dependencies>
-      <dep package="pycairo"/>
-      <dep package="pygtk"/>
-      <dep package="gst-python"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gst"/>
-      <dep package="clutter-gtk"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="clutter-vala">
     <branch repo="git.clutter-project.org" module="bindings/clutter-vala"/>
     <dependencies>
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index a0c7117..5b6d80b 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -98,6 +98,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="pyclutter">
+    <branch module="pyclutter/1.0/pyclutter-1.0.2.tar.gz" version="1.0.2"
+            repo="clutter-project.org"
+            hash="sha256:46c305bc231e76a51261705ae003ac2a8d5711110538319165ba53ccf85f8037"
+            md5sum="4aa01573c8900587702e8102e02c14e6" size="628308"/>
+    <dependencies>
+      <dep package="pygtk"/>
+      <dep package="pycairo"/>
+      <dep package="clutter"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="dbus" supports-non-srcdir-builds="no">
     <branch module="dbus/dbus-1.2.16.tar.gz" version="1.2.16"
 	    repo="dbus"
diff --git a/modulesets/gnome-suites-3.0.modules b/modulesets/gnome-suites-3.0.modules
index f8114b4..31f3bec 100644
--- a/modulesets/gnome-suites-3.0.modules
+++ b/modulesets/gnome-suites-3.0.modules
@@ -1865,6 +1865,14 @@
     </dependencies>
   </autotools>
 
+  <autotools id="caribou">
+    <branch/>
+    <dependencies>
+      <dep package="pygtk"/>
+      <dep package="pyclutter"/>
+    </dependencies>
+  </autotools>
+
 <!-- Meta Modules -->
 
   <metamodule id="meta-gnome-devel-platform-upcoming-deprecations">
@@ -2096,6 +2104,7 @@
       <dep package="gnome-color-manager"/>
       <dep package="zeitgeist"/>
       <dep package="gnome-icon-theme-symbolic"/>
+      <dep package="caribou"/>
       <!-- also proposed, not yet enabled:
       <dep package="rygel"/>
       <dep package="pdfmod"/>