[jhbuild] Move gnome-color-manager and its deps out of -core

[Matthias Clasen <matthiasc src gnome org>]

commit f896e8f5ee53b01eaf217862c78317a031a99ac6
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Mar 22 15:57:42 2011 -0400

    Move gnome-color-manager and its deps out of -core
    
    Not part of the GNOME 3.0 core moduleset, it belongs in -apps.

 modulesets/gnome-apps-3.0.modules             |   43 +++++++++++++++++++++++++
 modulesets/gnome-suites-core-3.0.modules      |   20 -----------
 modulesets/gnome-suites-core-deps-3.0.modules |   23 -------------
 3 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.0.modules b/modulesets/gnome-apps-3.0.modules
index 95e349b..207f13d 100644
--- a/modulesets/gnome-apps-3.0.modules
+++ b/modulesets/gnome-apps-3.0.modules
@@ -35,6 +35,8 @@
       href="https://launchpad.net/"/>
   <repository type="svn" name="svn.yorba.org"
       href="svn://svn.yorba.org/"/>
+<repository type="git" name="colord.gitorious.org"
+    href="git://gitorious.org/colord/master.git"/>
 
   <include href="gnome-suites-core-3.0.modules"/>
 
@@ -582,6 +584,47 @@
     </dependencies>
   </autotools>
 
+  <autotools id="colord" autogenargs="--disable-examples">
+    <branch repo="colord.gitorious.org" checkoutdir="colord" module="master"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus"/>
+      <dep package="gudev"/>
+      <dep package="sqlite3"/>
+      <!-- and cups -->
+      <!-- and sane -->
+    </dependencies>
+    <suggests>
+      <dep package="polkit"/>
+    </suggests>
+  </autotools>
+
+ <tarball id="lcms2" version="2.0a" checkoutdir="lcms-2.0">
+    <source href="http://downloads.sourceforge.net/lcms/lcms2-2.1.tar.gz";
+            hash="sha256:8b367bd60add7806c9aac970594dae636c24ba28dc774c00f8067644994e9c30"
+            md5sum="08036edb115ad74456dfa20b1998b5f4" size="3752136"/>
+  </tarball>
+
+  <autotools id="gnome-color-manager">
+    <branch revision="gnome-3-0"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gnome-control-center"/>
+      <dep package="gnome-desktop-3"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
+      <dep package="lcms2"/>
+      <dep package="libcanberra"/>
+      <dep package="libnotify"/>
+      <dep package="vte-3"/>
+      <!-- and libtiff -->
+    </dependencies>
+    <suggests>
+      <dep package="colord"/>
+    </suggests>
+  </autotools>
+
   <autotools id="gnome-devel-docs">
     <branch revision="gnome-2-32"/>
     <dependencies>
diff --git a/modulesets/gnome-suites-core-3.0.modules b/modulesets/gnome-suites-core-3.0.modules
index 154ffae..1d30ea3 100644
--- a/modulesets/gnome-suites-core-3.0.modules
+++ b/modulesets/gnome-suites-core-3.0.modules
@@ -211,26 +211,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-color-manager">
-    <branch revision="gnome-3-0"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gnome-control-center"/>
-      <dep package="gnome-desktop-3"/>
-      <dep package="gnome-doc-utils"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
-      <dep package="lcms2"/>
-      <dep package="libcanberra"/>
-      <dep package="libnotify"/>
-      <dep package="vte-3"/>
-      <!-- and libtiff -->
-    </dependencies>
-    <suggests>
-      <dep package="colord"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gnome-screensaver">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index bb28d76..b7fcf64 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -10,8 +10,6 @@
     href="http://git.clutter-project.org/"/>
 <repository type="git" name="gstreamer.freedesktop.org"
     href="git://anongit.freedesktop.org/gstreamer/"/>
-<repository type="git" name="colord.gitorious.org"
-    href="git://gitorious.org/colord/master.git"/>
 <repository type="cvs" name="libxklavier.freedesktop.org"
     cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/xklavier"
     password=""/>
@@ -530,21 +528,6 @@
     </branch>
   </autotools>
 
-  <autotools id="colord" autogenargs="--disable-examples">
-    <branch repo="colord.gitorious.org" checkoutdir="colord" module="master"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus"/>
-      <dep package="gudev"/>
-      <dep package="sqlite3"/>
-      <!-- and cups -->
-      <!-- and sane -->
-    </dependencies>
-    <suggests>
-      <dep package="polkit"/>
-    </suggests>
-  </autotools>
-
   <repository type="tarball" name="icon-theme.freedesktop.org"
 	  href="http://icon-theme.freedesktop.org/releases/"/>
   <autotools id="hicolor-icon-theme" supports-non-srcdir-builds="no"
@@ -1145,12 +1128,6 @@
     </dependencies>
   </tarball>
 
-  <tarball id="lcms2" version="2.0a" checkoutdir="lcms-2.0">
-    <source href="http://downloads.sourceforge.net/lcms/lcms2-2.1.tar.gz";
-            hash="sha256:8b367bd60add7806c9aac970594dae636c24ba28dc774c00f8067644994e9c30"
-            md5sum="08036edb115ad74456dfa20b1998b5f4" size="3752136"/>
-  </tarball>
-
   <autotools id="WebKit" makefile="GNUmakefile"
              autogenargs="--with-gtk=3.0 --enable-introspection">
     <branch repo="webkitgtk.org"