r23201 - in /desktop/unstable/gnome-power-manager/debian: changelog patches/12-DeviceKit-disks-is-now-called-UDisks.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Mar  5 21:18:35 2010
New Revision: 23201

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23201
Log:
* debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch
  - The org.freedesktop.DeviceKit.Disks D-Bus interface name was changed to
    org.freedesktop.UDisks. Update gnome-power-manager's disk spindown code
    accordingly.

Added:
    desktop/unstable/gnome-power-manager/debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch
Modified:
    desktop/unstable/gnome-power-manager/debian/changelog
    desktop/unstable/gnome-power-manager/debian/patches/series

Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=23201&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog [utf-8] Fri Mar  5 21:18:35 2010
@@ -2,6 +2,10 @@
 
   * debian/control
     - Recommend udisks instead of devicekit-disks.
+  * debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch
+    - The org.freedesktop.DeviceKit.Disks D-Bus interface name was changed to
+      org.freedesktop.UDisks. Update gnome-power-manager's disk spindown code
+      accordingly.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 05 Mar 2010 18:36:38 +0100
 

Added: desktop/unstable/gnome-power-manager/debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch?rev=23201&op=file
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch (added)
+++ desktop/unstable/gnome-power-manager/debian/patches/12-DeviceKit-disks-is-now-called-UDisks.patch [utf-8] Fri Mar  5 21:18:35 2010
@@ -1,0 +1,53 @@
+From ee7ab4e9b02c426a4e42e448e4153629631a4d69 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Fri, 5 Feb 2010 10:16:10 +0000
+Subject: [PATCH] DeviceKit-disks is now called UDisks
+
+---
+ src/gpm-disks.c |   14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/gpm-disks.c b/src/gpm-disks.c
+index 3e37011..eec3358 100644
+--- a/src/gpm-disks.c
++++ b/src/gpm-disks.c
+@@ -50,9 +50,9 @@ gpm_disks_unregister (GpmDisks *disks)
+ 	gboolean ret = FALSE;
+ 	GError *error = NULL;
+ 
+-	/* no DeviceKit-disks */
++	/* no UDisks */
+ 	if (disks->priv->proxy == NULL) {
+-		egg_warning ("no DeviceKit-disks");
++		egg_warning ("no UDisks");
+ 		goto out;
+ 	}
+ 
+@@ -84,9 +84,9 @@ gpm_disks_register (GpmDisks *disks, gint timeout)
+ 	GError *error = NULL;
+ 	const gchar **options = {NULL};
+ 
+-	/* no DeviceKit-disks */
++	/* no UDisks */
+ 	if (disks->priv->proxy == NULL) {
+-		egg_warning ("no DeviceKit-disks");
++		egg_warning ("no UDisks");
+ 		goto out;
+ 	}
+ 
+@@ -150,9 +150,9 @@ gpm_disks_init (GpmDisks *disks)
+ 	/* get proxy to interface */
+ 	connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
+ 	disks->priv->proxy = dbus_g_proxy_new_for_name_owner (connection,
+-							      "org.freedesktop.DeviceKit.Disks",
+-							      "/org/freedesktop/DeviceKit/Disks",
+-							      "org.freedesktop.DeviceKit.Disks", &error);
++							      "org.freedesktop.UDisks",
++							      "/org/freedesktop/UDisks",
++							      "org.freedesktop.UDisks", &error);
+ 	if (disks->priv->proxy == NULL) {
+ 		egg_warning ("DBUS error: %s", error->message);
+ 		g_error_free (error);
+-- 
+1.7.0
+

Modified: desktop/unstable/gnome-power-manager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/series?rev=23201&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/patches/series [utf-8] Fri Mar  5 21:18:35 2010
@@ -5,4 +5,5 @@
 09-inhibit-consolekit-events-after-resume.patch
 10-do-not-exit-if-hal-is-not-available.patch
 11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch
+12-DeviceKit-disks-is-now-called-UDisks.patch
 90_autoconf.patch