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

[Benjamin Konrath <bkonrath src gnome org>]

commit 566ebe56c02b9b16c3930fc39042b64ab7f27824
Author: Ben Konrath <ben bagu org>
Date:   Wed Nov 30 15:27:22 2011 +0100

    Update jhbuild moduleset for Ubuntu 11.10.
    
    * tools/build/java-libglom-ubuntu-11.10-with-glom-ui.modules: Remove
    mm-common. Bump versions of libgda and libgdamm. Use libglom-1-20
    branch.

 ChangeLog                                          |    8 ++++++++
 .../java-libglom-ubuntu-11.10-with-glom-ui.modules |   17 ++++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ad8f593..7dbfe86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-11-30  Ben Konrath  <ben bagu org>
 
+	Update jhbuild moduleset for Ubuntu 11.10.
+
+	* tools/build/java-libglom-ubuntu-11.10-with-glom-ui.modules: Remove
+	mm-common. Bump versions of libgda and libgdamm. Use libglom-1-20
+	branch.
+
+2011-11-30  Ben Konrath  <ben bagu org>
+
 	Bump libglom requirement to 1.20.1.
 
 	* configure.ac:
diff --git a/tools/build/java-libglom-ubuntu-11.10-with-glom-ui.modules b/tools/build/java-libglom-ubuntu-11.10-with-glom-ui.modules
index ed36868..0341d3d 100644
--- a/tools/build/java-libglom-ubuntu-11.10-with-glom-ui.modules
+++ b/tools/build/java-libglom-ubuntu-11.10-with-glom-ui.modules
@@ -2,6 +2,7 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <!-- vim:set ts=2 expandtab: -->
+
 <moduleset>
   <repository type="git" name="git.gnome.org" default="yes"
     href="git://git.gnome.org/"/>
@@ -10,10 +11,6 @@
   <repository type="tarball" name="ftp.gnome.org"
     href="http://ftp.gnome.org/pub/gnome/sources/"/>
 
-  <autotools id="mm-common">
-    <branch repo="ftp.gnome.org" module="mm-common/0.9/mm-common-0.9.5.tar.bz2" version="0.9.5"/>
-  </autotools>
-
   <autotools id="goocanvas" autogenargs="--enable-python=no">
     <branch repo="ftp.gnome.org" module="goocanvas/2.0/goocanvas-2.0.1.tar.bz2" version="2.0.1"/>
   </autotools>
@@ -22,15 +19,11 @@
     <branch repo="ftp.gnome.org" module="goocanvasmm/1.90/goocanvasmm-1.90.8.tar.bz2" version="1.90.8"/>
     <dependencies>
       <dep package="goocanvas"/>
-      <dep package="mm-common"/>
     </dependencies>
   </autotools>
 
   <autotools id="gtksourceviewmm">
     <branch repo="ftp.gnome.org" module="gtksourceviewmm/3.2/gtksourceviewmm-3.2.0.tar.bz2" version="3.2.0"/>
-    <dependencies>
-      <dep package="mm-common"/>
-    </dependencies>
   </autotools>
 
   <autotools id="libepc">
@@ -38,21 +31,19 @@
   </autotools>
 
   <autotools id="libgda" autogenargs="--with-java=no --with-postgres --enable-introspection --enable-gi-system-install=no">
-    <branch repo="ftp.gnome.org"  module="libgda/5.0/libgda-5.0.1.tar.bz2" version="5.0.1"/>
+    <branch repo="ftp.gnome.org"  module="libgda/5.0/libgda-5.0.2.tar.xz" version="5.0.2"/>
   </autotools>
 
   <autotools id="libgdamm" autogenargs="--disable-documentation">
-    <branch repo="ftp.gnome.org" module="libgdamm/4.99/libgdamm-4.99.5.tar.bz2" version="4.99.5"/>
+    <branch repo="ftp.gnome.org" module="libgdamm/4.99/libgdamm-4.99.6.tar.xz" version="4.99.6"/>
     <dependencies>
       <dep package="libgda"/>
-      <dep package="mm-common"/>
     </dependencies>
   </autotools>
 
   <autotools id="glom" autogenargs="--disable-documentation">
-    <branch />
+    <branch revision="glom-1-20" />
     <dependencies>
-      <dep package="mm-common"/>
       <dep package="libepc"/>
       <dep package="libgdamm"/>
       <dep package="gtksourceviewmm"/>