[jhbuild] 3.6: Move libnive and gupnp-igd to core-deps from core-deps-base

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

commit 962f4c9745fc0cbddfaa69547bf2107efa64bff2
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Sep 3 13:10:56 2012 +0900

    3.6: Move libnive and gupnp-igd to core-deps from core-deps-base
    
    They are not really level 1 dependencies:
    
    Established, stable, system modules, they have been in
    place for a long time, with stable API and ABI, and they exist in
    sufficient versions in the distributions commonly used by GNOME
    hackers, even in older but still used versions (Fedora 15 for
    example)

 modulesets/gnome-suites-core-deps-3.6.modules      |   20 +++++++++++++++++++
 modulesets/gnome-suites-core-deps-base-3.6.modules |   21 --------------------
 2 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index 8cb497f..5e8d584 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -612,6 +612,15 @@
     </dependencies>
   </autotools>
 
+  <tarball id="gupnp-igd" version="0.2.1" autogenargs="--disable-python">
+    <pkg-config>gupnp-igd-1.0.pc</pkg-config>
+    <source href="http://ftp.gnome.org/pub/GNOME/sources/gupnp-igd/0.2/gupnp-igd-0.2.0.tar.xz";
+            hash="sha256:924c17c511f18d021329f0d9515235069f4aa1632a487edebb21443002409952"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gupnp"/>
+    </dependencies>
+  </tarball>
 
   <autotools id="itstool">
     <branch repo="itstool.org"
@@ -746,6 +755,17 @@
     </dependencies>
   </autotools>
 
+  <tarball id="libnice" version="0.1.2" autogenargs="--enable-gupnp">
+    <pkg-config>nice.pc</pkg-config>
+    <source href="http://nice.freedesktop.org/releases/libnice-0.1.2.tar.gz";
+            hash="sha256:f2472b6392a27287ded21a6ba535b19c6204614fb191e1c4ff98295202c247f6"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gupnp-igd"/>
+    </dependencies>
+  </tarball>
+
   <autotools id="libnotify">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-suites-core-deps-base-3.6.modules b/modulesets/gnome-suites-core-deps-base-3.6.modules
index b14dc39..e1ed908 100644
--- a/modulesets/gnome-suites-core-deps-base-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.6.modules
@@ -323,27 +323,6 @@
     </dependencies>
   </cmake>
 
-  <tarball id="libnice" version="0.1.2" autogenargs="--enable-gupnp">
-    <pkg-config>nice.pc</pkg-config>
-    <source href="http://nice.freedesktop.org/releases/libnice-0.1.2.tar.gz";
-            hash="sha256:f2472b6392a27287ded21a6ba535b19c6204614fb191e1c4ff98295202c247f6"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gupnp-igd"/>
-    </dependencies>
-  </tarball>
-
-  <tarball id="gupnp-igd" version="0.2.1" autogenargs="--disable-python">
-    <pkg-config>gupnp-igd-1.0.pc</pkg-config>
-    <source href="http://ftp.gnome.org/pub/GNOME/sources/gupnp-igd/0.2/gupnp-igd-0.2.0.tar.xz";
-            hash="sha256:924c17c511f18d021329f0d9515235069f4aa1632a487edebb21443002409952"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gupnp"/>
-    </dependencies>
-  </tarball>
-
   <autotools id="libnl" skip-autogen="never" autogen-sh="configure" check-target="false">
     <pkg-config>libnl-3.0.pc</pkg-config>
     <branch repo="libnl"