[jhbuild] 3.16: Use libgda instead libgda-6.0 to track libgda master

[Javier Jardón <jjardon src gnome org>]

commit 05cfbb53846867c623ef23be89d0a04c46113010
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Dec 16 01:11:44 2014 +0000

    3.16: Use libgda instead libgda-6.0 to track libgda master

 modulesets/gnome-apps-3.16.modules |    4 ++--
 modulesets/gnome-world.modules     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.16.modules b/modulesets/gnome-apps-3.16.modules
index af91e92..4960ca3 100644
--- a/modulesets/gnome-apps-3.16.modules
+++ b/modulesets/gnome-apps-3.16.modules
@@ -212,11 +212,11 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgda-6.0" autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi 
--enable-vala --enable-gdaui-vala">
+  <autotools id="libgda"
+             autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi --enable-vala 
--enable-gdaui-vala">
     <if condition-set="freebsd">
       <autogenargs value="LIBCRYPTO_CFLAGS=' ' LIBCRYPTO_LIBS='-lcrypto' --with-bdb=/usr/local 
--with-bdb-libdir-name=lib/db5 --with-bdb-includedir-name=include/db5"/>
     </if>
-    <branch checkoutdir="libgda-6.0" module="libgda"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index d5d0a3a..2eef2fe 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -761,7 +761,7 @@
     <branch/>
     <dependencies>
       <dep package="gtkmm"/>
-      <dep package="libgda-6.0"/>
+      <dep package="libgda"/>
     </dependencies>
   </autotools>