[jhbuild] 3.20: Move Empathy to apps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 898e154162d61544c0e40fb07197cc60c42e1bb6
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Jan 17 21:07:56 2016 -0600

    3.20: Move Empathy to apps
    
    World was perhaps too harsh. Empathy is still very useful and worth
    keeping tested and building.

 modulesets/gnome-apps-3.20.modules |   44 ++++++++++++++++++++++++++++++++++++
 modulesets/gnome-world.modules     |   43 -----------------------------------
 2 files changed, 44 insertions(+), 43 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.20.modules b/modulesets/gnome-apps-3.20.modules
index 51165b0..6c69d1c 100644
--- a/modulesets/gnome-apps-3.20.modules
+++ b/modulesets/gnome-apps-3.20.modules
@@ -284,6 +284,49 @@
     </dependencies>
   </autotools>
 
+  <autotools id="empathy">
+    <branch/>
+    <dependencies>
+      <dep package="clutter"/>
+      <dep package="clutter-gst"/>
+      <dep package="clutter-gtk"/>
+      <dep package="dbus-glib"/>
+      <dep package="intltool"/>
+      <dep package="farstream"/>
+      <dep package="folks"/>
+      <dep package="gcr"/>
+      <dep package="glib"/>
+      <dep package="libgee"/>
+      <dep package="libsecret"/>
+      <dep package="gnome-online-accounts"/>
+      <dep package="gnutls"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="gstreamer"/>
+      <dep package="gtk+"/>
+      <dep package="libcanberra"/>
+      <dep package="libsoup"/>
+      <dep package="libxml2"/>
+      <dep package="pulseaudio"/>
+      <dep package="telepathy-farstream"/>
+      <dep package="telepathy-glib"/>
+      <dep package="telepathy-logger"/>
+      <dep package="telepathy-mission-control"/>
+      <dep package="libnotify"/>
+      <dep package="WebKit1"/>
+    </dependencies>
+    <suggests>
+      <dep package="enchant"/>
+      <dep package="geoclue"/>
+      <dep package="geocode-glib"/>
+      <dep package="iso-codes"/>
+      <dep package="libchamplain"/>
+      <if condition-set="linux">
+        <dep package="NetworkManager"/>
+        <dep package="gudev"/>
+      </if>
+    </suggests>
+  </autotools>
+
   <autotools id="evolution" autogenargs="--disable-autoar --disable-libcryptui --disable-pst-import">
     <branch/>
     <dependencies>
@@ -763,6 +806,7 @@
       <dep package="brasero"/>
       <dep package="dconf-editor"/>
       <dep package="devhelp"/>
+      <dep package="empathy"/>
       <dep package="evolution"/>
       <dep package="gedit"/>
       <dep package="gitg"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 4e77a51..3b7f36b 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -172,49 +172,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="empathy">
-    <branch/>
-    <dependencies>
-      <dep package="clutter"/>
-      <dep package="clutter-gst"/>
-      <dep package="clutter-gtk"/>
-      <dep package="dbus-glib"/>
-      <dep package="intltool"/>
-      <dep package="farstream"/>
-      <dep package="folks"/>
-      <dep package="gcr"/>
-      <dep package="glib"/>
-      <dep package="libgee"/>
-      <dep package="libsecret"/>
-      <dep package="gnome-online-accounts"/>
-      <dep package="gnutls"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="gstreamer"/>
-      <dep package="gtk+"/>
-      <dep package="libcanberra"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-      <dep package="pulseaudio"/>
-      <dep package="telepathy-farstream"/>
-      <dep package="telepathy-glib"/>
-      <dep package="telepathy-logger"/>
-      <dep package="telepathy-mission-control"/>
-      <dep package="libnotify"/>
-      <dep package="WebKit1"/>
-    </dependencies>
-    <suggests>
-      <dep package="enchant"/>
-      <dep package="geoclue"/>
-      <dep package="geocode-glib"/>
-      <dep package="iso-codes"/>
-      <dep package="libchamplain"/>
-      <if condition-set="linux">
-        <dep package="NetworkManager"/>
-        <dep package="gudev"/>
-      </if>
-    </suggests>
-  </autotools>
-
   <autotools id="gconf"
              autogenargs="--enable-gtk --with-gtk=3.0 --disable-orbit">
     <branch/>