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

[Bastien Nocera <hadess src gnome org>]

commit 48f30ea8e632a60d74092a2f91507ca76b42c791
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Dec 2 12:11:50 2015 +0100

    Revert "3.20: Drop gnome-music to gnome-world"
    
    But keep the dbus-python module off the required modules.
    
    See https://bugzilla.gnome.org/show_bug.cgi?id=757119#c0
    
    This reverts commit 7bec1eaf41e7780c2cb54dfa9e90bbd59c0fed73.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=757119

 modulesets/gnome-apps-3.20.modules |   16 ++++++++++++++++
 modulesets/gnome-world.modules     |   30 ------------------------------
 2 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index 8ca3de4..ee4f844 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -935,6 +935,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-nibbles">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 6b7588b..1e77bda 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -257,36 +257,6 @@
     </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>