[jhbuild] apps: Remove Incubator

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 800a6e132e88117530f69fcf5c101107ab0bdfd3
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Tue Jul 25 08:33:15 2017 -0500

    apps: Remove Incubator
    
    seahorse is beyond hope of repair, so it needs to be moved to world. It
    will eventually be replaced with Credentials.
    
    So Dictionary is the only app left in Incubator. It doesn't seem
    worthwhile to keep this category around for just one app. And I'm not
    really sure if Dictionary should ever really be in core anyway.
    Incubator is just not useful anymore. Maybe it never was!

 modulesets/gnome-apps-3.26.modules |   32 +-------------------------------
 modulesets/gnome-world.modules     |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 31 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.26.modules b/modulesets/gnome-apps-3.26.modules
index fed5399..be7548f 100644
--- a/modulesets/gnome-apps-3.26.modules
+++ b/modulesets/gnome-apps-3.26.modules
@@ -420,26 +420,6 @@
     </dependencies>
   </meson>
 
-  <autotools id="seahorse">
-    <branch/>
-    <dependencies>
-      <dep package="vala"/>
-      <dep package="intltool"/>
-      <dep package="gtk+-3"/>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="libsecret"/>
-      <dep package="gcr"/>
-      <dep package="yelp-tools"/>
-      <dep package="gpgme"/>
-      <dep package="gnupg"/>
-    </dependencies>
-    <suggests>
-      <dep package="avahi"/>
-      <dep package="libxml2"/>
-    </suggests>
-  </autotools>
-
 <!-- Games -->
 
   <autotools id="five-or-more">
@@ -679,7 +659,6 @@
   -->
   <metamodule id="meta-gnome-apps-tested">
     <dependencies>
-      <dep package="meta-gnome-core-incubator"/>
       <dep package="meta-gnome-games"/>
       <dep package="accerciser"/>
       <dep package="dconf-editor"/>
@@ -690,6 +669,7 @@
       <dep package="glade"/>
       <dep package="gnome-builder"/>
       <dep package="gnome-devel-docs"/>
+      <dep package="gnome-dictionary"/>
       <dep package="gnome-nettool"/>
       <dep package="gnome-sound-recorder"/>
       <dep package="gnome-tweak-tool"/>
@@ -702,16 +682,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="gnome-dictionary"/>
-      <dep package="seahorse"/>
-    </dependencies>
-  </metamodule>
-
   <metamodule id="meta-gnome-games">
     <dependencies>
       <dep package="five-or-more"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index e4353a5..b7186ba 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -3505,4 +3505,24 @@
     </dependencies>
   </autotools>
 
+  <autotools id="seahorse">
+    <branch/>
+    <dependencies>
+      <dep package="vala"/>
+      <dep package="intltool"/>
+      <dep package="gtk+-3"/>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libsecret"/>
+      <dep package="gcr"/>
+      <dep package="yelp-tools"/>
+      <dep package="gpgme"/>
+      <dep package="gnupg"/>
+    </dependencies>
+    <suggests>
+      <dep package="avahi"/>
+      <dep package="libxml2"/>
+    </suggests>
+  </autotools>
+
 </moduleset>