[jhbuild] [3.0] More alphabetical and move wnck to deps

[William Jon McCann <mccann src gnome org>]

commit c3fea111e99a35cb871b966d04fadea03ef62db4
Author: William Jon McCann <jmccann redhat com>
Date:   Sat Oct 16 19:45:43 2010 -0400

    [3.0] More alphabetical and move wnck to deps

 modulesets/gnome-suites-core-3.0.modules      |   51 +++++++----------
 modulesets/gnome-suites-core-deps-3.0.modules |   73 ++++++++++++++-----------
 2 files changed, 63 insertions(+), 61 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.0.modules b/modulesets/gnome-suites-core-3.0.modules
index 20d6aa7..a4ad737 100644
--- a/modulesets/gnome-suites-core-3.0.modules
+++ b/modulesets/gnome-suites-core-3.0.modules
@@ -19,6 +19,7 @@
 
 <!-- Please try to keep organized alphabetically by section -->
 
+
 <!-- Core User Shell -->
 
   <autotools id="at-spi2-core">
@@ -426,19 +427,6 @@
 
 <!-- Fallback Shell -->
 
-  <autotools id="notification-daemon">
-    <branch/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="gconf"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="libwnck"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gconf" autogenargs="--enable-gtk --with-gtk=3.0">
     <branch/>
     <dependencies>
@@ -454,13 +442,25 @@
     </suggests>
   </autotools>
 
-  <autotools id="libwnck">
+  <autotools id="gnome-panel">
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="startup-notification"/>
+      <dep package="rarian"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libwnck"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gnome-menus"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="dbus-glib"/>
+      <dep package="librsvg"/>
+      <dep package="libgweather"/>
+      <dep package="libcanberra"/>
     </dependencies>
+    <suggests>
+      <dep package="polkit"/>
+      <dep package="libbonoboui"/>
+    </suggests>
   </autotools>
 
   <autotools id="metacity">
@@ -476,25 +476,16 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-panel">
+  <autotools id="notification-daemon">
     <branch/>
     <dependencies>
-      <dep package="intltool"/>
-      <dep package="rarian"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libwnck"/>
-      <dep package="evolution-data-server"/>
-      <dep package="gnome-menus"/>
-      <dep package="gnome-doc-utils"/>
+      <dep package="dbus"/>
       <dep package="dbus-glib"/>
-      <dep package="librsvg"/>
-      <dep package="libgweather"/>
+      <dep package="gconf"/>
+      <dep package="glib"/>
+      <dep package="gtk+-3"/>
       <dep package="libcanberra"/>
     </dependencies>
-    <suggests>
-      <dep package="polkit"/>
-      <dep package="libbonoboui"/>
-    </suggests>
   </autotools>
 
 
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index 0c07403..5d340f0 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -1129,6 +1129,7 @@
     </dependencies>
   </autotools>
 
+
   <!-- OS Core Services dependencies -->
 
   <autotools id="libnl" skip-autogen="never" autogen-sh="configure">
@@ -1139,38 +1140,8 @@
     </branch>
   </autotools>
 
-  <!-- Deprecated dependencies -->
-
-  <autotools id="libglade">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libgnome-keyring">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="dbus"/>
-      <dep package="libgcrypt"/>
-    </dependencies>
-  </autotools>
 
-  <autotools id="libgweather">
-    <branch revision="gnome-2-30"/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="libxml2"/>
-      <dep package="gconf"/>
-      <dep package="gtk+"/>
-      <dep package="libsoup"/>
-    </dependencies>
-    <suggests>
-      <dep package="pygobject"/>
-    </suggests>
-  </autotools>
+  <!-- Deprecated dependencies -->
 
   <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
     <branch revision="gnome-2-32"/>
@@ -1223,6 +1194,37 @@
     </dependencies>
   </tarball>
 
+  <autotools id="libglade">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgnome-keyring">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="dbus"/>
+      <dep package="libgcrypt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgweather">
+    <branch revision="gnome-2-30"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="libxml2"/>
+      <dep package="gconf"/>
+      <dep package="gtk+"/>
+      <dep package="libsoup"/>
+    </dependencies>
+    <suggests>
+      <dep package="pygobject"/>
+    </suggests>
+  </autotools>
+
   <autotools id="libIDL">
     <branch/>
     <dependencies>
@@ -1240,6 +1242,15 @@
     </dependencies>
   </tarball>
 
+  <autotools id="libwnck">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="startup-notification"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="ORBit2">
     <branch/>
     <dependencies>