[jhbuild] [3.0] add a bunch of proposed modules

[Frederic Peters <fpeters src gnome org>]

commit 0569915ac5bc75ca11a4228e5f4f8f73d4aac96e
Author: Frédéric Péters <fpeters 0d be>
Date:   Sat May 1 10:51:51 2010 +0200

    [3.0] add a bunch of proposed modules
    
    (including gobject-introspection (GNOME bug 617200))

 modulesets/gnome-3.0.modules               |   51 ---------------
 modulesets/gnome-external-deps-3.0.modules |   20 +++---
 modulesets/gnome-suites-3.0.modules        |   92 ++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 60 deletions(-)
---
diff --git a/modulesets/gnome-3.0.modules b/modulesets/gnome-3.0.modules
index 1a4be2b..0f11df6 100644
--- a/modulesets/gnome-3.0.modules
+++ b/modulesets/gnome-3.0.modules
@@ -1928,16 +1928,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gjs">
-    <branch/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-    <after>
-      <dep package="gir-repository"/>
-    </after>
-  </autotools>
-
   <!-- ########## Ubuntu Netbook Remix Modules ########## -->
 
   <autotools id="maximus">
@@ -2018,28 +2008,6 @@
 
   <!-- ########## End of Ubuntu Netbook Remix Modules ########## -->
 
-  <autotools id="mutter" autogenargs="--with-clutter">
-    <branch />
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="gconf"/>
-      <dep package="intltool"/>
-      <dep package="zenity"/>
-      <dep package="clutter"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gir-repository"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-shell">
-    <branch/>
-    <dependencies>
-      <dep package="mutter"/>
-      <dep package="gjs"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="almanah">
     <branch/>
     <dependencies>
@@ -2161,17 +2129,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-zeitgeist">
-    <branch repo="launchpad.net"
-            module="~gnome-zeitgeist/gnome-zeitgeist/gnome-zeitgeist"
-            checkoutdir="gnome-zeitgeist"/>
-    <dependencies>
-      <dep package="pygtk"/>
-      <dep package="sqlite3"/>
-      <dep package="dbus-python"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="niepce">
     <branch/>
     <dependencies>
@@ -2392,14 +2349,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-color-manager">
-    <branch/>
-    <dependencies>
-      <dep package="libunique"/>
-      <dep package="vte"/>
-    </dependencies>
-  </autotools>
-
   <waf id="ardour" waf-command="./waf">
     <branch repo="svn.ardour.org" module="ardour2/branches/3.0" checkoutdir="ardour-3.0"/>
     <dependencies>
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index 28908e6..0dcbca1 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -1024,15 +1024,6 @@
     </suggests>
   </tarball>
 
-  <tarball id="gobject-introspection" version="0.6.7">
-    <source href="http://download.gnome.org/sources/gobject-introspection/0.6/gobject-introspection-0.6.7.tar.bz2";
-            hash="sha256:c97ca4e978b0583999775640e9e9f97b64a5880ad2a6adc3ce903207b616f24a"
-            md5sum="41205c14cbd86632806578448e29bd30" size="579956"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </tarball>
-
   <tarball id="PackageKit" version="0.6.2" autogenargs="--disable-tests --disable-qt">
     <source href="http://www.packagekit.org/releases/PackageKit-0.6.2.tar.bz2";
             hash="sha256:4502d04adb53ea087f3d7c6b7d393f3e3f2735fdde818144c6c0c140d2e39816"
@@ -1083,4 +1074,15 @@ href="http://ftp.gnome.org/pub/GNOME/sources/vala/0.7/vala-0.7.10.tar.bz2";
     </dependencies>
   </tarball>
 
+  <!-- new external dependencies -->
+  <tarball id="raptor" version="1.4.21">
+    <source href="http://download.librdf.org/source/raptor-1.4.21.tar.gz";
+            hash="sha256:db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca"
+            md5sum="992061488af7a9e2d933df6b694bb876" size="1651843"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+    </dependencies>
+  </tarball>
+
 </moduleset>
diff --git a/modulesets/gnome-suites-3.0.modules b/modulesets/gnome-suites-3.0.modules
index 139d742..0b3d949 100644
--- a/modulesets/gnome-suites-3.0.modules
+++ b/modulesets/gnome-suites-3.0.modules
@@ -13,6 +13,7 @@
       href="svn://anonsvn.mono-project.com/source/"/>
   <repository type="git" name="github.com" href="git://github.com/"/>
   <repository type="git" name="o-hand.com" href="git://git.o-hand.com/"/>
+  <repository type="bzr" name="launchpad.net" href=""/>
 
 <!-- This is a special module: it's needed to build from svn, but not
      needed to build from tarballs, so it doesn't need to be in our suites
@@ -1786,6 +1787,83 @@
 
 <!-- Proposed Modules -->
 
+  <autotools id="gobject-introspection">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mutter" autogenargs="--with-clutter">
+    <branch />
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="intltool"/>
+      <dep package="zenity"/>
+      <dep package="clutter"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-shell">
+    <branch/>
+    <dependencies>
+      <dep package="mutter"/>
+      <dep package="gjs"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gjs">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="mozilla"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mousetrap">
+    <branch/>
+    <dependencies>
+      <dep package="pygtk"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-color-manager">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gconf"/>
+      <dep package="libunique"/>
+      <dep package="vte"/>
+      <dep package="dbus-glib"/>
+      <dep package="libnotify"/>
+      <!-- and gudev, and lcms -->
+    </dependencies>
+  </autotools>
+
+  <autotools id="zeitgeist">
+    <branch repo="launchpad.net"
+            module="lp:zeitgeist"
+            checkoutdir="zeitgeist"/>
+    <dependencies>
+      <dep package="pygtk"/>
+      <dep package="sqlite3"/>
+      <dep package="dbus-python"/>
+      <dep package="raptor"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-icon-theme-symbolic">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-common"/>
+      <dep package="icon-naming-utils"/>
+    </dependencies>
+  </autotools>
+
 <!-- Meta Modules -->
 
   <metamodule id="meta-gnome-devel-platform-upcoming-deprecations">
@@ -2009,6 +2087,20 @@
 
   <metamodule id="meta-gnome-proposed">
     <dependencies>
+      <dep package="gnome-shell"/>
+      <dep package="mutter"/>
+      <dep package="gjs"/>
+      <dep package="gobject-introspection"/>
+      <dep package="mousetrap"/>
+      <dep package="gnome-color-manager"/>
+      <dep package="zeitgeist"/>
+      <dep package="gnome-icon-theme-symbolic"/>
+      <!-- also proposed, not yet enabled:
+      <dep package="rygel"/>
+      <dep package="pdfmod"/>
+      <dep package="deja-dup"/>
+      <dep package="simple-scan"/>
+      -->
     </dependencies>
   </metamodule>