[jhbuild] 3.6: Move gnome-doc-utils and its dependency rarian to -apps

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

commit 2a937f5c3e141c3528de0556d0ba9628c9af2380
Author: Javier JardÃn <jjardon gnome org>
Date:   Wed Sep 5 06:20:06 2012 +0900

    3.6: Move gnome-doc-utils and its dependency rarian to -apps
    
    No core module depend on it anymore :)

 modulesets/gnome-apps-3.6.modules                  |   27 ++++++++++++++++++++
 modulesets/gnome-suites-core-deps-3.6.modules      |   13 ---------
 modulesets/gnome-suites-core-deps-base-3.6.modules |   16 -----------
 3 files changed, 27 insertions(+), 29 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.6.modules b/modulesets/gnome-apps-3.6.modules
index ff31efb..c49cdbd 100644
--- a/modulesets/gnome-apps-3.6.modules
+++ b/modulesets/gnome-apps-3.6.modules
@@ -619,6 +619,17 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnome-doc-utils" supports-parallel-builds="no">
+    <branch/>
+    <dependencies>
+      <dep package="gnome-common"/>
+      <dep package="libxslt"/>
+      <dep package="libxml2"/>
+      <dep package="intltool"/>
+      <dep package="rarian"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-documents">
     <branch/>
     <dependencies>
@@ -752,6 +763,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="rarian" supports-non-srcdir-builds="no">
+    <!-- Always build rarian due to some distributions providing rarian-compat
+                  package. (see https://bugzilla.gnome.org/show_bug.cgi?id=670917)
+         rarian can be sysdeps again when GNOME bug 671042 is fixed. -->
+    <!-- <pkg-config>rarian.pc</pkg-config> -->
+    <branch repo="gnome.org"
+            module="rarian/0.8/rarian-0.8.1.tar.bz2"
+            version="0.8.1"
+            hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
+            size="324441"/>
+    <dependencies>
+      <dep package="libxslt"/>
+      <dep package="intltool"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="rygel">
     <branch revision="rygel-0.16"/>
     <dependencies>
diff --git a/modulesets/gnome-suites-core-deps-3.6.modules b/modulesets/gnome-suites-core-deps-3.6.modules
index f048ecc..0d48f18 100644
--- a/modulesets/gnome-suites-core-deps-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-3.6.modules
@@ -116,17 +116,6 @@
     <branch/>
   </autotools>
 
-  <autotools id="gnome-doc-utils" supports-parallel-builds="no">
-    <branch/>
-    <dependencies>
-      <dep package="gnome-common"/>
-      <dep package="libxslt"/>
-      <dep package="libxml2"/>
-      <dep package="intltool"/>
-      <dep package="rarian"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gtk-doc">
     <branch/>
     <dependencies>
@@ -135,8 +124,6 @@
     </dependencies>
   </autotools>
 
-  
-
   <autotools id="libgdata">
     <pkg-config>libgdata.pc</pkg-config>
     <branch/>
diff --git a/modulesets/gnome-suites-core-deps-base-3.6.modules b/modulesets/gnome-suites-core-deps-base-3.6.modules
index e1ed908..6c2403b 100644
--- a/modulesets/gnome-suites-core-deps-base-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.6.modules
@@ -443,22 +443,6 @@
     </branch>
   </autotools>
 
-  <autotools id="rarian" supports-non-srcdir-builds="no">
-    <!-- Always build rarian due to some distributions providing rarian-compat
-         package. (see https://bugzilla.gnome.org/show_bug.cgi?id=670917)
-         rarian can be sysdeps again when GNOME bug 671042 is fixed. -->
-    <!-- <pkg-config>rarian.pc</pkg-config> -->
-    <branch repo="gnome.org"
-            module="rarian/0.8/rarian-0.8.1.tar.bz2"
-            version="0.8.1"
-            hash="sha256:aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"
-            size="324441"/>
-    <dependencies>
-      <dep package="libxslt"/>
-      <dep package="intltool"/>
-    </dependencies>
-  </autotools>
-
   <!-- parallel builds broken due to: https://bugs.freedesktop.org/show_bug.cgi?id=46093 -->
   <autotools id="shared-mime-info" supports-non-srcdir-builds="no"
              autogenargs="--disable-default-make-check" supports-parallel-builds="no">