[jhbuild] 3.6: Move gssdp and gupnp to -core-deps from -apps

[Javier JardÃn <jjardon src gnome org>]

commit 094c835153c935952a73e06f3c8fa56f916872af
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Sep 3 13:27:59 2012 +0900

    3.6: Move gssdp and gupnp to -core-deps from -apps
    
    As gupnp-igd (libnice dependency) depends on gupnp

 modulesets/gnome-apps-3.6.modules             |   26 ------------------------
 modulesets/gnome-suites-core-deps-3.6.modules |   27 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 26 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.6.modules b/modulesets/gnome-apps-3.6.modules
index 6cd1982..d877187 100644
--- a/modulesets/gnome-apps-3.6.modules
+++ b/modulesets/gnome-apps-3.6.modules
@@ -232,17 +232,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gssdp">
-    <branch />
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-    </suggests>
-  </autotools>
-
   <autotools id="guile">
     <pkg-config>guile-2.0.pc</pkg-config>
     <branch repo="ftp.gnu.org"
@@ -252,21 +241,6 @@
             size="4196064"/>
   </autotools>
 
-  <autotools id="gupnp" autogenargs="--with-context-manager=network-manager">
-    <branch repo="git.gnome.org" revision="gupnp-0.18"/>
-    <dependencies>
-      <dep package="gssdp"/>
-      <dep package="glib"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="shared-mime-info"/>
-    </dependencies>
-    <suggests>
-      <dep package="gobject-introspection"/>
-      <dep package="NetworkManager"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gupnp-av">
     <branch />
     <dependencies>
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index d89b726..6438789 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -614,6 +614,33 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gssdp">
+    <branch />
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="gupnp"
+             autogenargs="--with-context-manager=network-manager">
+    <branch revision="gupnp-0.18"/>
+    <dependencies>
+      <dep package="gssdp"/>
+      <dep package="glib"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="shared-mime-info"/>
+    </dependencies>
+    <suggests>
+      <dep package="gobject-introspection"/>
+      <dep package="NetworkManager"/>
+    </suggests>
+  </autotools>
+
   <autotools id="gupnp-igd"
              autogenargs="--disable-python">
     <branch/>