[jhbuild] [2.28] sync with release team decisions on new modules

[Frederic Peters <fpeters src gnome org>]

commit 7c3acf614d58617e2dc32c796937c76ff76a011c
Author: Frédéric Péters <fpeters 0d be>
Date:   Mon Jul 20 09:15:26 2009 +0200

    [2.28] sync with release team decisions on new modules
    
    http://mail.gnome.org/archives/release-team/2009-July/msg00037.html

 modulesets/gnome-2.28.modules               |   52 +++++------------
 modulesets/gnome-external-deps-2.28.modules |   12 +++-
 modulesets/gnome-suites-2.28.modules        |   84 +++++++++++++++------------
 3 files changed, 70 insertions(+), 78 deletions(-)
---
diff --git a/modulesets/gnome-2.28.modules b/modulesets/gnome-2.28.modules
index 0eeb239..9347a0f 100644
--- a/modulesets/gnome-2.28.modules
+++ b/modulesets/gnome-2.28.modules
@@ -129,19 +129,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-bluetooth">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="glib"/>
-      <dep package="libbtctl"/>
-      <dep package="libglade"/>
-      <dep package="libgnomeui"/>
-      <dep package="gconf"/>
-      <dep package="gob2"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="phonemgr">
     <branch/>
     <dependencies>
@@ -2053,13 +2040,6 @@
             size="203504" md5="83dbde4d77e8baf0176fe4291d8a2303"/>
   </autotools>
 
-  <autotools id="gobject-introspection">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gir-repository">
     <branch/>
     <dependencies>
@@ -2256,23 +2236,6 @@
    </dependencies>
   </autotools>
 
-  <autotools id="gnome-js-common">
-    <branch/>
-    <suggests>
-      <dep package="seed"/>
-      <dep package="gjs"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="seed">
-    <branch/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-      <dep package="WebKit"/>
-      <dep package="gnome-js-common"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="nautilus-cd-burner">
     <branch/>
     <dependencies>
@@ -2438,6 +2401,19 @@
       <dep package="NetworkManager"/>
       <dep package="libnotify"/>
     </suggests>
-  </autotools> 
+  </autotools>
+
+  <autotools id="krb5-auth-dialog">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+      <dep package="glib"/>
+      <dep package="gconf"/>
+    </dependencies>
+    <suggests>
+      <dep package="libnotify"/>
+    </suggests>
+  </autotools>
 
 </moduleset>
diff --git a/modulesets/gnome-external-deps-2.28.modules b/modulesets/gnome-external-deps-2.28.modules
index a7a62ad..24a3f8a 100644
--- a/modulesets/gnome-external-deps-2.28.modules
+++ b/modulesets/gnome-external-deps-2.28.modules
@@ -845,8 +845,6 @@
     </dependencies>
   </tarball>
 
-  <!-- Proposed external dependencies -->
-
   <autotools id="WebKit" autogenargs="--enable-video=yes --enable-gnomekeyring=yes"
       makefile="GNUmakefile">
     <branch repo="webkitgtk.org"
@@ -892,4 +890,14 @@
             md5sum="a086de99cc536095684d87f15594e4db" size="37372"/>
   </distutils>
 
+  <tarball id="libgdata" version="0.3.0">
+    <source href="http://download.gnome.org/sources/libgdata/0.3/libgdata-0.3.0.tar.bz2";
+            md5sum="54c4de90fd00cd6685cbdd8c5054abb7" size="520977"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </tarball>
+
 </moduleset>
diff --git a/modulesets/gnome-suites-2.28.modules b/modulesets/gnome-suites-2.28.modules
index 5595a8f..37b39ac 100644
--- a/modulesets/gnome-suites-2.28.modules
+++ b/modulesets/gnome-suites-2.28.modules
@@ -610,6 +610,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-bluetooth">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="glib"/>
+      <dep package="gconf"/>
+      <dep package="libunique"/>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
     <branch/>
     <dependencies>
@@ -625,6 +636,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-disk-utility">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-keyring"/>
+      <dep package="libunique"/>
+      <dep package="libnotify"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-doc-utils">
     <branch/>
     <dependencies>
@@ -1545,6 +1567,30 @@
     </dependencies>
   </waf>
 
+  <autotools id="gobject-introspection">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-js-common">
+    <branch/>
+    <suggests>
+      <dep package="seed"/>
+      <dep package="gjs"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="seed">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="WebKit"/>
+      <dep package="gnome-js-common"/>
+    </dependencies>
+  </autotools>
+
 <!-- Admin -->
 
   <autotools id="pessulus">
@@ -1696,41 +1742,6 @@
 
 <!-- Proposed Modules -->
 
-  <autotools id="gnome-disk-utility">
-    <branch/>
-    <dependencies>
-      <dep package="PolicyKit-gnome"/>
-      <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-      <dep package="gnome-keyring"/>
-      <dep package="libunique"/>
-      <dep package="libnotify"/>
-      <!-- and libsexy, unapproved dependency -->
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgdata">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libxml2"/>
-      <dep package="libsoup"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="krb5-auth-dialog">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-      <dep package="glib"/>
-      <dep package="gconf"/>
-    </dependencies>
-    <suggests>
-      <dep package="libnotify"/>
-    </suggests>
-  </autotools>
-
 <!-- Meta Modules -->
 
   <metamodule id="meta-gnome-devel-platform-upcoming-deprecations">
@@ -1943,9 +1954,6 @@
 
   <metamodule id="meta-gnome-proposed">
     <dependencies>
-      <dep package="gnome-disk-utility"/>
-      <dep package="libgdata"/>
-      <dep package="krb5-auth-dialog"/>
     </dependencies>
   </metamodule>