[jhbuild] Rename libgda to libgda-4 and remove pygda

[Murray Cumming <murrayc src gnome org>]

commit 3656ae9cc999aa75b02b7f5656e80794e6a4b91e
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jun 17 20:45:25 2011 +0200

    Rename libgda to libgda-4 and remove pygda
    
    This leaves the duplicate libgda as the newer one from git master.
    pygda is useless now that we have PyGObject+Introspection,
    and gnome-python-extras stopped using libgda a while ago.

 modulesets/gnome-apps-3.2.modules                  |    4 ++--
 modulesets/gnome-world-3.2.modules                 |    9 ---------
 modulesets/gnome2/gnome-2.30.modules               |    1 -
 modulesets/gnome2/gnome-2.32.modules               |    1 -
 modulesets/gnome2/gnome-external-deps-2.32.modules |    2 +-
 modulesets/gnome2/gnome-suites-2.32.modules        |    2 +-
 6 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.2.modules b/modulesets/gnome-apps-3.2.modules
index 170d68d..4a1d272 100644
--- a/modulesets/gnome-apps-3.2.modules
+++ b/modulesets/gnome-apps-3.2.modules
@@ -247,7 +247,7 @@
     </suggests>
   </tarball>
 
-  <tarball id="libgda" version="4.2.4" autogenargs="--with-java=no --disable-introspection">
+  <tarball id="libgda-4" version="4.2.4" autogenargs="--with-java=no --disable-introspection">
     <source href="http://download.gnome.org/sources/libgda/4.2/libgda-4.2.4.tar.bz2";
             hash="sha256:3bdbd81b606be212b57c68a83d2d271b25edc725bf68f4150708ba82b47ca449"
             md5sum="dbff943b8c7c14fc22e0cb85cc8216e6" size="15088721"/>
@@ -719,7 +719,7 @@
       <dep package="gtk+"/>
       <dep package="vte"/>
       <dep package="gdl"/>
-      <dep package="libgda"/>
+      <dep package="libgda-4"/>
       <dep package="gtksourceview"/>
     </dependencies>
     <suggests>
diff --git a/modulesets/gnome-world-3.2.modules b/modulesets/gnome-world-3.2.modules
index 6ce9ef0..ba4d9c6 100644
--- a/modulesets/gnome-world-3.2.modules
+++ b/modulesets/gnome-world-3.2.modules
@@ -186,7 +186,6 @@
       <dep package="pygtk"/>
       <dep package="gtkhtml2"/>
       <dep package="gdl"/>
-      <dep package="libgda"/>
     </dependencies>
   </autotools>
 
@@ -720,14 +719,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="pygda">
-    <branch/>
-    <dependencies>
-      <dep package="pygobject"/>
-      <dep package="libgda"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="glom">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome2/gnome-2.30.modules b/modulesets/gnome2/gnome-2.30.modules
index 38a46c0..bff9293 100644
--- a/modulesets/gnome2/gnome-2.30.modules
+++ b/modulesets/gnome2/gnome-2.30.modules
@@ -899,7 +899,6 @@
       <dep package="libgdamm"/>
       <dep package="iso-codes"/>
       <dep package="pygobject"/>
-      <dep package="gnome-python-extras"/> <!-- For pygda -->
       <dep package="gtksourceviewmm"/>
       <dep package="gnome-doc-utils"/>
       <dep package="goocanvasmm"/>
diff --git a/modulesets/gnome2/gnome-2.32.modules b/modulesets/gnome2/gnome-2.32.modules
index 32d5d90..b1a51cd 100644
--- a/modulesets/gnome2/gnome-2.32.modules
+++ b/modulesets/gnome2/gnome-2.32.modules
@@ -177,7 +177,6 @@
       <dep package="gnome-python"/>
       <dep package="gtkhtml2"/>
       <dep package="gdl"/>
-      <dep package="libgda"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome2/gnome-external-deps-2.32.modules b/modulesets/gnome2/gnome-external-deps-2.32.modules
index eb78289..c8388a4 100644
--- a/modulesets/gnome2/gnome-external-deps-2.32.modules
+++ b/modulesets/gnome2/gnome-external-deps-2.32.modules
@@ -966,7 +966,7 @@
     </dependencies>
   </tarball>
     
-  <tarball id="libgda" version="4.2.0" autogenargs="--with-java=no --disable-introspection">
+  <tarball id="libgda-4" version="4.2.0" autogenargs="--with-java=no --disable-introspection">
     <source href="http://download.gnome.org/sources/libgda/4.2/libgda-4.2.0.tar.bz2";
             hash="sha256:2e639957f50719957cea5326b0d95511794322a54f9ef8547d3241f409765441"
             md5sum="4b00c2b61430b2a0ea00e0332d1e8ef4" size="13932542"/>
diff --git a/modulesets/gnome2/gnome-suites-2.32.modules b/modulesets/gnome2/gnome-suites-2.32.modules
index f0efdd8..9636b28 100644
--- a/modulesets/gnome2/gnome-suites-2.32.modules
+++ b/modulesets/gnome2/gnome-suites-2.32.modules
@@ -1709,7 +1709,7 @@
       <dep package="vte"/>
       <dep package="gdl"/>
       <dep package="autogen"/>
-      <dep package="libgda"/>
+      <dep package="libgda-4"/>
       <dep package="libunique"/>
     </dependencies>
     <suggests>