Index: modulesets/freedesktop-2.26.modules
===================================================================
--- modulesets/freedesktop-2.26.modules	(revisione 2545)
+++ modulesets/freedesktop-2.26.modules	(copia locale)
@@ -40,10 +40,6 @@
   <repository type="bzr" name="telepathy-msn.freedesktop.org"
       href="http://bzr.collabora.co.uk/bzr/telepathy/"/>
 
-  <repository type="svn" name="gypsy.o-hand.com"
-      href="http://svn.o-hand.com/repos/gypsy/"
-      trunk-template="trunk/%(module)s" />
-
   <repository type="cvs" name="lirc.sf.net"
       cvsroot=":pserver:anonymous@lirc.cvs.sourceforge.net:/cvsroot/lirc"
       password=""/>
@@ -188,23 +184,62 @@
     </suggests>
   </autotools>
 
-  <autotools id="geoclue">
-    <branch repo="git.freedesktop.org"/>
+  <!-- ################################################ -->
+  <!-- ################ DeviceKit Stuff ############### -->
+  <autotools id="DeviceKit">
+    <branch repo="git.freedesktop.org"
+	    module="DeviceKit/DeviceKit" checkoutdir="DeviceKit"/>
     <dependencies>
       <dep package="dbus-glib"/>
-      <dep package="gconf"/>
-      <dep package="NetworkManager"/>
-      <dep package="gypsy"/>
+      <dep package="libxslt"/>
+      <dep package="udev"/>
     </dependencies>
   </autotools>
 
+  <autotools id="DeviceKit-power">
+    <branch repo="git.freedesktop.org"
+	    module="DeviceKit/DeviceKit-power" checkoutdir="DeviceKit-power"/>
+    <dependencies>
+      <dep package="DeviceKit"/>
+      <dep package="PolicyKit"/>
+    </dependencies>
+  </autotools>
+  
+  <!-- deps non managed by jhbuild -->
+  <!--     * libparted             -->
+  <!--     * devmapper             -->
+  <autotools id="DeviceKit-disks">
+    <branch repo="git.freedesktop.org"
+	    module="DeviceKit/DeviceKit-power" checkoutdir="DeviceKit-power"/>
+    <dependencies>
+      <dep package="DeviceKit"/>
+      <dep package="PolicyKit"/>
+      <dep package="sqlite2"/>
+    </dependencies>
+  </autotools>
+  <!-- ############## End DeviceKit Stuff ############# -->
+  <!-- ################################################ -->
+
   <autotools id="gypsy">
-    <branch repo="gypsy.o-hand.com" module="gypsy"/>
+    <branch repo="git.freedesktop.org"
+	    module="gypsy" checkoutdir="gypsy"/>
     <dependencies>
       <dep package="dbus-glib"/>
+      <dep package="libxslt"/>
+      <dep package="bluez"/>
     </dependencies>
   </autotools>
 
+  <autotools id="geoclue">
+    <branch repo="git.freedesktop.org"/>
+    <dependencies>
+      <dep package="dbus-glib"/>
+      <dep package="gconf"/>
+      <dep package="NetworkManager"/>
+      <dep package="gypsy"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="swfdec-mozilla" autogen-sh="autoreconf">
     <branch repo="git.freedesktop.org" module="swfdec/swfdec-mozilla"
 	    checkoutdir="swfdec-mozilla"/>
