[jhbuild] Switch from farsight2 to farstream

[Guillaume Desmottes <gdesmott src gnome org>]

commit f15ddd68dc8995ae0d834456428f4b25d2ffeb19
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Feb 21 15:07:31 2012 +0100

    Switch from farsight2 to farstream

 modulesets/gnome-suites-core-3.4.modules      |    3 +--
 modulesets/gnome-suites-core-deps-3.4.modules |   25 +++++++------------------
 2 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.4.modules b/modulesets/gnome-suites-core-3.4.modules
index 2c6f09f..c2dce16 100644
--- a/modulesets/gnome-suites-core-3.4.modules
+++ b/modulesets/gnome-suites-core-3.4.modules
@@ -558,7 +558,7 @@
       <dep package="libsoup"/>
       <dep package="libxml2"/>
       <dep package="pulseaudio"/>
-      <dep package="telepathy-farsight"/>
+      <dep package="telepathy-farstream"/>
       <dep package="telepathy-glib"/>
       <dep package="telepathy-logger"/>
       <dep package="telepathy-mission-control"/>
@@ -574,7 +574,6 @@
       <dep package="iso-codes"/>
       <dep package="libchamplain"/>
       <dep package="NetworkManager"/>
-      <dep package="telepathy-farstream"/>
     </suggests>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.4.modules b/modulesets/gnome-suites-core-deps-3.4.modules
index 2f8389c..f78f755 100644
--- a/modulesets/gnome-suites-core-deps-3.4.modules
+++ b/modulesets/gnome-suites-core-deps-3.4.modules
@@ -380,21 +380,20 @@
             md5sum="ee8b492592568805593f81f8cdf2a04c" size="446456"/>
   </tarball>
 
-  <tarball id="farsight2" version="0.0.31" autogenargs="--disable-python">
-    <source href="http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.31.tar.gz";
-            hash="sha256:55ce219c67a93bc55bcf30d6a5bfcadf09e1c5349d179b2da9ccb74c42271f9b"
-            md5sum="3771d8268f025b28261cc1e977fab27f" size="1231416"/>
+  <tarball id="farstream" version="0.1.1" autogenargs="--disable-python">
+    <source href="http://freedesktop.org/software/farstream/releases/farstream/farstream-0.1.1.tar.gz";
+            hash="sha256:7b88a0730fbdd03297295574a613409790bf751d578690d7072cbf2be3f9ad52"/>
     <dependencies>
       <dep package="libnice"/>
     </dependencies>
   </tarball>
 
-  <tarball id="telepathy-farstream" version="0.1.2" autogenargs="--disable-python">
-    <source href="http://telepathy.freedesktop.org/releases/telepathy-farstream/telepathy-farstream-0.1.2.tar.gz";
-            hash="sha256:173e6a56e3a85def2c8b48c247e1fee20bb5a3ead05d2c5609d1e290c7b2a60e"/>
+  <tarball id="telepathy-farstream" version="0.2.1" autogenargs="--disable-python">
+    <source href="http://telepathy.freedesktop.org/releases/telepathy-farstream/telepathy-farstream-0.2.1.tar.gz";
+            hash="sha256:01a0b66fc2d016a7e5b54f02797ad7134b0485e7a6398c3e3c11824a31e94d0c"/>
     <dependencies>
       <dep package="telepathy-glib"/>
-      <dep package="farsight2"/>
+      <dep package="farstream"/>
     </dependencies>
   </tarball>
 
@@ -1198,16 +1197,6 @@
     </dependencies>
   </tarball>
 
-  <tarball id="telepathy-farsight" version="0.0.19" autogenargs="--disable-python">
-    <pkg-config>telepathy-farsight.pc</pkg-config>
-    <source href="http://telepathy.freedesktop.org/releases/telepathy-farsight/telepathy-farsight-0.0.19.tar.gz";
-            hash="sha256:2c89b8b259f91df33f93703eab1de493b193b163c32facb532ec2710b8f05269"/>
-    <dependencies>
-      <dep package="telepathy-glib"/>
-      <dep package="farsight2"/>
-    </dependencies>
-  </tarball>
-
   <autotools id="totem-pl-parser">
     <branch/>
     <dependencies>