[jhbuild] [2.32,3.0] Move accepted modules where they belong

[Vincent Untz <vuntz src gnome org>]

commit 1bf14f5db912f59a4f305c36c11b2c5dbbaa785a
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Aug 4 15:18:53 2010 +0200

    [2.32,3.0] Move accepted modules where they belong
    
    Also move gnome-shell/mutter to gnome instead of gnome-suites for 2.32.

 modulesets/gnome-2.32.modules        |   24 ++++++
 modulesets/gnome-suites-2.32.modules |  120 +++++++++++-----------------
 modulesets/gnome-suites-3.0.modules  |  142 +++++++++++++++++-----------------
 3 files changed, 142 insertions(+), 144 deletions(-)
---
diff --git a/modulesets/gnome-2.32.modules b/modulesets/gnome-2.32.modules
index d1c1d7d..4bb0271 100644
--- a/modulesets/gnome-2.32.modules
+++ b/modulesets/gnome-2.32.modules
@@ -2493,4 +2493,28 @@
     </dependencies>
   </autotools>
 
+  <autotools id="mutter" autogenargs="--with-gtk=3.0">
+    <branch />
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk+-3"/>
+      <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"/>
+      <dep package="librsvg"/>
+      <dep package="dconf"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>
diff --git a/modulesets/gnome-suites-2.32.modules b/modulesets/gnome-suites-2.32.modules
index ae90961..91a83c6 100644
--- a/modulesets/gnome-suites-2.32.modules
+++ b/modulesets/gnome-suites-2.32.modules
@@ -303,6 +303,14 @@
     </dependencies>
   </autotools>
 
+  <autotools id="caribou">
+    <branch/>
+    <dependencies>
+      <dep package="pygtk"/>
+      <dep package="pyclutter"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="cheese">
     <branch/>
     <dependencies>
@@ -662,6 +670,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-color-manager">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-3"/>
+      <dep package="gnome-desktop-3"/>
+      <dep package="vte-3"/>
+      <dep package="libnotify"/>
+      <dep package="lcms2"/>
+      <dep package="libcanberra"/>
+      <dep package="gnome-control-center"/>
+      <!-- and gudev -->
+      <!-- and libtiff -->
+      <!-- nad cups -->
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-desktop" autogenargs="--with-gnome-distributor=JHBuild">
     <branch revision="gnome-2-32"/>
     <dependencies>
@@ -736,6 +760,14 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-icon-theme-symbolic">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-common"/>
+      <dep package="icon-naming-utils"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libgnome-keyring">
     <branch/>
     <dependencies>
@@ -1030,6 +1062,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gobject-introspection">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gsettings-desktop-schemas">
     <branch/>
     <dependencies>
@@ -1662,6 +1701,14 @@
     </dependencies>
   </waf>
 
+  <autotools id="gjs">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="mozilla"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="seed">
     <branch/>
     <dependencies>
@@ -1806,77 +1853,6 @@
 
 <!-- Proposed Modules -->
 
-  <autotools id="gobject-introspection">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="mutter" autogenargs="--with-gtk=3.0">
-    <branch />
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gtk+-3"/>
-      <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"/>
-      <dep package="librsvg"/>
-      <dep package="dconf"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gjs">
-    <branch/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-      <dep package="mozilla"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-color-manager">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+-3"/>
-      <dep package="gnome-desktop-3"/>
-      <dep package="vte-3"/>
-      <dep package="libnotify"/>
-      <dep package="lcms2"/>
-      <dep package="libcanberra"/>
-      <dep package="gnome-control-center"/>
-      <!-- and gudev -->
-      <!-- and libtiff -->
-      <!-- nad cups -->
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-icon-theme-symbolic">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-common"/>
-      <dep package="icon-naming-utils"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="caribou">
-    <branch/>
-    <dependencies>
-      <dep package="pygtk"/>
-      <dep package="pyclutter"/>
-    </dependencies>
-  </autotools>
-
 <!-- Meta Modules -->
 
   <metamodule id="meta-gnome-devel-platform-upcoming-deprecations">
@@ -1961,7 +1937,6 @@
       <dep package="gnome-screensaver"/>
       <dep package="gnome-session"/>
       <dep package="gnome-settings-daemon"/>
-      <dep package="gnome-shell"/>
       <dep package="gnome-system-monitor"/>
       <dep package="gnome-system-tools"/>
       <dep package="gnome-terminal"/>
@@ -1990,7 +1965,6 @@
       <dep package="libwnck"/>
       <dep package="metacity"/>
       <dep package="mousetweaks"/>
-      <dep package="mutter"/>
       <dep package="nautilus"/>
       <dep package="nautilus-sendto"/>
       <dep package="orca"/>
diff --git a/modulesets/gnome-suites-3.0.modules b/modulesets/gnome-suites-3.0.modules
index c19738b..d74986e 100644
--- a/modulesets/gnome-suites-3.0.modules
+++ b/modulesets/gnome-suites-3.0.modules
@@ -303,6 +303,14 @@
     </dependencies>
   </autotools>
 
+  <autotools id="caribou">
+    <branch/>
+    <dependencies>
+      <dep package="pygtk"/>
+      <dep package="pyclutter"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="cheese">
     <branch/>
     <dependencies>
@@ -320,6 +328,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-color-manager">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+-3"/>
+      <dep package="gnome-desktop-3"/>
+      <dep package="vte-3"/>
+      <dep package="libnotify"/>
+      <dep package="lcms2"/>
+      <dep package="libcanberra"/>
+      <dep package="gnome-control-center"/>
+      <!-- and gudev -->
+      <!-- and libtiff -->
+      <!-- nad cups -->
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
@@ -733,6 +757,14 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-icon-theme-symbolic">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-common"/>
+      <dep package="icon-naming-utils"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libgnome-keyring">
     <branch/>
     <dependencies>
@@ -937,6 +969,16 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnome-shell">
+    <branch/>
+    <dependencies>
+      <dep package="mutter"/>
+      <dep package="gjs"/>
+      <dep package="librsvg"/>
+      <dep package="dconf"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-system-monitor">
     <branch/>
     <dependencies>
@@ -1027,6 +1069,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gobject-introspection">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gsettings-desktop-schemas">
     <branch/>
     <dependencies>
@@ -1246,6 +1295,20 @@
     </dependencies>
   </autotools>
 
+  <autotools id="mutter" autogenargs="--with-gtk=3.0">
+    <branch />
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk+-3"/>
+      <dep package="gconf"/>
+      <dep package="intltool"/>
+      <dep package="zenity"/>
+      <dep package="clutter"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="nautilus">
     <branch/>
     <dependencies>
@@ -1678,6 +1741,14 @@
     </dependencies>
   </waf>
 
+  <autotools id="gjs">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="mozilla"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="seed">
     <branch/>
     <dependencies>
@@ -1822,77 +1893,6 @@
 
 <!-- Proposed Modules -->
 
-  <autotools id="gobject-introspection">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="mutter" autogenargs="--with-gtk=3.0">
-    <branch />
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gtk+-3"/>
-      <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"/>
-      <dep package="librsvg"/>
-      <dep package="dconf"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gjs">
-    <branch/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-      <dep package="mozilla"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-color-manager">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+-3"/>
-      <dep package="gnome-desktop-3"/>
-      <dep package="vte-3"/>
-      <dep package="libnotify"/>
-      <dep package="lcms2"/>
-      <dep package="libcanberra"/>
-      <dep package="gnome-control-center"/>
-      <!-- and gudev -->
-      <!-- and libtiff -->
-      <!-- nad cups -->
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-icon-theme-symbolic">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-common"/>
-      <dep package="icon-naming-utils"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="caribou">
-    <branch/>
-    <dependencies>
-      <dep package="pygtk"/>
-      <dep package="pyclutter"/>
-    </dependencies>
-  </autotools>
-
 <!-- Meta Modules -->
 
   <metamodule id="meta-gnome-devel-platform-upcoming-deprecations">