[jhbuild] 3.2: moving colord and lcms2 to core deps

[Frederic Peters <fpeters src gnome org>]

commit 5625dfad6e0b13c63d304ef2d5257ea6ec1ba8a9
Author: Frédéric Péters <fpeters 0d be>
Date:   Mon Jun 13 20:41:18 2011 +0200

    3.2: moving colord and lcms2 to core deps

 modulesets/gnome-apps-3.2.modules             |   24 ------------------------
 modulesets/gnome-suites-core-deps-3.2.modules |   24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.2.modules b/modulesets/gnome-apps-3.2.modules
index 2c0a0b1..33551b7 100644
--- a/modulesets/gnome-apps-3.2.modules
+++ b/modulesets/gnome-apps-3.2.modules
@@ -37,8 +37,6 @@
       href="https://launchpad.net/"/>
   <repository type="git" name="yorba.org"
       href="git://yorba.org/"/>
-<repository type="git" name="colord.gitorious.org"
-    href="git://gitorious.org/colord/master.git"/>
 
   <include href="gnome-suites-core-3.2.modules"/>
 
@@ -624,28 +622,6 @@
     </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"/>
-      <dep package="lcms2"/>
-      <!-- and cups -->
-      <!-- and sane -->
-    </dependencies>
-    <suggests>
-      <dep package="polkit"/>
-    </suggests>
-  </autotools>
-
- <tarball id="lcms2" version="2.2" checkoutdir="lcms-2.2">
-    <source href="http://downloads.sourceforge.net/lcms/lcms2-2.2.tar.gz";
-            hash="sha256:b6f2a1be1a2b7ca54bfab69b32242d383a176637f161eeeaef451bd9fc1195cc"
-            md5sum="aaf33c7c25675e6163189ba488ae20f5" size="4193353"/>
-  </tarball>
-
   <autotools id="gnome-color-manager">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-suites-core-deps-3.2.modules b/modulesets/gnome-suites-core-deps-3.2.modules
index 671fb54..5b0be78 100644
--- a/modulesets/gnome-suites-core-deps-3.2.modules
+++ b/modulesets/gnome-suites-core-deps-3.2.modules
@@ -15,6 +15,8 @@
     password=""/>
 <repository type="git" name="git.debian.org"
     href="git://git.debian.org/git"/>
+<repository type="git" name="colord.gitorious.org"
+    href="git://gitorious.org/colord/master.git"/>
 
 <!-- tarball repos -->
 <repository type="tarball" name="ftp.gnu.org"
@@ -1225,6 +1227,28 @@
     </branch>
   </autotools>
 
+ <tarball id="lcms2" version="2.2" checkoutdir="lcms-2.2">
+    <source href="http://downloads.sourceforge.net/lcms/lcms2-2.2.tar.gz";
+            hash="sha256:b6f2a1be1a2b7ca54bfab69b32242d383a176637f161eeeaef451bd9fc1195cc"
+            md5sum="aaf33c7c25675e6163189ba488ae20f5" size="4193353"/>
+  </tarball>
+
+  <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"/>
+      <dep package="lcms2"/>
+      <!-- and cups -->
+      <!-- and sane -->
+    </dependencies>
+    <suggests>
+      <dep package="polkit"/>
+    </suggests>
+  </autotools>
+
 
   <!-- Deprecated dependencies -->