[jhbuild] 3.8: drop fallback mode

[Bastien Nocera <hadess src gnome org>]

commit ef31a2cd06e3846b7f81a20c27d16916d9e4b9fa
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Nov 7 07:11:29 2012 -0500

    3.8: drop fallback mode
    
    Dissolve the meta-gnome-core-shell-fallback metamodule, and
    move its consituents to gnome-world.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687837

 modulesets/gnome-suites-core-3.8.modules      |   81 +------------------------
 modulesets/gnome-suites-core-deps-3.8.modules |    9 ---
 modulesets/gnome-world-3.8.modules            |   65 ++++++++++++++++++++
 3 files changed, 66 insertions(+), 89 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.8.modules b/modulesets/gnome-suites-core-3.8.modules
index 26b1ca8..c5ee108 100644
--- a/modulesets/gnome-suites-core-3.8.modules
+++ b/modulesets/gnome-suites-core-3.8.modules
@@ -243,21 +243,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-screensaver">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-      <dep package="gnome-menus"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libgnomekbd"/>
-    </dependencies>
-    <suggests>
-      <dep package="libnotify"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gnome-session">
     <branch/>
     <dependencies>
@@ -466,49 +451,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-panel">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libwnck"/>
-      <dep package="evolution-data-server"/>
-      <dep package="gnome-menus"/>
-      <dep package="dbus-glib"/>
-      <dep package="librsvg"/>
-      <dep package="libgweather"/>
-      <dep package="libcanberra"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-    <suggests>
-      <dep package="polkit"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="metacity">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gtk+-2"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="intltool"/>
-      <dep package="libcanberra"/>
-      <dep package="zenity"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="notification-daemon">
-    <branch/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-    </dependencies>
-  </autotools>
-
-
 <!-- Core Utilities -->
 
   <autotools id="baobab">
@@ -1071,26 +1013,6 @@
     </dependencies>
   </metamodule>
 
-  <!-- The Core GNOME Fallback UX: Provides a non composited
-       fallback experience for incapable hardware
-  -->
-  <metamodule id="meta-gnome-core-shell-fallback">
-    <dependencies>
-      <dep package="gnome-panel"/>
-      <dep package="gnome-screensaver"/>
-      <dep package="metacity"/>
-      <dep package="network-manager-applet"/>
-      <dep package="notification-daemon"/>
-      <!-- workaround to ensure that dbus-python is around for
-           glib tests
-      -->
-      <dep package="dbus-python"/>
-    </dependencies>
-    <suggests>
-      <dep package="polkit-gnome"/>
-    </suggests>
-  </metamodule>
-
   <!-- The Core GNOME OS Services: Only OS System services required to
        provide the Core GNOME UX
   -->
@@ -1114,14 +1036,13 @@
     </dependencies>
   </metamodule>
 
-  <!-- The entirety of the Core GNOME UX, including fallback and utilities
+  <!-- The entirety of the Core GNOME UX, including extras and utilities
   -->
   <metamodule id="meta-gnome-core">
     <dependencies>
       <dep package="meta-gnome-core-shell"/>
       <dep package="meta-gnome-core-extras"/>
       <dep package="meta-gnome-core-utilities"/>
-      <dep package="meta-gnome-core-shell-fallback"/>
     </dependencies>
   </metamodule>
 
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index c96918e..97c0787 100644
--- a/modulesets/gnome-suites-core-deps-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-3.8.modules
@@ -854,15 +854,6 @@
 
 <!-- End Mozilla stuff subsection -->
 
-  <autotools id="polkit-gnome" autogenargs="--with-gtk=3.0">
-    <branch checkoutdir="polkit-gnome" module="PolicyKit-gnome"/>
-    <dependencies>
-      <dep package="polkit"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="poppler" autogenargs="--enable-xpdf-headers" makeargs="POPPLER_GLIB_DISABLE_DEPRECATED=">
     <pkg-config>poppler-glib.pc</pkg-config>
     <branch repo="poppler.freedesktop.org"
diff --git a/modulesets/gnome-world-3.8.modules b/modulesets/gnome-world-3.8.modules
index 6ffc6ec..0d285cf 100644
--- a/modulesets/gnome-world-3.8.modules
+++ b/modulesets/gnome-world-3.8.modules
@@ -2441,6 +2441,71 @@
       <dep package="libxml2"/>
       <dep package="glib"/>
       <dep package="WebKit"/>
+  </autotools>
+
+  <autotools id="gnome-panel">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libwnck"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gnome-menus"/>
+      <dep package="dbus-glib"/>
+      <dep package="librsvg"/>
+      <dep package="libgweather"/>
+      <dep package="libcanberra"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+    <suggests>
+      <dep package="polkit"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="metacity">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gtk+-2"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="intltool"/>
+      <dep package="libcanberra"/>
+      <dep package="zenity"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="notification-daemon">
+    <branch/>
+    <dependencies>
+      <dep package="dbus"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-screensaver">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-menus"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libgnomekbd"/>
+    </dependencies>
+    <suggests>
+      <dep package="libnotify"/>
+    </suggests>
+  </autotools>
+
+ <autotools id="polkit-gnome" autogenargs="--with-gtk=3.0">
+    <branch checkoutdir="polkit-gnome" module="PolicyKit-gnome"/>
+    <dependencies>
+      <dep package="polkit"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
     </dependencies>
   </autotools>