jhbuild r1947 - in trunk: . modulesets

[murrayc svn gnome org]

Author: murrayc
Date: Sun Mar 16 14:10:17 2008
New Revision: 1947
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1947&view=rev

Log:
2008-03-16  Murray Cumming  <murrayc murrayc com>

* modulesets/gnome-2.22.modules:
* modulesets/gnome-2.24.modules: Added libgdamm-3.0 and made Glom 
depend on it instead of libgdamm trunk.


Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-2.22.modules
   trunk/modulesets/gnome-2.24.modules

Modified: trunk/modulesets/gnome-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-2.22.modules	(original)
+++ trunk/modulesets/gnome-2.22.modules	Sun Mar 16 14:10:17 2008
@@ -420,18 +420,25 @@
       <dep package="gtkmm"/>
     </dependencies>
   </autotools>
- <autotools id="libgdamm">
-    <branch repo="svn.gnomemm" />
+  <autotools id="libgdamm-3.0">
+    <branch repo="svn.gnomemm" module="libgdamm" revision="libgdamm-3-0"/>
     <dependencies>
       <dep package="gtkmm"/>
       <dep package="libgda-3-0"/>
     </dependencies>
   </autotools>
+  <autotools id="libgdamm">
+    <branch repo="svn.gnomemm" />
+    <dependencies>
+      <dep package="gtkmm"/>
+      <dep package="libgda"/>
+    </dependencies>
+  </autotools>
   <autotools id="libgnomedbmm">
     <branch repo="svn.gnomemm" />
     <dependencies>
       <dep package="gtkmm"/>
-      <dep package="libgdamm"/>
+      <dep package="libgdamm-3.0"/>
     </dependencies>
   </autotools>
   <autotools id="gtkmm_hello">
@@ -826,7 +833,7 @@
   <autotools id="glom">
     <branch/>
     <dependencies>
-      <dep package="libgdamm"/>
+      <dep package="libgdamm-3.0"/>
       <dep package="bakery"/>
       <dep package="libgnome"/>
       <dep package="iso-codes"/>

Modified: trunk/modulesets/gnome-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-2.24.modules	(original)
+++ trunk/modulesets/gnome-2.24.modules	Sun Mar 16 14:10:17 2008
@@ -408,20 +408,25 @@
       <dep package="gtkmm"/>
     </dependencies>
   </autotools>
-
- <autotools id="libgdamm">
-    <branch repo="svn.gnomemm" />
+  <autotools id="libgdamm-3.0">
+    <branch repo="svn.gnomemm" module="libgdamm" revision="libgdamm-3-0"/>
     <dependencies>
       <dep package="gtkmm"/>
       <dep package="libgda-3-0"/>
     </dependencies>
   </autotools>
-
+  <autotools id="libgdamm">
+    <branch repo="svn.gnomemm" />
+    <dependencies>
+      <dep package="gtkmm"/>
+      <dep package="libgda"/>
+    </dependencies>
+  </autotools>
   <autotools id="libgnomedbmm">
     <branch repo="svn.gnomemm" />
     <dependencies>
       <dep package="gtkmm"/>
-      <dep package="libgdamm"/>
+      <dep package="libgdamm-3.0"/>
     </dependencies>
   </autotools>
 
@@ -867,7 +872,7 @@
   <autotools id="glom">
     <branch/>
     <dependencies>
-      <dep package="libgdamm"/>
+      <dep package="libgdamm-3.0"/>
       <dep package="bakery"/>
       <dep package="libgnome"/>
       <dep package="iso-codes"/>