[jhbuild] 3.20: Move rygel to meta-gnome-core-shell

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 7949c365e930514e3ab99eb964a39fd18ccdb38a
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Feb 15 19:35:36 2016 +0000

    3.20: Move rygel to meta-gnome-core-shell
    
    It's part of the default experience; some functionality in g-c-c
    depends on it being present

 modulesets/gnome-apps-3.20.modules             |   39 ------------------------
 modulesets/gnome-suites-core-3.20.modules      |   15 +++++++++
 modulesets/gnome-suites-core-deps-3.20.modules |   24 ++++++++++++++
 3 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index b1491ce..10e7c3b 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -165,30 +165,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gupnp-av">
-    <branch />
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gupnp"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="gupnp-dlna">
-    <branch />
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="glib"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-    <suggests>
-      <dep package="gst-plugins-good"/>
-    </suggests>
- </autotools>
-
   <autotools id="jhbuild">
     <branch/>
     <dependencies>
@@ -301,20 +277,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="rygel">
-    <branch/>
-    <dependencies>
-      <dep package="vala"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="gupnp-dlna"/>
-      <dep package="libgee"/>
-      <dep package="tracker"/>
-      <dep package="valadoc"/>
-      <dep package="libmediaart"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
     <if condition-set="freebsd">
       <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
@@ -1082,7 +1044,6 @@
       <dep package="nautilus-sendto"/>
       <dep package="nemiver"/>
       <dep package="polari"/>
-      <dep package="rygel"/>
       <dep package="seahorse"/>
       <dep package="vinagre"/>
     </dependencies>
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index b607bfa..b5636e5 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -591,6 +591,20 @@
     </dependencies>
   </autotools>
 
+  <autotools id="rygel">
+    <branch/>
+    <dependencies>
+      <dep package="vala"/>
+      <dep package="gupnp"/>
+      <dep package="gupnp-av"/>
+      <dep package="gupnp-dlna"/>
+      <dep package="libgee"/>
+      <dep package="tracker"/>
+      <dep package="valadoc"/>
+      <dep package="libmediaart"/>
+    </dependencies>
+  </autotools>
+
   <!-- mc 5.16 doesn't build against upower 1.0 -->
   <autotools id="telepathy-mission-control" autogenargs="--disable-upower">
     <branch repo="telepathy.freedesktop.org" revision="telepathy-mission-control-5.16"/>
@@ -1301,6 +1315,7 @@
       <dep package="mutter"/>
       <dep package="orca"/>
       <dep package="pulseaudio"/>
+      <dep package="rygel"/>
       <dep package="telepathy-mission-control"/>
       <dep package="vino"/>
     </dependencies>
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index c28d291..2b4f0fc 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -723,6 +723,30 @@
     </suggests>
   </autotools>
 
+  <autotools id="gupnp-av">
+    <branch />
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gupnp"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gupnp-dlna">
+    <branch />
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+    <suggests>
+      <dep package="gst-plugins-good"/>
+    </suggests>
+ </autotools>
+
   <autotools id="gupnp-igd"
              autogenargs="--disable-python">
     <branch/>