jhbuild r1915 - in trunk: . modulesets

[lferrett svn gnome org]

Author: lferrett
Date: Fri Mar  7 09:52:13 2008
New Revision: 1915
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1915&view=rev

Log:
2008-03-07  Luca Ferretti  <elle uca libero it>

	* modulesets/freedesktop-2.22.modules:
	Update all telepathy related modules: clened dependencies,
	added "telepathy-idle", "pymsn", "telepathy-haze",
	"telepathy-butterfly", "telepathy-python" plus metamodules
	"meta-telepathy-library" and "meta-telepathy-connection-managers".

	Note 1: to build pymsn see http://live.gnome.org/JhbuildIssues/pymsn
	Note 2: to build haze you need libpurple



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

Modified: trunk/modulesets/freedesktop-2.22.modules
==============================================================================
--- trunk/modulesets/freedesktop-2.22.modules	(original)
+++ trunk/modulesets/freedesktop-2.22.modules	Fri Mar  7 09:52:13 2008
@@ -33,13 +33,15 @@
   <repository type="git" name="libcc-git.freedesktop.org"
       href="git://people.freedesktop.org/~herzi/"/>
 
+  <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"; />
+ 
   <repository type="darcs" name="telepathy.freedesktop.org"
       href="http://projects.collabora.co.uk/darcs/telepathy/"/>
   <repository type="svn" name="mission-control.sf.net"
       href="http://mission-control.svn.sourceforge.net/svnroot/mission-control/"/>
+  <repository type="bzr" name="telepathy-msn.freedesktop.org"
+      href="http://bzr.collabora.co.uk/bzr/telepathy/"/>
 
-  <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"; />
- 
   <autotools id="glitz">
     <branch repo="cairo.freedesktop.org"/>
   </autotools>
@@ -138,17 +140,61 @@
             md5sum="88adb66483d4f76f03431259e2247e09" size="225124"/>
   </tarball>
 
-  <autotools id="libtelepathy">
-    <branch repo="telepathy.freedesktop.org"
-	    module="libtelepathy" checkoutdir="libtelepathy" />
+  <autotools id="libccc">
+	  <branch repo="libcc-git.freedesktop.org"
+		  module="ccc" checkoutdir="libccc"  />
+    <dependencies>
+      <dep package="dbus"/>
+    </dependencies>
+  </autotools>
+
+  <!-- You need libgs (GhostScritp) in order to build this -->
+  <autotools id="libspectre">
+	  <branch repo="git.freedesktop.org"
+		  module="libspectre" checkoutdir="libspectre"  />
+    <dependencies>
+      <dep package="cairo"/>
+    </dependencies>
+  </autotools>
+
+  <repository type="tarball" name="poppler.freedesktop.org"
+	      href="http://poppler.freedesktop.org/"/>
+  <autotools id="poppler-data" skip-autogen="true"
+	    makeargs=""  makeinstallargs="install prefix=${prefix}">
+    <branch repo="poppler.freedesktop.org"
+	    module="poppler-data-0.2.0.tar.gz" version="0.2.0"
+            md5sum="b7f98e84a4d2a2c794271d746ec7ee0b" size="4052536">
+    </branch>
+  </autotools> 
+
+  <autotools id="exempi" autogenargs="--enable-unittest=no">
+    <branch repo="git.freedesktop.org"/>
+  </autotools>
+
+  <autotools id="libopenraw">
+    <branch repo="git.freedesktop.org"/>
+    <dependencies>
+      <dep package="exempi"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="PackageKit">
+    <branch repo="git.freedesktop.org"
+	    module="packagekit" checkoutdir="PackageKit"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
-      <dep package="telepathy-glib"/>
     </dependencies>
+    <suggests>
+      <dep package="NetworkManager"/>
+      <dep package="PolicyKit"/>
+    </suggests>
   </autotools>
 
+  <!-- ################################################ -->
+  <!-- ################ Telepathy Stuff ############### -->
   <autotools id="telepathy-glib">
     <branch repo="telepathy.freedesktop.org"
 	    module="telepathy-glib" checkoutdir="telepathy-glib" />
@@ -160,18 +206,20 @@
     </dependencies>
   </autotools>
 
-  <!-- Gabble is a Jabber/XMPP connection manager that handles -->
-  <!-- single-user and multi-user chats and voice/video calls  -->
-  <autotools id="telepathy-gabble">
+  <distutils id="telepathy-python">
     <branch repo="telepathy.freedesktop.org"
-	    module="telepathy-gabble" checkoutdir="telepathy-gabble" />
+	    module="telepathy-python" checkoutdir="telepathy-python" />
+    <dependencies>
+      <dep package="dbus-python"/>
+    </dependencies>
+  </distutils>
+
+  <!-- Note: libtelepathy is deprecated in favour of Telepathy GLib -->
+  <autotools id="libtelepathy">
+    <branch repo="telepathy.freedesktop.org"
+	    module="libtelepathy" checkoutdir="libtelepathy" />
     <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="libxslt"/>
       <dep package="telepathy-glib"/>
-      <dep package="loudmouth"/>
     </dependencies>
   </autotools>
 
@@ -179,76 +227,97 @@
     <branch repo="mission-control.sf.net"
             module="trunk" checkoutdir="telepathy-mission-control" />
     <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
       <dep package="libtelepathy"/>
       <dep package="gconf"/>
-      <dep package="libxslt"/>
     </dependencies>
   </autotools>
 
+  <!-- Gabble is a Jabber/XMPP connection manager that handles -->
+  <!-- single-user and multi-user chats and voice/video calls  -->
+  <autotools id="telepathy-gabble">
+    <branch repo="telepathy.freedesktop.org"
+	    module="telepathy-gabble" checkoutdir="telepathy-gabble" />
+    <dependencies>
+      <dep package="telepathy-glib"/>
+      <dep package="loudmouth"/>
+    </dependencies>
+  </autotools>
+
+  <!-- Salut is a link-local XMPP connection manager                -->
+  <!-- See http://www.xmpp.org/extensions/xep-0174.html for details -->
   <autotools id="telepathy-salut">
     <branch repo="telepathy.freedesktop.org"
             module="telepathy-salut" checkoutdir="telepathy-salut" />
     <dependencies>
       <dep package="telepathy-glib"/>
-      <dep package="dbus-glib"/>
       <dep package="avahi"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libccc">
-	  <branch repo="libcc-git.freedesktop.org"
-		  module="ccc" checkoutdir="libccc"  />
+  <!-- Idle is a full-featured IRC connection manager -->
+  <autotools id="telepathy-idle">
+    <branch repo="telepathy.freedesktop.org"
+            module="telepathy-idle" checkoutdir="telepathy-idle" />
     <dependencies>
-      <dep package="dbus"/>
+      <dep package="telepathy-glib"/>
     </dependencies>
   </autotools>
 
-  <!-- You need libgs (GhostScritp) in order to build this -->
-  <autotools id="libspectre">
-	  <branch repo="git.freedesktop.org"
-		  module="libspectre" checkoutdir="libspectre"  />
+  <!-- Haze is a connection manager based on Pidgin's libpurple -->
+  <autotools id="telepathy-haze">
+    <branch repo="telepathy.freedesktop.org"
+            module="telepathy-haze" checkoutdir="telepathy-haze" />
     <dependencies>
-      <dep package="cairo"/>
+      <dep package="telepathy-glib"/>
+      <!-- requires libpurple (pidgin)  -->
     </dependencies>
   </autotools>
 
-  <repository type="tarball" name="poppler.freedesktop.org"
-	      href="http://poppler.freedesktop.org/"/>
-  <autotools id="poppler-data" skip-autogen="true"
-	    makeargs=""  makeinstallargs="install prefix=${prefix}">
-    <branch repo="poppler.freedesktop.org"
-	    module="poppler-data-0.2.0.tar.gz" version="0.2.0"
-            md5sum="b7f98e84a4d2a2c794271d746ec7ee0b" size="4052536">
-    </branch>
-  </autotools> 
+  <!-- pymsn is the library behind the msn connection manager -->
+  <!-- See http://live.gnome.org/JhbuildIssues/pymsn to build -->
+  <distutils id="pymsn">
+    <branch repo="telepathy-msn.freedesktop.org"
+	    module="pymsn" checkoutdir="pymsn" />
+    <dependencies>
+      <dep package="pygobject"/>
+    </dependencies>
+  </distutils>
 
-  <autotools id="exempi" autogenargs="--enable-unittest=no">
-    <branch repo="git.freedesktop.org"/>
-  </autotools>
+  <!-- Butterfly is a MSN connection manager based on pymsn -->
+  <waf id="telepathy-butterfly">
+    <branch repo="telepathy-msn.freedesktop.org"
+	    module="telepathy-butterfly" checkoutdir="telepathy-butterfly" />
+    <dependencies>
+       <dep package="pymsn"/>
+       <dep package="telepathy-python"/>
+    </dependencies>
+  </waf>
 
-  <autotools id="libopenraw">
-    <branch repo="git.freedesktop.org"/>
+  <metamodule id="meta-telepathy-library">
     <dependencies>
-      <dep package="exempi"/>
-      <dep package="gtk+"/>
+      <dep package="telepathy-glib"/>
+      <dep package="telepathy-python"/>
     </dependencies>
-  </autotools>
+    <suggests>
+      <!-- suggested 'cause deprecated -->
+      <dep package="libtelepathy"/>
+    </suggests>
+  </metamodule>
 
-  <autotools id="PackageKit">
-    <branch repo="git.freedesktop.org"
-	    module="packagekit" checkoutdir="PackageKit"/>
+  <metamodule id="meta-telepathy-connection-managers">
     <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
+      <dep package="telepathy-gabble"/>
+      <dep package="telepathy-salut"/>
+      <dep package="telepathy-idle"/>
     </dependencies>
     <suggests>
-      <dep package="NetworkManager"/>
-      <dep package="PolicyKit"/>
+      <!-- suggested 'cause under development -->
+      <dep package="telepathy-haze"/>
+      <dep package="telepathy-butterfly"/>
     </suggests>
-  </autotools>
+  </metamodule>
+  <!-- ############ End of Telepathy Stuff ############ -->
+  <!-- ################################################ -->
+
 
 </moduleset>