[jhbuild] 3.22: Move gnome-photos to core

[Michael Catanzaro <mcatanzaro src gnome org>]

commit ea19fb10fedf060645988a1e6e80e50fbbb53fce
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Aug 21 10:25:52 2016 -0500

    3.22: Move gnome-photos to core
    
    This requires moving babl and gegl to core-deps

 modulesets/gnome-apps-3.22.modules             |   44 ------------------------
 modulesets/gnome-suites-core-3.22.modules      |   24 +++++++++++++
 modulesets/gnome-suites-core-deps-3.22.modules |   20 +++++++++++
 3 files changed, 44 insertions(+), 44 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.22.modules b/modulesets/gnome-apps-3.22.modules
index f992b32..c3ac755 100644
--- a/modulesets/gnome-apps-3.22.modules
+++ b/modulesets/gnome-apps-3.22.modules
@@ -46,10 +46,6 @@
 
 <!-- Dependencies and miscellaneous -->
 
-  <autotools id="babl">
-    <branch/>
-  </autotools>
-
   <autotools id="farstream" autogenargs="--disable-python" supports-non-srcdir-builds="no">
     <branch repo="freedesktop.org"
             module="farstream/releases/farstream/farstream-${version}.tar.gz"
@@ -83,22 +79,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gegl">
-    <branch/>
-    <dependencies>
-      <dep package="babl"/>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="pango"/>
-      <dep package="libjasper"/>
-      <dep package="libjpeg"/>
-      <dep package="libpng"/>
-      <dep package="libraw"/>
-      <dep package="librsvg"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-devel-docs">
     <branch/>
     <dependencies>
@@ -475,29 +455,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-photos">
-    <branch/>
-    <dependencies>
-      <dep package="babl"/>
-      <dep package="gegl"/>
-      <dep package="cairo"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gexiv2"/>
-      <dep package="glib"/>
-      <dep package="gnome-desktop"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gnome-online-miners"/>
-      <dep package="grilo"/>
-      <dep package="grilo-plugins"/>
-      <dep package="gtk+"/>
-      <dep package="libgdata"/>
-      <dep package="libgfbgraph"/>
-      <dep package="libjpeg"/>
-      <dep package="libpng"/>
-      <dep package="tracker"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-sound-recorder">
     <branch/>
     <dependencies>
@@ -861,7 +818,6 @@
       <dep package="bijiben"/>
       <dep package="gnome-dictionary"/>
       <dep package="gnome-music"/>
-      <dep package="gnome-photos"/>
     </dependencies>
   </metamodule>
 
diff --git a/modulesets/gnome-suites-core-3.22.modules b/modulesets/gnome-suites-core-3.22.modules
index 9fcde21..b533683 100644
--- a/modulesets/gnome-suites-core-3.22.modules
+++ b/modulesets/gnome-suites-core-3.22.modules
@@ -979,6 +979,29 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-photos">
+    <branch/>
+    <dependencies>
+      <dep package="babl"/>
+      <dep package="gegl"/>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gexiv2"/>
+      <dep package="glib"/>
+      <dep package="gnome-desktop"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gnome-online-miners"/>
+      <dep package="grilo"/>
+      <dep package="grilo-plugins"/>
+      <dep package="gtk+"/>
+      <dep package="libgdata"/>
+      <dep package="libgfbgraph"/>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="tracker"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-screenshot">
     <branch/>
     <dependencies>
@@ -1296,6 +1319,7 @@
       <dep package="gnome-contacts"/>
       <dep package="gnome-font-viewer"/>
       <dep package="gnome-maps"/>
+      <dep package="gnome-photos"/>
       <dep package="gnome-screenshot"/>
       <dep package="gnome-software"/>
       <dep package="gnome-system-monitor"/>
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index 31df77f..b88b473 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -104,6 +104,10 @@
     </dependencies>
   </autotools>
 
+  <autotools id="babl">
+    <branch/>
+  </autotools>
+
   <autotools id="cairomm" autogen-sh="configure">
     <branch module="releases/cairomm-${version}.tar.gz"
             version="1.12.0"
@@ -344,6 +348,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gegl">
+    <branch/>
+    <dependencies>
+      <dep package="babl"/>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="pango"/>
+      <dep package="libjasper"/>
+      <dep package="libjpeg"/>
+      <dep package="libpng"/>
+      <dep package="libraw"/>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="geoclue" autogenargs="--with-systemdsystemunitdir=no">
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-cdma-source"/>