[jhbuild] 3.20: Drop gnome-music to gnome-world

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 7bec1eaf41e7780c2cb54dfa9e90bbd59c0fed73
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Oct 25 15:28:57 2015 -0500

    3.20: Drop gnome-music to gnome-world

 modulesets/gnome-apps-3.20.modules |   17 -----------------
 modulesets/gnome-world.modules     |   30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 17 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index 92d64a1..9f8f9ad 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -925,23 +925,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-music">
-    <branch/>
-    <dependencies>
-      <dep package="dbus-python"/>
-      <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-nibbles">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index ce97a58..1269ab1 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -254,6 +254,36 @@
     </dependencies>
   </autotools>
 
+  <!-- Temporarily removed from gnome-apps because:
+
+       a) It needs to be ported to grilo-0.3.
+       b) dbus-python is in gnome-world, which is not included in gnome-apps.
+       c) dbus-python is a python2 build that depends on pygobject-python2,
+          whereas gnome-music depends on pygobject (python3 build).
+
+       Also, pygobject-python2 has a dependency on unknown "py2cairo" module,
+       but that doesn't matter much since this should not depend on
+       pygobject-python2 anyway.
+
+       https://mail.gnome.org/archives/desktop-devel-list/2015-October/msg00030.html
+  -->
+  <autotools id="gnome-music">
+    <branch/>
+    <dependencies>
+      <dep package="dbus-python"/>
+      <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 repo="github.com" module="ignatenkobrain/gnome-news"/>
     <dependencies>