[jhbuild] [2.28, devel] clean clutter related modules (GNOME bug 591236)

[Frederic Peters <fpeters src gnome org>]

commit fb2977963230326bf66afb1c8f97d120e8204fbe
Author: Frédéric Péters <fpeters 0d be>
Date:   Sun Aug 9 17:57:59 2009 +0200

    [2.28,devel] clean clutter related modules (GNOME bug 591236)

 modulesets/gnome-2.28.modules                |   73 +++----------------------
 modulesets/gnome-devel.modules               |   27 ----------
 modulesets/gnome-external-deps-devel.modules |   21 +++++++-
 3 files changed, 29 insertions(+), 92 deletions(-)
---
diff --git a/modulesets/gnome-2.28.modules b/modulesets/gnome-2.28.modules
index 8605866..f53aaa4 100644
--- a/modulesets/gnome-2.28.modules
+++ b/modulesets/gnome-2.28.modules
@@ -50,7 +50,7 @@
   <repository type="git" name="git.freedesktop.org"
       href="git://anongit.freedesktop.org/git/"/>
   <repository type="bzr" name="launchpad.net"
-      href="http://bazaar.launchpad.net/"/>
+      href="http://code.launchpad.net/"/>
   <repository type="bzr" name="bzr.burtonini.com"
       href="http://burtonini.com/bzr/"/>
   <repository type="svn" name="elisa.code.fluendo.com"
@@ -511,7 +511,7 @@
   </autotools>
 
   <autotools id="cluttermm">
-    <branch revision="cluttermm-0.8"/>
+    <branch/>
     <dependencies>
       <dep package="clutter"/>
       <dep package="pangomm"/>
@@ -1253,27 +1253,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-trunk">
-    <branch repo="git.clutter-project.org" module="clutter"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gtk-doc"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="clutter-gst-trunk">
-    <branch repo="git.clutter-project.org" module="clutter-gst"/>
-    <dependencies>
-      <dep package="clutter-trunk"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="clutter-gst">
-    <branch repo="svn.o-hand.com" module="clutter/branches/clutter-gst-0-8"/>
+    <branch repo="git.clutter-project.org" module="clutter-gst"/>
     <dependencies>
       <dep package="clutter"/>
       <dep package="gstreamer"/>
@@ -1281,35 +1262,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-gtk-trunk">
-    <branch repo="git.clutter-project.org" module="clutter-gtk"/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="clutter-trunk"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="clutter-box2d-trunk">
+  <autotools id="clutter-box2d">
     <branch repo="git.clutter-project.org" module="clutter-box2d"/>
     <dependencies>
-      <dep package="clutter-trunk"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="pyclutter-trunk">
-    <branch repo="git.clutter-project.org" module="bindings/pyclutter"/>
-    <dependencies>
-      <dep package="pycairo"/>
-      <dep package="pygtk"/>
-      <dep package="gst-python"/>
-      <dep package="clutter-trunk"/>
-      <dep package="clutter-gst-trunk"/>
-      <dep package="clutter-gtk-trunk"/>
+      <dep package="clutter"/>
     </dependencies>
   </autotools>
 
   <autotools id="pyclutter">
-    <branch repo="svn.o-hand.com" module="clutter/branches/pyclutter-0-8"/>
+    <branch repo="git.clutter-project.org" module="bindings/pyclutter" checkoutdir="pyclutter"/>
     <dependencies>
       <dep package="pycairo"/>
       <dep package="pygtk"/>
@@ -1320,17 +1281,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-vala-trunk">
-    <branch repo="git.clutter-project.org" module="bindings/clutter-vala"/>
-    <dependencies>
-      <dep package="clutter-trunk"/>
-      <dep package="clutter-gtk-trunk"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="clutter-vala">
-    <branch repo="svn.o-hand.com" module="clutter/branches/clutter-vala-0-8"/>
+    <branch repo="git.clutter-project.org" module="bindings/clutter-vala"/>
     <dependencies>
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
@@ -1352,13 +1304,6 @@
     </dependencies>
   </metamodule>
 
-  <metamodule id="meta-clutter-python">
-    <dependencies>
-      <dep package="meta-clutter-suite"/>
-      <dep package="pyclutter"/>
-    </dependencies>
-  </metamodule>
-
   <metamodule id="meta-clutter-vala">
     <dependencies>
       <dep package="meta-clutter-suite"/>
@@ -2110,7 +2055,7 @@
 
  <autotools id="netbook-remix-launcher">
     <branch repo="launchpad.net"
-            module="~netbook-remix-team/netbook-remix-launcher/clutter-0-8-intrepid"
+            module="~netbook-remix-team/netbook-remix-launcher/trunk"
             checkoutdir="netbook-remix-launcher"/>
     <dependencies>
       <dep package="clutter-gtk"/>
@@ -2175,7 +2120,7 @@
       <dep package="gconf"/>
       <dep package="intltool"/>
       <dep package="zenity"/>
-      <dep package="clutter-trunk"/>
+      <dep package="clutter"/>
       <dep package="gobject-introspection"/>
       <dep package="gir-repository"/>
     </dependencies>
diff --git a/modulesets/gnome-devel.modules b/modulesets/gnome-devel.modules
index 02624b5..ea35bf4 100644
--- a/modulesets/gnome-devel.modules
+++ b/modulesets/gnome-devel.modules
@@ -49,16 +49,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter">
-    <branch repo="git.clutter-project.org"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gtk-doc"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="clutter-gst">
     <branch repo="git.clutter-project.org"/>
     <dependencies>
@@ -68,22 +58,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-cairo">
-    <branch repo="git.clutter-project.org"/>
-    <dependencies>
-      <dep package="clutter"/>
-      <dep package="cairo"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="clutter-gtk">
-    <branch repo="git.clutter-project.org"/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="clutter"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="pyclutter">
     <branch repo="git.clutter-project.org" module="bindings/pyclutter" checkoutdir="pyclutter"/>
     <dependencies>
@@ -101,7 +75,6 @@
     <branch repo="git.clutter-project.org" module="bindings/clutter-vala"/>
     <dependencies>
       <dep package="clutter"/>
-      <dep package="clutter-cairo"/>
       <dep package="clutter-gtk"/>
       <dep package="vala"/>
     </dependencies>
diff --git a/modulesets/gnome-external-deps-devel.modules b/modulesets/gnome-external-deps-devel.modules
index 8d0664d..fd577c8 100644
--- a/modulesets/gnome-external-deps-devel.modules
+++ b/modulesets/gnome-external-deps-devel.modules
@@ -51,6 +51,8 @@
       href="git://git.gitorious.org/"/>
   <repository type="git" name="git.debian.org"
       href="git://git.debian.org/"/>
+  <repository type="git" name="git.clutter-project.org"
+      href="git://git.clutter-project.org/"/>
 
   <repository type="bzr" name="mega-nerd.com"
       href="http://www.mega-nerd.com/Bzr/"/>
@@ -532,7 +534,6 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="clutter"/>
-      <dep package="clutter-cairo"/>
       <dep package="cairo"/>
       <dep package="sqlite3"/>
     </dependencies>
@@ -550,4 +551,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="clutter">
+    <branch repo="git.clutter-project.org"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gtk-doc"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="clutter-gtk">
+    <branch repo="git.clutter-project.org"/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="clutter"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>