[jhbuild] 3.20: Remove farstream and telepathy-farstream from core-deps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 9c1c6763992a840a5e936e0520ea73ef155ba7f3
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Jan 17 17:00:57 2016 -0600

    3.20: Remove farstream and telepathy-farstream from core-deps

 modulesets/gnome-suites-core-deps-3.20.modules |   23 -----------------------
 modulesets/gnome-world.modules                 |   24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 0b705d6..6b55157 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -567,29 +567,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="farstream" autogenargs="--disable-python">
-    <branch repo="freedesktop.org"
-            module="farstream/releases/farstream/farstream-${version}.tar.gz"
-            version="0.2.7"
-            hash="sha256:dad0ed43cf94e71df558c23825abe57db59d1ee8d970ffaec5e2dbc2e7acbf7d"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="libnice"/>
-    </dependencies>
-    <suggests>
-      <dep package="gupnp-igd"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="telepathy-farstream" autogenargs="--disable-python --disable-Werror">
-    <branch repo="telepathy.freedesktop.org"/>
-    <dependencies>
-      <dep package="telepathy-glib"/>
-      <dep package="farstream"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="folks" autogenargs="--enable-eds-backend --disable-libsocialweb-backend 
--disable-fatal-warnings"
              uninstall-before-install="true">
     <branch/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 7d4039f..0a9aa9f 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -3300,4 +3300,28 @@
     </suggests>
   </autotools>
 
+  <autotools id="farstream" autogenargs="--disable-python">
+    <branch repo="freedesktop.org"
+            module="farstream/releases/farstream/farstream-${version}.tar.gz"
+            version="0.2.7"
+            hash="sha256:dad0ed43cf94e71df558c23825abe57db59d1ee8d970ffaec5e2dbc2e7acbf7d"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="libnice"/>
+    </dependencies>
+    <suggests>
+      <dep package="gupnp-igd"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="telepathy-farstream" autogenargs="--disable-python --disable-Werror">
+    <branch repo="telepathy.freedesktop.org"/>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+      <dep package="farstream"/>
+    </dependencies>
+  </autotools>
+
+
 </moduleset>