[java-libglom] Update jhbuild moduleset for Ubuntu 10.04.

[Benjamin Konrath <bkonrath src gnome org>]

commit 37eb0924ea229ae08d46b63c899b62d949cc8d66
Author: Ben Konrath <ben bagu org>
Date:   Fri Dec 2 11:34:46 2011 +0100

    Update jhbuild moduleset for Ubuntu 10.04.
    
    * tools/build/java-libglom-ubuntu-10.04-libglom-only.modules: Remove
    sigc++. Downgrade glib and glibmm to 2.30.x. Use libglom-1-20 branch.

 ChangeLog                                          |    7 +++++++
 .../java-libglom-ubuntu-10.04-libglom-only.modules |   16 ++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bb2f975..127364e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-02  Ben Konrath  <ben bagu org>
+
+	Update jhbuild moduleset for Ubuntu 10.04.
+
+	* tools/build/java-libglom-ubuntu-10.04-libglom-only.modules: Remove
+	sigc++. Downgrade glib and glibmm to 2.30.x. Use libglom-1-20 branch.
+
 2011-12-02  Murray Cumming  <murrayc murrayc com>
 
 	Ignore an awkward new method in the Glom master branch.
diff --git a/tools/build/java-libglom-ubuntu-10.04-libglom-only.modules b/tools/build/java-libglom-ubuntu-10.04-libglom-only.modules
index 0e64487..b81c67c 100644
--- a/tools/build/java-libglom-ubuntu-10.04-libglom-only.modules
+++ b/tools/build/java-libglom-ubuntu-10.04-libglom-only.modules
@@ -29,15 +29,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="sigc++">
-    <branch repo="ftp.gnome.org" module="libsigc++/2.2/libsigc++-2.2.10.tar.xz" version="2.2.10"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="glib">
-    <branch repo="ftp.gnome.org" module="glib/2.31/glib-2.31.2.tar.xz" version="2.31.2"/>
+    <branch repo="ftp.gnome.org" module="glib/2.30/glib-2.30.1.tar.bz2" version="2.30.1"/>
     <dependencies>
       <dep package="autoconf"/>
     </dependencies>
@@ -138,11 +131,10 @@
   </autotools>
 
   <autotools id="glibmm" autogenargs="--disable-documentation">
-    <branch repo="ftp.gnome.org"  module="glibmm/2.31/glibmm-2.31.2.tar.xz" version="2.31.2"/>
+    <branch repo="ftp.gnome.org"  module="glibmm/2.30/glibmm-2.30.0.tar.bz2" version="2.30.0"/>
     <dependencies>
       <dep package="mm-common"/>
       <dep package="glib"/>
-      <dep package="sigc++"/>
     </dependencies>
   </autotools>
 
@@ -166,8 +158,8 @@
   </autotools>
 
   <autotools id="glom" autogenargs="--disable-documentation --enable-glom-ui=no">
-   <!-- <branch repo="ftp.gnome.org"  module="glom/1.20/glom-1.20.0.tar.xz" version="1.20.0"/> -->
-   <branch />
+   <!-- <branch repo="ftp.gnome.org"  module="glom/1.20/glom-1.20.1.tar.xz" version="1.20.1"/> -->
+    <branch revision="glom-1-20" />
     <dependencies>
       <dep package="mm-common"/>
       <dep package="libepc"/>