jhbuild r1832 - in trunk: . modulesets

[lferrett svn gnome org]

Author: lferrett
Date: Thu Jan 17 09:57:37 2008
New Revision: 1832
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1832&view=rev

Log:
2008-01-17  Luca Ferretti  <elle uca libero it>
	
	* modulesets/gnome-2.22.modules: Removed libdaemon-newer and
	avahi-newer, no longer needed 'cause official external deps was bumped.
	Make libepc depends on plain "avahi" module.
	* modulesets/gnome-suites-2.22.modules: Added libepc to totem module
	as suggests.



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-2.22.modules
   trunk/modulesets/gnome-suites-2.22.modules

Modified: trunk/modulesets/gnome-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-2.22.modules	(original)
+++ trunk/modulesets/gnome-2.22.modules	Thu Jan 17 09:57:37 2008
@@ -1178,8 +1178,6 @@
     </dependencies>
   </autotools>
 
-
-
   <autotools id="gio-standalone">
     <branch/>
     <dependencies>
@@ -1187,31 +1185,11 @@
     </dependencies>
   </autotools>
 
-
-  <!-- This can be removed (and uses of it can be replaced with libdaemon), 
-   when avahi-newer can be removed. See below. murrayc. -->
-  <tarball id="libdaemon-newer" version="0.12">
-    <source href="http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.12.tar.gz";
-            md5sum="76596823cc1a6d1cdf7779b782ff0ee6" size="355167"/>
-  </tarball>
-
-  <!-- This can be removed (and uses of it can be replaced with avahi), 
-       when the avahi in gnome-external-deps-2.22.modules is >= 0.6.18 (meaning it contains avahi-ui). murrayc. -->
-  <tarball id="avahi-newer" autogenargs="-disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-manpages --disable-python --enable-compat-howl --enable-compat-libdns_sd" version="0.6.20">
-    <source href="http://avahi.org/download/avahi-0.6.20.tar.gz";
-            md5sum="6acdff79afa2631f765f3bbbc3e25a74" size="974209"/>
-    <dependencies>
-      <dep package="libdaemon-newer"/>
-      <dep package="dbus-python"/>
-      <dep package="pygtk"/>
-    </dependencies>
-  </tarball>
-
   <autotools id="libepc">
     <branch/>
     <dependencies>
       <dep package="libsoup"/>
-      <dep package="avahi-newer"/>
+      <dep package="avahi"/>
       <dep package="gnutls"/>
     </dependencies>
   </autotools>

Modified: trunk/modulesets/gnome-suites-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.22.modules	(original)
+++ trunk/modulesets/gnome-suites-2.22.modules	Thu Jan 17 09:57:37 2008
@@ -1109,6 +1109,9 @@
       <dep package="iso-codes"/>
       <dep package="totem-pl-parser"/>
     </dependencies>
+    <suggests>
+      <dep package="libepc"/>
+    </suggests>
   </autotools>
 
   <autotools id="vino">