[jhbuild] 3.10: Move avahi to -sysdeps

[Javier Jardón <jjardon src gnome org>]

commit 9eedd8ebfcb11775bd828535bb9ab46a5420b32c
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jun 10 14:36:37 2013 +0200

    3.10: Move avahi to -sysdeps

 modulesets/gnome-suites-core-3.10.modules |   17 -----------------
 modulesets/gnome-sysdeps-3.10.modules     |   19 ++++++-------------
 2 files changed, 6 insertions(+), 30 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.10.modules b/modulesets/gnome-suites-core-3.10.modules
index 058c59b..06129ec 100644
--- a/modulesets/gnome-suites-core-3.10.modules
+++ b/modulesets/gnome-suites-core-3.10.modules
@@ -15,8 +15,6 @@
       href="git://gitorious.org/packagekit"/>
 
 <!-- tarball repos -->
-  <repository type="tarball" name="avahi.org"
-      href="http://www.avahi.org/download/"/>
   <repository type="tarball" name="freedesktop.org"
       href="http://freedesktop.org/"/>
   <repository type="tarball" name="gnome.org"
@@ -830,21 +828,6 @@
     </dependencies>
   </autotools>
 
-  <!-- explicit disabling of qt3 and qt4 can be removed once avahi
-       correctly detects what is available. -->
-  <autotools id="avahi" autogen-sh="configure"
-             autogenargs="--disable-gtk --disable-gtk3 --enable-introspection=no --disable-qt3 --disable-qt4 
--disable-mono --disable-monodoc --disable-manpages --disable-python --enable-compat-howl 
--enable-compat-libdns_sd --with-systemdsystemunitdir=no">
-    <pkg-config>avahi-ui-gtk3.pc</pkg-config>
-    <branch repo="avahi.org" module="avahi-0.6.31.tar.gz" version="0.6.31"
-            hash="sha256:8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
-            size="1268686"/>
-    <dependencies>
-      <dep package="gdbm"/>
-      <dep package="gtk+"/>
-      <dep package="libdaemon"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="ConsoleKit">
     <branch repo="git.freedesktop.org" module="ConsoleKit"/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.10.modules b/modulesets/gnome-sysdeps-3.10.modules
index 9fbec51..75dd2d1 100644
--- a/modulesets/gnome-sysdeps-3.10.modules
+++ b/modulesets/gnome-sysdeps-3.10.modules
@@ -15,6 +15,12 @@
             version="1.0.19"/>
   </systemmodule>
 
+  <systemmodule id="avahi">
+    <pkg-config>avahi-gobject.pc</pkg-config>
+    <branch repo="system"
+            version="0.6.31"/>
+  </systemmodule>
+
   <systemmodule id="bison">
     <branch repo="system" version="2.0"/>
     <systemdependencies>
@@ -170,13 +176,6 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <systemmodule id="gdbm">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="c_include" name="gdbm.h"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="gettext">
     <branch repo="system" version="0.16"/>
     <systemdependencies>
@@ -366,12 +365,6 @@
     <branch repo="system" version="2.8.0"/>
   </systemmodule>
 
-  <systemmodule id="libdaemon">
-    <pkg-config>libdaemon.pc</pkg-config>
-    <branch repo="system"
-            version="0.14"/>
-  </systemmodule>
-
   <systemmodule id="libdb">
     <branch repo="system"/>
     <systemdependencies>