jhbuild r2199 - in trunk: . modulesets

[vuntz svn gnome org]

Author: vuntz
Date: Wed Aug  6 11:30:46 2008
New Revision: 2199
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2199&view=rev

Log:
2008-08-06  Vincent Untz  <vuntz gnome org>

	* modulesets/gnome-2.24.modules:
	* modulesets/gnome-suites-2.24.modules: move empathy in the desktop
	suite, remove gtksourceview-1.0
	* modulesets/freedesktop-2.24.modules:
	* modulesets/gnome-external-deps-2.24.modules: move telepathy-glib,
	libtelepathy and telepathy-mission-control in the external
	dependencies


Modified:
   trunk/ChangeLog
   trunk/modulesets/freedesktop-2.24.modules
   trunk/modulesets/gnome-2.24.modules
   trunk/modulesets/gnome-external-deps-2.24.modules
   trunk/modulesets/gnome-suites-2.24.modules

Modified: trunk/modulesets/freedesktop-2.24.modules
==============================================================================
--- trunk/modulesets/freedesktop-2.24.modules	(original)
+++ trunk/modulesets/freedesktop-2.24.modules	Wed Aug  6 11:30:46 2008
@@ -38,8 +38,6 @@
   <repository type="darcs" name="farsight.freedesktop.org"
       href="http://projects.collabora.co.uk/darcs/farsight/"/>
 
-  <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/"/>
 
@@ -232,17 +230,6 @@
 
   <!-- ################################################ -->
   <!-- ################ Telepathy Stuff ############### -->
-  <autotools id="telepathy-glib">
-    <branch repo="telepathy.freedesktop.org"
-	    module="telepathy-glib" checkoutdir="telepathy-glib" />
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-      <dep package="libxslt"/>
-    </dependencies>
-  </autotools>
-
   <distutils id="telepathy-python">
     <branch repo="telepathy.freedesktop.org"
 	    module="telepathy-python" checkoutdir="telepathy-python" />
@@ -251,26 +238,6 @@
     </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="telepathy-glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="telepathy-mission-control">
-    <branch repo="mission-control.sf.net"
-            module="branches/mission-control4" checkoutdir="telepathy-mission-control" />
-    <dependencies>
-      <dep package="libtelepathy"/>
-      <dep package="telepathy-glib"/>
-      <dep package="gnome-keyring"/>
-      <dep package="gconf"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gst-plugins-farsight">
     <branch repo="farsight.freedesktop.org"
 	    module="gst-plugins-farsight" checkoutdir="gst-plugins-farsight" />

Modified: trunk/modulesets/gnome-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-2.24.modules	(original)
+++ trunk/modulesets/gnome-2.24.modules	Wed Aug  6 11:30:46 2008
@@ -1295,20 +1295,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="empathy">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libglade"/>
-      <dep package="gconf"/>
-      <dep package="telepathy-glib"/>
-      <dep package="telepathy-mission-control"/>
-      <dep package="evolution-data-server"/>
-      <dep package="gnome-panel"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="xdg-user-dirs-gtk">
     <branch/>
     <dependencies>

Modified: trunk/modulesets/gnome-external-deps-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-external-deps-2.24.modules	(original)
+++ trunk/modulesets/gnome-external-deps-2.24.modules	Wed Aug  6 11:30:46 2008
@@ -307,7 +307,7 @@
              md5sum="2c3bf7e8236a96659728ad139ce30b33" size="1694566"/>
   </tarball>
 
-  <tarball id="shared-mime-info" supports-non-srcdir-builds="no" version="0.23">
+  <tarball id="shared-mime-info" supports-non-srcdir-builds="no" version="0.50">
     <source href="http://people.freedesktop.org/~hadess/shared-mime-info-0.50.tar.bz2";
             md5sum="e6adfaf1989140b3d3930c3842a01895" size="436994"/>
     <dependencies>
@@ -345,6 +345,37 @@
     </suggests>
   </tarball>
 
+  <!-- Note: libtelepathy is deprecated in favour of Telepathy GLib -->
+  <tarball id="libtelepathy">
+    <source href="http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.3.3.tar.gz";
+            md5sum="490ca1a0c614d4466394b72d43bf7370" size="439764"/>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="telepathy-glib">
+    <source href="http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.13.tar.gz";
+            md5sum="e3afae16ea6b049872a0508e51b3b1e7" size="1555341"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="libxslt"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="telepathy-mission-control">
+    <source href="http://dl.sourceforge.net/sourceforge/mission-control/telepathy-mission-control-4.67.tar.gz";
+            md5sum="0a547e7af4a33355bac3638dd2e40859" size="659444"/>
+    <dependencies>
+      <dep package="libtelepathy"/>
+      <dep package="telepathy-glib"/>
+      <dep package="gnome-keyring"/>
+      <dep package="gconf"/>
+    </dependencies>
+  </tarball>
+
   <repository type="tarball" name="mozilla.org"
       href="http://releases.mozilla.org/pub/mozilla.org/"/>
   <autotools id="mozilla"

Modified: trunk/modulesets/gnome-suites-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.24.modules	(original)
+++ trunk/modulesets/gnome-suites-2.24.modules	Wed Aug  6 11:30:46 2008
@@ -329,6 +329,20 @@
     </dependencies>
   </tarball>
 
+  <autotools id="empathy">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libglade"/>
+      <dep package="gconf"/>
+      <dep package="telepathy-glib"/>
+      <dep package="telepathy-mission-control"/>
+      <dep package="evolution-data-server"/>
+      <dep package="gnome-panel"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="eog">
     <branch/>
     <dependencies>
@@ -657,7 +671,6 @@
       <dep package="gnome-panel"/>
       <dep package="libgnomeprint"/>
       <dep package="libgnomeprintui"/>
-      <dep package="gtksourceview-1.0"/>
       <dep package="libwnck"/>
       <dep package="totem-pl-parser"/>
       <dep package="libgtop"/>
@@ -857,16 +870,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtksourceview-1.0" autogenargs="--enable-compile-warnings=maximum">
-    <branch module="gtksourceview" revision="gnome-2-18"/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <dep package="libgnomeprint"/>
-      <dep package="gnome-vfs"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gucharmap">
     <branch/>
     <dependencies>
@@ -1516,6 +1519,7 @@
       <dep package="deskbar-applet"/>
       <dep package="eel"/>
       <dep package="ekiga"/>
+      <dep package="empathy"/>
       <dep package="eog"/>
       <dep package="epiphany"/>
       <dep package="evince"/>