[jhbuild] [devel] nuke eggdbus, PolicyKit etc..

[Marc-Andre Lureau <malureau src gnome org>]

commit b168d3fea8c0b4612275133fd04dc56845c49232
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Sat Aug 7 11:43:09 2010 +0200

    [devel] nuke eggdbus, PolicyKit etc..

 modulesets/freedesktop-devel.modules         |   19 -------------------
 modulesets/gnome-external-deps-devel.modules |   24 ++++++------------------
 2 files changed, 6 insertions(+), 37 deletions(-)
---
diff --git a/modulesets/freedesktop-devel.modules b/modulesets/freedesktop-devel.modules
index 6c437d0..bb4ac16 100644
--- a/modulesets/freedesktop-devel.modules
+++ b/modulesets/freedesktop-devel.modules
@@ -21,23 +21,4 @@
     <branch repo="user-dirs.freedesktop.org" />
   </autotools>
 
-  <autotools id="DeviceKit">
-    <branch repo="git.freedesktop.org" module="DeviceKit/DeviceKit"/>
-    <dependencies>
-      <dep package="dbus-glib"/>
-      <dep package="libxslt"/>
-    </dependencies>
-    <suggests>
-      <dep package="gtk-doc"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="DeviceKit-power">
-    <branch repo="git.freedesktop.org" module="DeviceKit/DeviceKit-power"/>
-    <dependencies>
-      <dep package="DeviceKit"/>
-      <dep package="PolicyKit"/>
-    </dependencies>
-  </autotools>
-
 </moduleset>
diff --git a/modulesets/gnome-external-deps-devel.modules b/modulesets/gnome-external-deps-devel.modules
index 7b6218d..aa50a00 100644
--- a/modulesets/gnome-external-deps-devel.modules
+++ b/modulesets/gnome-external-deps-devel.modules
@@ -103,28 +103,20 @@
     </dependencies>
   </autotools>
 
-  <autotools id="eggdbus">
-    <branch repo="git.freedesktop.org" module="~david/eggdbus"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="PolicyKit" autogenargs="--disable-tests">
+  <autotools id="polkit" autogenargs="--disable-tests">
     <branch repo="git.freedesktop.org" module="PolicyKit"/>
     <dependencies>
-      <dep package="eggdbus"/>
     </dependencies>
   </autotools>
 
-  <autotools id="PolicyKit-gnome">
+  <autotools id="polkit-gnome">
     <branch/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
       <dep package="gtk+"/>
       <dep package="gconf"/>
-      <dep package="PolicyKit"/>
+      <dep package="polkit"/>
       <dep package="gnome-doc-utils"/>
       <dep package="intltool"/>
     </dependencies>
@@ -155,12 +147,12 @@
     <branch repo="git.freedesktop.org" module="hal-info"/>
   </autotools>
 
-  <autotools id="hal" autogenargs="--disable-policy-kit">
+  <autotools id="hal">
     <branch repo="git.freedesktop.org"/>
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="hal-info"/>
-      <dep package="PolicyKit"/>
+      <dep package="polkit"/>
       <dep package="ConsoleKit"/>
       <dep package="util-linux-ng"/>
     </dependencies>
@@ -381,18 +373,15 @@
     <branch repo="git.0pointer.de" module="pulseaudio"/>
     <dependencies>
       <dep package="libsndfile"/>
-      <dep package="liboil"/>
-      <dep package="glib"/>
       <dep package="speex"/>
     </dependencies>
     <after>
+      <dep package="glib"/>
       <dep package="libsamplerate"/>
       <dep package="gconf"/>
       <dep package="avahi"/>
-      <dep package="hal"/>
       <dep package="bluez"/>
       <dep package="dbus"/>
-      <dep package="PolicyKit"/>
     </after>
   </autotools>
 
@@ -706,7 +695,6 @@
       <dep package="dbus-glib"/>
       <dep package="gnome-desktop"/>
       <dep package="gstreamer"/>
-      <dep package="hal"/>
       <dep package="intltool"/>
       <dep package="poppler"/>
       <dep package="sqlite3"/>