[jhbuild] 3.20: Move gnome-color-manager to core

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 3f4389d4a93cd2433f880d5274feec885f5b0903
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Jan 17 18:39:16 2016 -0600

    3.20: Move gnome-color-manager to core

 modulesets/gnome-apps-3.20.modules        |   19 -------------------
 modulesets/gnome-suites-core-3.20.modules |   21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index 9174ac5..038b4f7 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -478,24 +478,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-color-manager">
-    <branch/>
-    <dependencies>
-      <dep package="exiv2"/>
-      <dep package="glib"/>
-      <dep package="gnome-desktop"/>
-      <dep package="gtk+"/>
-      <dep package="intltool"/>
-      <dep package="lcms2"/>
-      <dep package="libcanberra"/>
-      <dep package="libexif"/>
-      <dep package="vte"/>
-      <dep package="colord-gtk"/>
-      <dep package="yelp-tools"/>
-      <!-- and libtiff -->
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-devel-docs">
     <branch/>
     <dependencies>
@@ -1105,7 +1087,6 @@
       <dep package="gnome-clocks"/>
       <dep package="gnome-chess"/>
       <dep package="gnome-calendar"/>
-      <dep package="gnome-color-manager"/>
       <dep package="gnome-devel-docs"/>
       <dep package="gnome-getting-started-docs"/>
       <dep package="gnome-klotski"/>
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index 2908eb5..2d5cbc8 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -178,6 +178,24 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnome-color-manager">
+    <branch/>
+    <dependencies>
+      <dep package="exiv2"/>
+      <dep package="glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gtk+"/>
+      <dep package="intltool"/>
+      <dep package="lcms2"/>
+      <dep package="libcanberra"/>
+      <dep package="libexif"/>
+      <dep package="vte"/>
+      <dep package="colord-gtk"/>
+      <dep package="yelp-tools"/>
+      <!-- and libtiff -->
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
@@ -216,6 +234,7 @@
     <suggests>
       <dep package="cups"/>
       <dep package="cheese"/>
+      <dep package="gnome-color-manager"/>
       <dep package="gstreamer"/>
       <dep package="ibus-libpinyin"/>
       <dep package="ibus-anthy"/>
@@ -1181,6 +1200,8 @@
       <dep package="evolution-data-server"/>
       <dep package="gdm"/>
       <dep package="gnome-backgrounds"/>
+      <!-- Not in utilities because the desktop file is hidden -->
+      <dep package="gnome-color-manager"/>
       <dep package="gnome-control-center"/>
       <dep package="gnome-documents"/>
       <dep package="gnome-initial-setup"/>