[jhbuild] 3.20: Move gnome-clocks to core

[Michael Catanzaro <mcatanzaro src gnome org>]

commit e013cc404973aa55c1a808925b22026f0ef92e92
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Jan 17 19:56:33 2016 -0600

    3.20: Move gnome-clocks to core
    
    And add a comment to warn that gnome-color-manager is not a good place
    to put apps next to; hopefully will help to keep the file organized....

 modulesets/gnome-apps-3.20.modules        |   15 ---------------
 modulesets/gnome-suites-core-3.20.modules |   16 ++++++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index 68c4b32..805d90e 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -496,20 +496,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-clocks">
-    <branch/>
-    <dependencies>
-      <dep package="vala"/>
-      <dep package="gtk+"/>
-      <dep package="gsound"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libgweather"/>
-      <dep package="geoclue"/>
-      <dep package="geocode-glib"/>
-      <dep package="yelp-tools"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-getting-started-docs">
     <branch/>
     <dependencies>
@@ -894,7 +880,6 @@
       <dep package="gitg"/>
       <dep package="glade"/>
       <dep package="gnome-builder"/>
-      <dep package="gnome-clocks"/>
       <dep package="gnome-chess"/>
       <dep package="gnome-calendar"/>
       <dep package="gnome-devel-docs"/>
diff --git a/modulesets/gnome-suites-core-3.20.modules b/modulesets/gnome-suites-core-3.20.modules
index 572bf86..fb35deb 100644
--- a/modulesets/gnome-suites-core-3.20.modules
+++ b/modulesets/gnome-suites-core-3.20.modules
@@ -178,6 +178,7 @@
     </suggests>
   </autotools>
 
+  <!-- Not an app, but a service for gnome-control-center -->
   <autotools id="gnome-color-manager">
     <branch/>
     <dependencies>
@@ -783,6 +784,20 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-clocks">
+    <branch/>
+    <dependencies>
+      <dep package="vala"/>
+      <dep package="gtk+"/>
+      <dep package="gsound"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libgweather"/>
+      <dep package="geoclue"/>
+      <dep package="geocode-glib"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-contacts">
     <branch/>
     <dependencies>
@@ -1230,6 +1245,7 @@
       <dep package="gnome-boxes"/>
       <dep package="gnome-calculator"/>
       <dep package="gnome-characters"/>
+      <dep package="gnome-clocks"/>
       <dep package="gnome-contacts"/>
       <dep package="gnome-font-viewer"/>
       <dep package="gnome-logs"/>