[jhbuild] 3.26: Promote gnome-music and gnome-todo to core apps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 3e8dd2dc4cfa9501c571aa549256b65f0bd0fe1b
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Apr 27 08:55:15 2017 -0500

    3.26: Promote gnome-music and gnome-todo to core apps

 modulesets/gnome-apps-3.26.modules        |   29 -----------------------------
 modulesets/gnome-suites-core-3.26.modules |   29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.26.modules b/modulesets/gnome-apps-3.26.modules
index 03d4efb..3d312c0 100644
--- a/modulesets/gnome-apps-3.26.modules
+++ b/modulesets/gnome-apps-3.26.modules
@@ -346,21 +346,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-music">
-    <branch/>
-    <dependencies>
-      <dep package="gobject-introspection"/>
-      <dep package="grilo"/>
-      <dep package="grilo-plugins"/>
-      <dep package="gtk+-3"/>
-      <dep package="gvfs"/>
-      <dep package="intltool"/>
-      <dep package="pygobject"/>
-      <dep package="tracker"/>
-      <dep package="libmediaart"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-nettool">
     <branch/>
     <dependencies>
@@ -381,18 +366,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-todo">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="evolution-data-server"/>
-      <dep package="glib"/>
-      <dep package="gtk+-3"/>
-      <dep package="libpeas"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-tweak-tool">
     <branch/>
     <dependencies>
@@ -690,7 +663,6 @@
       <dep package="gnome-devel-docs"/>
       <dep package="gnome-nettool"/>
       <dep package="gnome-sound-recorder"/>
-      <dep package="gnome-todo"/>
       <dep package="gnome-tweak-tool"/>
       <dep package="nautilus-sendto"/>
       <dep package="polari"/>
@@ -706,7 +678,6 @@
   <metamodule id="meta-gnome-core-incubator">
     <dependencies>
       <dep package="gnome-dictionary"/>
-      <dep package="gnome-music"/>
       <dep package="seahorse"/>
     </dependencies>
   </metamodule>
diff --git a/modulesets/gnome-suites-core-3.26.modules b/modulesets/gnome-suites-core-3.26.modules
index e4a72ad..146c125 100644
--- a/modulesets/gnome-suites-core-3.26.modules
+++ b/modulesets/gnome-suites-core-3.26.modules
@@ -932,6 +932,21 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-music">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
+      <dep package="gtk+-3"/>
+      <dep package="gvfs"/>
+      <dep package="intltool"/>
+      <dep package="libmediaart"/>
+      <dep package="pygobject"/>
+      <dep package="tracker"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-photos"
              supports-non-srcdir-builds="no">
     <branch/>
@@ -1019,6 +1034,18 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnome-todo">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="evolution-data-server"/>
+      <dep package="glib"/>
+      <dep package="gtk+-3"/>
+      <dep package="libpeas"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-weather" autogenargs="--disable-dogtail">
     <if condition-set="coverage">
       <autogenargs value="--enable-coverage"/>
@@ -1261,11 +1288,13 @@
       <dep package="gnome-documents"/>
       <dep package="gnome-font-viewer"/>
       <dep package="gnome-maps"/>
+      <dep package="gnome-music"/>
       <dep package="gnome-photos"/>
       <dep package="gnome-screenshot"/>
       <dep package="gnome-software"/>
       <dep package="gnome-system-monitor"/>
       <dep package="gnome-terminal"/>
+      <dep package="gnome-todo"/>
       <dep package="gnome-weather"/>
       <dep package="nautilus"/>
       <dep package="sushi"/>