[jhbuild] 3.20: Move incubator to gnome-apps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 3d4d9185ff7895496d71da6d4f72f8894b0effcf
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Tue Jan 19 08:28:53 2016 -0600

    3.20: Move incubator to gnome-apps
    
    But keep Epiphany in core; it's too mature to be dropped this far.

 modulesets/gnome-apps-3.20.modules             |  118 ++++++++++++++++++++++++
 modulesets/gnome-suites-core-3.20.modules      |  101 +--------------------
 modulesets/gnome-suites-core-deps-3.20.modules |   19 ----
 3 files changed, 119 insertions(+), 119 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index cdd722d..c70d174 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -42,6 +42,10 @@
 
 <!-- Dependencies and miscellaneous -->
 
+  <autotools id="babl">
+    <branch/>
+  </autotools>
+
   <autotools id="farstream" autogenargs="--disable-python">
     <branch repo="freedesktop.org"
             module="farstream/releases/farstream/farstream-${version}.tar.gz"
@@ -128,6 +132,21 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gegl">
+    <branch/>
+    <dependencies>
+      <dep package="babl"/>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="pango"/>
+      <dep package="libjasper"/>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-devel-docs">
     <branch/>
     <dependencies>
@@ -265,6 +284,20 @@
     </dependencies>
   </autotools>
 
+  <autotools id="bijiben">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="tracker"/>
+      <dep package="clutter-gtk"/>
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
+      <dep package="WebKit1"/>
+      <dep package="evolution-data-server"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="brasero">
     <if condition-unset="linux">
       <autogenargs value="--disable-inotify"/>
@@ -452,6 +485,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-chat">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="telepathy-glib"/>
+      <dep package="telepathy-logger"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-code-assistance">
     <branch/>
     <dependencies>
@@ -459,6 +502,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-dictionary">
+    <branch/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-multi-writer">
     <branch/>
     <dependencies>
@@ -471,6 +524,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-music">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-themes-standard"/>
+      <dep package="gobject-introspection"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
+      <dep package="gtk+"/>
+      <dep package="gvfs"/>
+      <dep package="intltool"/>
+      <dep package="pygobject"/>
+      <dep package="tracker"/>
+      <dep package="libmediaart"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-nettool">
     <branch/>
     <dependencies>
@@ -481,6 +550,40 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-news">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="pygobject"/>
+      <dep package="tracker"/>
+      <dep package="WebKit"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-photos">
+    <branch/>
+    <dependencies>
+      <dep package="babl"/>
+      <dep package="gegl"/>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gexiv2"/>
+      <dep package="glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gnome-online-miners"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
+      <dep package="gtk+"/>
+      <dep package="libgdata"/>
+      <dep package="libgfbgraph"/>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="tracker"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-sound-recorder">
     <branch/>
     <dependencies>
@@ -809,6 +912,7 @@
   -->
   <metamodule id="meta-gnome-apps-tested">
     <dependencies>
+      <dep package="meta-gnome-core-incubator"/>
       <dep package="meta-gnome-games"/>
       <dep package="accerciser"/>
       <dep package="brasero"/>
@@ -834,6 +938,20 @@
     </dependencies>
   </metamodule>
 
+  <!-- GNOME Incubator: Where new core apps grow up, until they are
+       good enough to form part of the default user experience.
+  -->
+  <metamodule id="meta-gnome-core-incubator">
+    <dependencies>
+      <dep package="bijiben"/>
+      <dep package="gnome-chat"/>
+      <dep package="gnome-dictionary"/>
+      <dep package="gnome-music"/>
+      <dep package="gnome-news"/>
+      <dep package="gnome-photos"/>
+    </dependencies>
+  </metamodule>
+
   <metamodule id="meta-gnome-games">
     <depencencies>
       <dep package="five-or-more"/>
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index b5b4849..24d3db4 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -178,16 +178,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-chat">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="telepathy-glib"/>
-      <dep package="telepathy-logger"/>
-    </dependencies>
-  </autotools>
-
   <!-- Not an app, but a service for gnome-control-center -->
   <autotools id="gnome-color-manager">
     <branch/>
@@ -652,20 +642,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="bijiben">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="tracker"/>
-      <dep package="clutter-gtk"/>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <dep package="glib"/>
-      <dep package="WebKit1"/>
-      <dep package="evolution-data-server"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="cheese">
     <branch/>
     <dependencies>
@@ -874,16 +850,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnome-dictionary">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-disk-utility">
     <branch/>
     <dependencies>
@@ -987,56 +953,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-music">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-themes-standard"/>
-      <dep package="gobject-introspection"/>
-      <dep package="grilo"/>
-      <dep package="grilo-plugins"/>
-      <dep package="gtk+"/>
-      <dep package="gvfs"/>
-      <dep package="intltool"/>
-      <dep package="pygobject"/>
-      <dep package="tracker"/>
-      <dep package="libmediaart"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-news">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="pygobject"/>
-      <dep package="tracker"/>
-      <dep package="WebKit"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-photos">
-    <branch/>
-    <dependencies>
-      <dep package="babl"/>
-      <dep package="gegl"/>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gexiv2"/>
-      <dep package="glib"/>
-      <dep package="gnome-desktop"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gnome-online-miners"/>
-      <dep package="grilo"/>
-      <dep package="grilo-plugins"/>
-      <dep package="gtk+"/>
-      <dep package="libgdata"/>
-      <dep package="libgfbgraph"/>
-      <dep package="libjpeg"/>
-      <dep package="libpng"/>
-      <dep package="tracker"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-screenshot">
     <branch/>
     <dependencies>
@@ -1348,6 +1264,7 @@
       <dep package="baobab"/>
       <dep package="cheese"/>
       <dep package="eog"/>
+      <dep package="epiphany"/>
       <dep package="evince"/>
       <dep package="file-roller"/>
       <dep package="gedit"/>
@@ -1376,21 +1293,6 @@
     </dependencies>
   </metamodule>
 
-  <!-- GNOME Incubator: Where new core apps grow up, until they are
-       good enough to form part of the default user experience.
-  -->
-  <metamodule id="meta-gnome-core-incubator">
-    <dependencies>
-      <dep package="bijiben"/>
-      <dep package="epiphany"/>
-      <dep package="gnome-chat"/>
-      <dep package="gnome-dictionary"/>
-      <dep package="gnome-music"/>
-      <dep package="gnome-news"/>
-      <dep package="gnome-photos"/>
-    </dependencies>
-  </metamodule>
-
   <!-- The Core GNOME UX Shell: Only integrated session services,
        data, and core UI allowed.
   -->
@@ -1454,7 +1356,6 @@
   -->
   <metamodule id="meta-gnome-core">
     <dependencies>
-      <dep package="meta-gnome-core-incubator"/>
       <dep package="meta-gnome-core-shell"/>
       <dep package="meta-gnome-core-utilities"/>
     </dependencies>
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index dff55c9..8ce5b95 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -106,10 +106,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="babl">
-    <branch/>
-  </autotools>
-
   <autotools id="cairomm" autogen-sh="configure">
     <branch module="releases/cairomm-${version}.tar.gz"
             version="1.12.0"
@@ -363,21 +359,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gegl">
-    <branch/>
-    <dependencies>
-      <dep package="babl"/>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="pango"/>
-      <dep package="libjasper"/>
-      <dep package="libjpeg"/>
-      <dep package="libpng"/>
-      <dep package="librsvg"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="geoclue" autogenargs="--with-systemdsystemunitdir=no">
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>