[jhbuild] libgda: Split into libgda-5.2 and libgda-6.0.

[Murray Cumming <murrayc src gnome org>]

commit cefe4ed00f6b9147d87244a7df7201abe5a79127
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Dec 9 09:44:51 2014 +0100

    libgda: Split into libgda-5.2 and libgda-6.0.
    
    Anjuta still uses libgda 5 but Glom uses libgda 6.

 modulesets/gnome-apps-3.16.modules |   17 +++++++++++++++--
 modulesets/gnome-world.modules     |    2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.16.modules b/modulesets/gnome-apps-3.16.modules
index cf606de..e63a79b 100644
--- a/modulesets/gnome-apps-3.16.modules
+++ b/modulesets/gnome-apps-3.16.modules
@@ -198,7 +198,7 @@
     </suggests>
  </autotools>
 
-  <autotools id="libgda" autogenargs="--with-java=no --disable-tools --enable-gda-gi --enable-gdaui-gi 
--enable-vala --enable-gdaui-vala">
+  <autotools id="libgda-5.2" 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>
@@ -212,6 +212,19 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgda-6.0" 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>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libxml2"/>
+      <dep package="openssl"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libosinfo"
              autogenargs="--enable-tests=no --enable-werror=no">
     <branch repo="fedorahosted.org" module="libosinfo.git"/>
@@ -490,7 +503,7 @@
       <dep package="gtk+"/>
       <dep package="vte"/>
       <dep package="gdl"/>
-      <dep package="libgda"/>
+      <dep package="libgda-5.2"/>
       <dep package="gtksourceview"/>
       <dep package="yelp-tools"/>
     </dependencies>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 2eef2fe..d5d0a3a 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -761,7 +761,7 @@
     <branch/>
     <dependencies>
       <dep package="gtkmm"/>
-      <dep package="libgda"/>
+      <dep package="libgda-6.0"/>
     </dependencies>
   </autotools>