[jhbuild] Revert "3.6: complete move of musicbrainz to -apps"

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

commit cc125399524db7c3ec002549779a1782b8fd37fc
Author: Javier JardÃn <jjardon gnome org>
Date:   Sun Sep 2 21:09:33 2012 +0900

    Revert "3.6: complete move of musicbrainz to -apps"
    
    Sushi depend on musicbrainz
    
    This reverts commit 4d64ad6eff9f3312f3360f398e20c8e50c44806a.

 modulesets/gnome-apps-3.6.modules                  |   15 ---------------
 modulesets/gnome-suites-core-deps-base-3.6.modules |   15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.6.modules b/modulesets/gnome-apps-3.6.modules
index 8caea3f..9710013 100644
--- a/modulesets/gnome-apps-3.6.modules
+++ b/modulesets/gnome-apps-3.6.modules
@@ -33,8 +33,6 @@
     href="http://cairographics.org/"/>
   <repository type="tarball" name="gnome.org"
     href="http://download.gnome.org/sources/"/>
-  <repository type="tarball" name="github.com/metabrainz"
-    href="https://github.com/downloads/metabrainz/"/>
   <repository type="tarball" name="mono.net"
     href="http://download.mono-project.com/sources/"/>
   <repository type="tarball" name="launchpad.net/tarball"
@@ -1072,19 +1070,6 @@
     </dependencies>
   </cmake>
 
-  <cmake id="libmusicbrainz"
-         cmakeargs="-DLIB_SUFFIX=${libsuffix}">
-    <pkg-config>libmusicbrainz5.pc</pkg-config>
-    <branch repo="github.com/metabrainz"
-            module="libmusicbrainz/libmusicbrainz-5.0.1.tar.gz"
-            version="5.0.1"
-            hash="sha256:1ca75e1c5059a3620b0d82633b1f468acc2a65fcc4305f844ec44f6fb5db82d5"
-            size="109119">
-    </branch>
-    <dependencies>
-    </dependencies>
-  </cmake>
-
   <autotools id="nautilus-sendto">
     <branch revision="gnome-3-6"/>
     <branch/>
diff --git a/modulesets/gnome-suites-core-deps-base-3.6.modules b/modulesets/gnome-suites-core-deps-base-3.6.modules
index fb7572a..b14dc39 100644
--- a/modulesets/gnome-suites-core-deps-base-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.6.modules
@@ -27,6 +27,8 @@
     href="http://libproxy.googlecode.com/files/"/>
 <repository type="tarball" name="0pointer.de"
     href="http://0pointer.de/lennart/projects/"/>
+<repository type="tarball" name="github.com/metabrainz"
+    href="https://github.com/downloads/metabrainz/"/>
 <repository type="tarball" name="libnl"
     href="http://www.infradead.org/~tgr/libnl/files/"/>
 <repository type="tarball" name="kernel.org"
@@ -308,6 +310,19 @@
     </dependencies>
   </autotools>
 
+  <cmake id="libmusicbrainz"
+         cmakeargs="-DLIB_SUFFIX=${libsuffix}">
+    <pkg-config>libmusicbrainz5.pc</pkg-config>
+    <branch repo="github.com/metabrainz"
+            module="libmusicbrainz/libmusicbrainz-5.0.1.tar.gz"
+            version="5.0.1"
+            hash="sha256:1ca75e1c5059a3620b0d82633b1f468acc2a65fcc4305f844ec44f6fb5db82d5"
+            size="109119">
+    </branch>
+    <dependencies>
+    </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";