jhbuild r2640 - in trunk: . modulesets

[lferrett svn gnome org]

Author: lferrett
Date: Mon Jan 12 13:52:13 2009
New Revision: 2640
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2640&view=rev

Log:
2009-01-12  Luca Ferretti  <elle uca libero it>

	* modulesets/freedesktop-2.26.modules:
	Add libnice and telepathy-farsight modules; adjust farsight2 deps;
	add telepathy-farsight to meta-telepathy-connection-managers.



Modified:
   trunk/ChangeLog
   trunk/modulesets/freedesktop-2.26.modules

Modified: trunk/modulesets/freedesktop-2.26.modules
==============================================================================
--- trunk/modulesets/freedesktop-2.26.modules	(original)
+++ trunk/modulesets/freedesktop-2.26.modules	Mon Jan 12 13:52:13 2009
@@ -268,6 +268,17 @@
     </dependencies>
   </distutils>
 
+  <!-- Glib ICE library -->
+  <autotools id="libnice">
+    <branch repo="git.collabora.co.uk"
+            module="libnice"
+            checkoutdir="libnice"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gst-plugins-farsight">
     <branch repo="git.collabora.co.uk"
 	    module="gst-plugins-farsight" checkoutdir="gst-plugins-farsight" />
@@ -283,13 +294,24 @@
     <branch repo="git.collabora.co.uk"
 	    module="farsight2" checkoutdir="farsight2" />
     <dependencies>
-      <dep package="glib"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="libxml2"/>
+      <dep package="libnice"/>
     </dependencies>
   </autotools>
 
+  <!-- Telepathy Farsigh2 -->
+  <autotools id="telepathy-farsight">
+    <branch repo="git.collabora.co.uk"
+            module="telepathy-farsight"
+            checkoutdir="telepathy-farsight"/>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+      <dep package="farsight2"/>
+    </dependencies>
+    <suggests>
+      <dep package="gst-python"/>
+    </suggests>
+  </autotools>
+
   <autotools id="telepathy-stream-engine">
     <branch repo="git.collabora.co.uk" />
     <dependencies>
@@ -387,6 +409,7 @@
       <dep package="telepathy-gabble"/>
       <dep package="telepathy-salut"/>
       <dep package="telepathy-idle"/>
+      <dep package="telepathy-farsight"/>
     </dependencies>
     <suggests>
       <!-- suggested 'cause under development -->