[jhbuild] [3.0] Bump autogen to 5.9.9, move to gnome-3.0 (GNOME bug 626369)

[Craig Keogh <cskeogh src gnome org>]

commit c9cb5f954d7e452bd68628c6227ce49c0359541e
Author: Craig Keogh <cskeogh adam com au>
Date:   Wed Nov 17 21:34:26 2010 +1030

    [3.0] Bump autogen to 5.9.9, move to gnome-3.0 (GNOME bug 626369)
    
    Based on patch by Thorsten Sick.
    Autogen is not a blessed dependency as per:
    http://live.gnome.org/TwoPointNinetyone/ExternalDependencies
    Moved autogen to gnome-3.0.
    autogen 5.10.2 and 5.11.1 do not build due to autogen's libopt link
    issues.

 modulesets/gnome-3.0.modules               |    7 +++++++
 modulesets/gnome-external-deps-3.0.modules |    6 ------
 modulesets/gnome-suites-3.0.modules        |    1 +
 3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-3.0.modules b/modulesets/gnome-3.0.modules
index 3400df9..73f9742 100644
--- a/modulesets/gnome-3.0.modules
+++ b/modulesets/gnome-3.0.modules
@@ -1519,6 +1519,13 @@
     </dependencies>
   </autotools>
 
+  <!--autogen 5.10.2 and 5.11.1 do not build due to autogen's libopt link
+      issues -->
+  <tarball id="autogen" version="5.9.9">
+    <source href="http://downloads.sourceforge.net/project/autogen/AutoGen/Obsolete-AutoGen-5.9.9/autogen-5.9.9.tar.bz2";
+            size="1054713"/>
+  </tarball>
+
   <autotools id="banshee" autogenargs="--disable-daap --disable-boo --disable-ipod --disable-mtp">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index 8bc454d..2752ce7 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -647,12 +647,6 @@
             md5sum="aff487543845a82fe262e6e2922b4c8e" size="318349"/>
   </tarball>
 
-  <tarball id="autogen" version="5.8.4">
-    <source href="http://internap.dl.sourceforge.net/sourceforge/autogen/autogen-5.8.4.tar.bz2";
-            hash="sha256:854731a72e37efb62b3226d64fb2b856c2122fa8f813e5073c6e629e62d05ed7"
-            md5sum="b65d4b9e3ddbcfd5418b708858c05b66" size="931015"/>
-  </tarball>
-
   <!-- Mono Binding -->
 
   <autotools id="libgdiplus">
diff --git a/modulesets/gnome-suites-3.0.modules b/modulesets/gnome-suites-3.0.modules
index 7d79743..78411c6 100644
--- a/modulesets/gnome-suites-3.0.modules
+++ b/modulesets/gnome-suites-3.0.modules
@@ -1871,6 +1871,7 @@
       <dep package="glade3"/>
       <dep package="devhelp"/>
       <dep package="vala"/>
+      <dep package="autogen"/>
     </suggests>
   </autotools>