[jhbuild] [3.0] renamed gnome-desktop-3 to gnome-desktop, moved -2 as -2, in world

[Frederic Peters <fpeters src gnome org>]

commit dbbc59b847e18d581f138bd8ec1b2debc0ebdb34
Author: Frédéric Péters <fpeters 0d be>
Date:   Thu Mar 17 23:21:42 2011 +0100

    [3.0] renamed gnome-desktop-3 to gnome-desktop, moved -2 as -2, in world

 modulesets/gnome-apps-3.0.modules        |   16 +---------------
 modulesets/gnome-suites-core-3.0.modules |   20 ++++++++++----------
 modulesets/gnome-world-3.0.modules       |   18 ++++++++++++++++--
 3 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.0.modules b/modulesets/gnome-apps-3.0.modules
index c3ebd20..5872bd4 100644
--- a/modulesets/gnome-apps-3.0.modules
+++ b/modulesets/gnome-apps-3.0.modules
@@ -75,20 +75,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
-    <branch revision="gnome-2-32"/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="gconf"/>
-      <dep package="startup-notification"/>
-      <dep package="rarian"/>
-      <dep package="gnome-doc-utils"/>
-      <dep package="gvfs"/> <!-- gvfs-copy used in autogen.sh -->
-    </dependencies>
-  </autotools>
-
   <autotools id="goffice">
     <branch/>
     <dependencies>
@@ -741,7 +727,7 @@
       <dep package="gtk+-3"/>
       <dep package="evolution-data-server"/>
       <dep package="gtkhtml"/>
-      <dep package="gnome-desktop-3"/>
+      <dep package="gnome-desktop"/>
       <dep package="gnome-doc-utils"/>
       <dep package="libcanberra"/>
       <dep package="libical"/>
diff --git a/modulesets/gnome-suites-core-3.0.modules b/modulesets/gnome-suites-core-3.0.modules
index 329998a..6fa6da8 100644
--- a/modulesets/gnome-suites-core-3.0.modules
+++ b/modulesets/gnome-suites-core-3.0.modules
@@ -97,7 +97,7 @@
       <dep package="iso-codes"/>
       <dep package="glib"/>
       <dep package="gtk+-3"/>
-      <dep package="gnome-desktop-3"/>
+      <dep package="gnome-desktop"/>
       <dep package="libxml2"/>
       <dep package="gnome-menus"/>
       <dep package="libgnomekbd"/>
@@ -115,8 +115,8 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-desktop-3" autogenargs="--with-gnome-distributor=JHBuild">
-    <branch checkoutdir="gnome-desktop-3" module="gnome-desktop"/>
+  <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -219,7 +219,7 @@
       <dep package="gtk+-3"/>
       <dep package="dbus-glib"/>
       <dep package="gnome-menus"/>
-      <dep package="gnome-desktop-3"/>
+      <dep package="gnome-desktop"/>
       <dep package="libgnomekbd"/>
     </dependencies>
     <suggests>
@@ -251,7 +251,7 @@
       <dep package="glib"/>
       <dep package="gtk+-3"/>
       <dep package="gconf"/>
-      <dep package="gnome-desktop-3"/>
+      <dep package="gnome-desktop"/>
       <dep package="libgnomekbd"/>
       <dep package="gnome-doc-utils"/>
       <dep package="dbus-glib"/>
@@ -270,7 +270,7 @@
       <dep package="intltool"/>
       <dep package="gconf"/>
       <dep package="gjs"/>
-      <dep package="gnome-desktop-3"/>
+      <dep package="gnome-desktop"/>
       <dep package="gnome-menus"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gobject-introspection"/>
@@ -428,7 +428,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gnome-desktop-3"/>
+      <dep package="gnome-desktop"/>
       <dep package="libwnck-3"/>
       <dep package="evolution-data-server"/>
       <dep package="gnome-menus"/>
@@ -476,7 +476,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gtk+-3"/>
-      <dep package="gnome-desktop-3"/>
+      <dep package="gnome-desktop"/>
       <dep package="gnome-icon-theme"/>
       <dep package="libpeas"/>
     </dependencies>
@@ -597,7 +597,7 @@
       <dep package="gtk+-3"/>
       <dep package="pango"/>
       <dep package="libxml2"/>
-      <dep package="gnome-desktop-3"/>
+      <dep package="gnome-desktop"/>
       <dep package="gsettings-desktop-schemas"/>
     </dependencies>
     <suggests>
@@ -838,7 +838,7 @@
       <dep package="evolution-data-server"/>
       <dep package="gnome-bluetooth"/>
       <dep package="gnome-control-center"/>
-      <dep package="gnome-desktop-3"/>
+      <dep package="gnome-desktop"/>
       <dep package="gnome-icon-theme"/>
       <dep package="gnome-icon-theme-symbolic"/>
       <dep package="gnome-icon-theme-extras"/>
diff --git a/modulesets/gnome-world-3.0.modules b/modulesets/gnome-world-3.0.modules
index 39ed1c9..bf4f102 100644
--- a/modulesets/gnome-world-3.0.modules
+++ b/modulesets/gnome-world-3.0.modules
@@ -122,6 +122,20 @@
   <include href="gnome-apps-3.0.modules"/>
   <include href="gnome-suites-core-3.0.modules"/>
 
+  <autotools id="gnome-desktop-2" autogenargs="--with-gnome-distributor=JHBuild">
+    <branch revision="gnome-2-32"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="gconf"/>
+      <dep package="startup-notification"/>
+      <dep package="rarian"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="gvfs"/> <!-- gvfs-copy used in autogen.sh -->
+    </dependencies>
+  </autotools>
+
   <autotools id="cairo-gtk-engine">
     <branch repo="cairo.freedesktop.org"/>
     <dependencies>
@@ -1421,7 +1435,7 @@
             checkoutdir="go-home-applet"/>
     <dependencies>
       <dep package="gnome-panel"/>
-      <dep package="gnome-desktop"/>
+      <dep package="gnome-desktop-2"/>
       <dep package="gconf"/>
       <dep package="libwnck"/>
       <dep package="gtk+"/>
@@ -1436,7 +1450,7 @@
       <dep package="clutter-gtk"/>
       <dep package="clutter"/>
       <dep package="startup-notification"/>
-      <dep package="gnome-desktop"/>
+      <dep package="gnome-desktop-2"/>
       <dep package="gnome-menus"/>
       <dep package="libwnck"/>
       <dep package="gconf"/>