[jhbuild/jjardon/reorganisation: 4/4] 3.16: Move some core-apps only dependencies to core-apps

[Javier Jardón <jjardon src gnome org>]

commit 23d323938d8c8377488b84abecdb346f757ebf90
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Oct 11 00:15:56 2014 +0100

    3.16: Move some core-apps only dependencies to core-apps

 modulesets/gnome-core-apps-3.16.modules |   60 +++++++++++++++++++++++++++++++
 modulesets/gnome-core-deps-3.16.modules |   53 ---------------------------
 2 files changed, 60 insertions(+), 53 deletions(-)
---
diff --git a/modulesets/gnome-core-apps-3.16.modules b/modulesets/gnome-core-apps-3.16.modules
index c89b993..7923bef 100644
--- a/modulesets/gnome-core-apps-3.16.modules
+++ b/modulesets/gnome-core-apps-3.16.modules
@@ -8,6 +8,11 @@
   <repository type="git" name="git.gnome.org" default="yes"
       href="git://git.gnome.org/"/>
 
+  <!-- tarball repos -->
+  <repository type="tarball" name="libopenraw.freedesktop.org"
+      href="http://libopenraw.freedesktop.org/download/"/>
+
+
   <include href="gnome-core-3.16.modules"/>
 
   <!-- Please try to keep organized alphabetically -->
@@ -344,4 +349,59 @@
     </dependencies>
   </autotools>
 
+
+  <!-- Core Apps Dependencies -->
+
+
+  <autotools id="exempi" autogenargs="--enable-unittest=no">
+    <pkg-config>exempi-2.0.pc</pkg-config>
+    <branch repo="libopenraw.freedesktop.org"
+            module="exempi-${version}.tar.bz2"
+            version="2.2.1"
+            hash="sha256:6c9e4380041abca80ef0e0029c07109f183506b812f870d8689e7140997fa601"/>
+  </autotools>
+
+  <autotools id="grilo">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+      <dep package="gtk+"/>
+      <dep package="vala"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="totem-pl-parser"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="grilo-plugins">
+    <branch/>
+    <dependencies>
+      <dep package="grilo"/>
+      <dep package="libxml2"/>
+      <dep package="totem-pl-parser"/>
+    </dependencies>
+    <suggests>
+      <dep package="avahi"/>
+      <dep package="gmime"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gssdp"/>
+      <dep package="gupnp"/>
+      <dep package="gupnp-av"/>
+      <dep package="json-glib"/>
+      <dep package="libarchive"/>
+      <dep package="libdmapsharing"/>
+      <dep package="libgcrypt"/>
+      <dep package="libgdata"/>
+      <dep package="libmediaart"/>
+      <dep package="liboauth"/>
+      <dep package="librest"/>
+      <dep package="libsoup"/>
+      <dep package="sqlite3"/>
+      <dep package="tracker"/>
+    </suggests>
+  </autotools>
+
 </moduleset>
diff --git a/modulesets/gnome-core-deps-3.16.modules b/modulesets/gnome-core-deps-3.16.modules
index bfa9ea9..270aa20 100644
--- a/modulesets/gnome-core-deps-3.16.modules
+++ b/modulesets/gnome-core-deps-3.16.modules
@@ -42,8 +42,6 @@
     href="http://people.freedesktop.org/"/>
 <repository type="tarball" name="icon-theme.freedesktop.org"
     href="http://icon-theme.freedesktop.org/releases/"/>
-<repository type="tarball" name="libopenraw.freedesktop.org"
-    href="http://libopenraw.freedesktop.org/download/"/>
 <repository type="tarball" name="nice.freedesktop.org"
     href="http://nice.freedesktop.org/releases/"/>
 <repository type="tarball" name="poppler.freedesktop.org"
@@ -553,14 +551,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="exempi" autogenargs="--enable-unittest=no">
-    <pkg-config>exempi-2.0.pc</pkg-config>
-    <branch repo="libopenraw.freedesktop.org"
-            module="exempi-${version}.tar.bz2"
-            version="2.2.1"
-            hash="sha256:6c9e4380041abca80ef0e0029c07109f183506b812f870d8689e7140997fa601"/>
-  </autotools>
-
   <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings">
     <branch/>
     <dependencies>
@@ -590,49 +580,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="grilo">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-    <suggests>
-      <dep package="gtk+"/>
-      <dep package="vala"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="totem-pl-parser"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="grilo-plugins">
-    <branch/>
-    <dependencies>
-      <dep package="grilo"/>
-      <dep package="libxml2"/>
-      <dep package="totem-pl-parser"/>
-    </dependencies>
-    <suggests>
-      <dep package="avahi"/>
-      <dep package="gmime"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gssdp"/>
-      <dep package="gupnp"/>
-      <dep package="gupnp-av"/>
-      <dep package="json-glib"/>
-      <dep package="libarchive"/>
-      <dep package="libdmapsharing"/>
-      <dep package="libgcrypt"/>
-      <dep package="libgdata"/>
-      <dep package="libmediaart"/>
-      <dep package="liboauth"/>
-      <dep package="librest"/>
-      <dep package="libsoup"/>
-      <dep package="sqlite3"/>
-      <dep package="tracker"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gtksourceview" autogenargs="--enable-compile-warnings=maximum">
     <branch/>
     <dependencies>