[jhbuild] [2.30] Update for new modules

[Vincent Untz <vuntz src gnome org>]

commit 3fc6536c7dee1a99c90feb4b47ec2ca13e262c2b
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Nov 9 23:25:39 2009 +0100

    [2.30] Update for new modules
    
    Move gnome-packagekit and nautilus-sendto from gnome to gnome-suites.
    Move tracker and val from gnome to gnome-external-deps.
    Drop gmime-2-2 and raptor from gnome.

 modulesets/gnome-2.30.modules               |   85 ---------------------------
 modulesets/gnome-external-deps-2.30.modules |   36 +++++++++++
 modulesets/gnome-suites-2.30.modules        |   30 +++++++++
 3 files changed, 66 insertions(+), 85 deletions(-)
---
diff --git a/modulesets/gnome-2.30.modules b/modulesets/gnome-2.30.modules
index a7a32f2..a36758f 100644
--- a/modulesets/gnome-2.30.modules
+++ b/modulesets/gnome-2.30.modules
@@ -194,23 +194,6 @@
     </dependencies>
   </autotools>      
 
-  <autotools id="nautilus-sendto">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libglade"/>
-      <dep package="gconf"/>
-      <dep package="nautilus"/>
-    </dependencies>
-    <suggests>
-      <dep package="evolution-data-server"/>
-      <dep package="dbus-glib"/>
-      <dep package="gupnp-av"/>
-      <dep package="empathy"/>
-    </suggests>
-  </autotools>      
-
   <autotools id="nautilus-vcs">
     <branch/>
     <dependencies>
@@ -1026,53 +1009,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gmime-2-2">
-    <branch module="gmime"
-            revision="gmime-2-2" />
-    <dependencies>
-      <dep package="gtk-doc"/>
-      <dep package="glib"/>
-    </dependencies>
-    <after>
-      <dep package="gtk-sharp"/>
-    </after>
-  </autotools>
-
-  <tarball id="raptor" version="1.4.18">
-    <source href="http://download.librdf.org/source/raptor-1.4.18.tar.gz";
-            hash="sha256:edfdb0734fb7120bf1cbb60e45a07864db2daaadf5c3591ccf7357f244d82a40"
-            md5sum="284e768eeda0e2898b0d5bf7e26a016e" size="1657246"/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="libxslt"/>
-    </dependencies>
-  </tarball>
-
-  <autotools id="tracker">
-    <branch revision="tracker-0.6"/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gmime-2-2"/>
-      <dep package="dbus-glib"/>
-      <dep package="libgnomeui"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libglade"/>
-      <dep package="gnome-vfs"/>
-      <dep package="poppler"/>
-      <dep package="libgsf"/>
-      <dep package="gstreamer"/>
-      <dep package="sqlite3"/>
-      <dep package="vala"/>
-    </dependencies>
-    <suggests>
-      <dep package="exempi"/>
-      <dep package="raptor"/>
-    </suggests>
-    <after>
-      <dep package="deskbar-applet"/>
-    </after>
-  </autotools>
-
  <autotools id="nemiver">
     <branch/>
     <dependencies>
@@ -1257,16 +1193,6 @@
     </dependencies>
   </autotools>
 
-  <tarball id="vala" version="0.7.6" autogenargs="--enable-vapigen">
-    <source
-href="http://ftp.gnome.org/pub/GNOME/sources/vala/0.7/vala-0.7.6.tar.bz2";
-            hash="sha256:2c33ca0aa2646ba9f73b114c2a83fbea6a97e9b77cec94ecff3a5d68c340f083"
-            md5sum="1453b2ce04bc83685505f33a025ba5a4" size="1880130"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </tarball>
-
   <!-- External deps that you MUST have installed in order -->
   <!-- to compile vala from trunk                          -->
   <!--                                                     -->
@@ -1619,17 +1545,6 @@ href="http://ftp.gnome.org/pub/GNOME/sources/vala/0.7/vala-0.7.6.tar.bz2";
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-packagekit">
-    <branch/>
-    <dependencies>
-      <dep package="PackageKit"/>
-      <dep package="gtk+"/>
-      <dep package="gconf"/>
-      <dep package="libglade"/>
-      <dep package="libnotify"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gtkmm-documentation">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-external-deps-2.30.modules b/modulesets/gnome-external-deps-2.30.modules
index a32d772..d87f512 100644
--- a/modulesets/gnome-external-deps-2.30.modules
+++ b/modulesets/gnome-external-deps-2.30.modules
@@ -1041,4 +1041,40 @@
     </dependencies>
   </tarball>
 
+  <tarball id="tracker" version="0.7.6">
+    <source href="http://download.gnome.org/sources/tracker/0.7/tracker-0.7.6.tar.bz2";
+            hash="sha256:13c1f9d4d513b7bcdd9ca5a351cc7a5e876d8e30be1f703165c916d1aef99f78"
+            md5sum="5d977712ef40be67e7aec79304040f91" size="1562667"/>
+    <dependencies>
+      <dep package="DeviceKit-power"/>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gstreamer"/>
+      <dep package="hal"/>
+      <dep package="intltool"/>
+      <dep package="libgsf"/>
+      <dep package="poppler"/>
+      <dep package="sqlite3"/>
+      <dep package="vala"/>
+    </dependencies>
+    <suggests>
+      <dep package="evolution"/>
+      <dep package="exempi"/>
+      <dep package="libnotify"/>
+    </suggests>
+    <after>
+      <dep package="deskbar-applet"/>
+    </after>
+  </tarball>
+
+  <tarball id="vala" version="0.7.8" autogenargs="--enable-vapigen">
+    <source
+href="http://ftp.gnome.org/pub/GNOME/sources/vala/0.7/vala-0.7.8.tar.bz2";
+            hash="sha256:b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747"
+            md5sum="accd0d350c6d6de7527a0a65c40f8be2" size="1949627"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </tarball>
+
 </moduleset>
diff --git a/modulesets/gnome-suites-2.30.modules b/modulesets/gnome-suites-2.30.modules
index e6c1022..2015f83 100644
--- a/modulesets/gnome-suites-2.30.modules
+++ b/modulesets/gnome-suites-2.30.modules
@@ -752,6 +752,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-packagekit">
+    <branch/>
+    <dependencies>
+      <dep package="PackageKit"/>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="libglade"/>
+      <dep package="libnotify"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-panel">
     <branch/>
     <dependencies>
@@ -1188,6 +1199,23 @@
     </after>
   </autotools>
 
+  <autotools id="nautilus-sendto">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libglade"/>
+      <dep package="gconf"/>
+      <dep package="nautilus"/>
+    </dependencies>
+    <suggests>
+      <dep package="evolution-data-server"/>
+      <dep package="dbus-glib"/>
+      <dep package="gupnp-av"/>
+      <dep package="empathy"/>
+    </suggests>
+  </autotools>
+
   <autotools id="orca">
     <branch/>
     <dependencies>
@@ -1794,6 +1822,7 @@
       <dep package="gnome-mag"/>
       <dep package="gnome-media"/>
       <dep package="gnome-menus"/>
+      <dep package="gnome-packagekit"/>
       <dep package="gnome-panel"/>
       <dep package="gnome-power-manager"/>
       <dep package="gnome-python-desktop"/>
@@ -1827,6 +1856,7 @@
       <dep package="metacity"/>
       <dep package="mousetweaks"/>
       <dep package="nautilus"/>
+      <dep package="nautilus-sendto"/>
       <dep package="orca"/>
       <dep package="hamster-applet"/>
       <dep package="pygtksourceview"/>