jhbuild r2490 - in trunk: . modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Sun Nov  9 20:11:12 2008
New Revision: 2490
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2490&view=rev

Log:
* modulesets/gnome-2.26.modules: renamed clutter trunk modules to
-trunk, removed -0.8 from the module name for the stable branches; to
match what existed in gnome-external-deps.



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-2.26.modules

Modified: trunk/modulesets/gnome-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-2.26.modules	(original)
+++ trunk/modulesets/gnome-2.26.modules	Sun Nov  9 20:11:12 2008
@@ -520,7 +520,7 @@
   </autotools>
 
   <autotools id="cluttermm">
-    <branch repo="svn.gnomemm" />
+    <branch repo="svn.gnomemm" module="cluttermm" revision="cluttermm-0.8"/>
     <dependencies>
       <dep package="clutter"/>
       <dep package="pangomm"/>
@@ -1342,7 +1342,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter">
+  <autotools id="clutter-trunk">
     <branch repo="svn.o-hand.com" module="clutter/trunk/clutter"/>
     <dependencies>
       <dep package="glib"/>
@@ -1351,25 +1351,16 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-0.8">
-    <branch repo="svn.o-hand.com" module="clutter/branches/clutter-0-8"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gtk-doc"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="clutter-gst">
+  <autotools id="clutter-gst-trunk">
     <branch repo="svn.o-hand.com" module="clutter/trunk/clutter-gst"/>
     <dependencies>
-      <dep package="clutter"/>
+      <dep package="clutter-trunk"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-gst-0.8">
+  <autotools id="clutter-gst">
     <branch repo="svn.o-hand.com" module="clutter/branches/clutter-gst-0-8"/>
     <dependencies>
       <dep package="clutter"/>
@@ -1378,15 +1369,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-cairo">
+  <autotools id="clutter-cairo-trunk">
     <branch repo="svn.o-hand.com" module="clutter/trunk/clutter-cairo"/>
     <dependencies>
-      <dep package="clutter"/>
+      <dep package="clutter-trunk"/>
       <dep package="cairo"/>
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-cairo-0.8">
+  <autotools id="clutter-cairo">
     <branch repo="svn.o-hand.com" module="clutter/branches/clutter-cairo-0-8"/>
     <dependencies>
       <dep package="clutter"/>
@@ -1394,15 +1385,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-gtk">
+  <autotools id="clutter-gtk-trunk">
     <branch repo="svn.o-hand.com"  module="clutter/trunk/clutter-gtk"/>
     <dependencies>
       <dep package="gtk+"/>
-      <dep package="clutter"/>
+      <dep package="clutter-trunk"/>
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-gtk-0.8">
+  <autotools id="clutter-gtk">
     <branch repo="svn.o-hand.com" module="clutter/branches/clutter-gtk-0-8"/>
     <dependencies>
       <dep package="gtk+"/>
@@ -1410,27 +1401,27 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-box2d">
+  <autotools id="clutter-box2d-trunk">
     <branch repo="svn.o-hand.com" module="clutter/trunk/clutter-box2d"/>
     <dependencies>
-      <dep package="clutter"/>
+      <dep package="clutter-trunk"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pyclutter">
+  <autotools id="pyclutter-trunk">
     <branch repo="svn.o-hand.com" module="clutter/trunk/bindings/pyclutter"/>
     <dependencies>
       <dep package="pycairo"/>
       <dep package="pygtk"/>
       <dep package="gst-python"/>
-      <dep package="clutter"/>
-      <dep package="clutter-gst"/>
-      <dep package="clutter-cairo"/>
-      <dep package="clutter-gtk"/>
+      <dep package="clutter-trunk"/>
+      <dep package="clutter-gst-trunk"/>
+      <dep package="clutter-cairo-trunk"/>
+      <dep package="clutter-gtk-trunk"/>
     </dependencies>
   </autotools>
 
-  <autotools id="pyclutter=0.8">
+  <autotools id="pyclutter">
     <branch repo="svn.o-hand.com" module="clutter/branches/pyclutter-0-8"/>
     <dependencies>
       <dep package="pycairo"/>
@@ -1443,17 +1434,17 @@
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-vala">
+  <autotools id="clutter-vala-trunk">
     <branch repo="svn.o-hand.com" module="clutter/trunk/bindings/clutter-vala"/>
     <dependencies>
-      <dep package="clutter"/>
-      <dep package="clutter-cairo"/>
-      <dep package="clutter-gtk"/>
+      <dep package="clutter-trunk"/>
+      <dep package="clutter-cairo-trunk"/>
+      <dep package="clutter-gtk-trunk"/>
       <dep package="vala"/>
     </dependencies>
   </autotools>
 
-  <autotools id="clutter-vala-0.8">
+  <autotools id="clutter-vala">
     <branch repo="svn.o-hand.com" module="clutter/branches/clutter-vala-0-8"/>
     <dependencies>
       <dep package="clutter"/>