[Pkg-xfce-commits] r4980 - in goodies/trunk/xfce4-power-manager/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-02-16 08:01:17 +0000 (Wed, 16 Feb 2011)
New Revision: 4980

Added:
   goodies/trunk/xfce4-power-manager/debian/patches/
   goodies/trunk/xfce4-power-manager/debian/patches/01_assume-hal-is-available.patch
   goodies/trunk/xfce4-power-manager/debian/patches/series
Modified:
   goodies/trunk/xfce4-power-manager/debian/changelog
   goodies/trunk/xfce4-power-manager/debian/control
Log:
* debian/patches:
  - 01_assume-hal-is-available.patch: do not check for hal presence on
    the bus, it'll be spawned automatically on demand.        Closes: #612611
  - series: added.
* debian/control:
  - bump hal dep to (>= 0.5.14-4~) for the dbus activation.
  - add myself to Uploaders.

Modified: goodies/trunk/xfce4-power-manager/debian/changelog
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/changelog	2011-02-16 07:39:48 UTC (rev 4979)
+++ goodies/trunk/xfce4-power-manager/debian/changelog	2011-02-16 08:01:17 UTC (rev 4980)
@@ -1,3 +1,15 @@
+xfce4-power-manager (0.8.5-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_assume-hal-is-available.patch: do not check for hal presence on
+      the bus, it'll be spawned automatically on demand.        Closes: #612611
+    - series: added.
+  * debian/control:
+    - bump hal dep to (>= 0.5.14-4~) for the dbus activation.
+    - add myself to Uploaders.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 16 Feb 2011 08:38:53 +0100
+
 xfce4-power-manager (0.8.5-2) unstable; urgency=low
 
   * debian/control:

Modified: goodies/trunk/xfce4-power-manager/debian/control
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/control	2011-02-16 07:39:48 UTC (rev 4979)
+++ goodies/trunk/xfce4-power-manager/debian/control	2011-02-16 08:01:17 UTC (rev 4980)
@@ -2,7 +2,8 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
+ Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50), intltool, pkg-config, libgtk2.0-dev,
  libdbus-1-dev, libdbus-glib-1-dev, libxfconf-0-dev (>= 4.6.0),
  libxfcegui4-dev (>= 4.6.0), libnotify-dev, xfce4-panel-dev (>= 4.6.0)
@@ -14,7 +15,7 @@
 Package: xfce4-power-manager
 Section: xfce
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, hal, 
+Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.14-4~), 
  xfce4-power-manager-data (=${source:Version})
 Recommends: consolekit
 Suggests: xfce4-power-manager-plugins

Added: goodies/trunk/xfce4-power-manager/debian/patches/01_assume-hal-is-available.patch
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/01_assume-hal-is-available.patch	                        (rev 0)
+++ goodies/trunk/xfce4-power-manager/debian/patches/01_assume-hal-is-available.patch	2011-02-16 08:01:17 UTC (rev 4980)
@@ -0,0 +1,26 @@
+From 71207ec4de6ee7fabe06c21f02bbf0785bc308a9 Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc <mrpouit at ubuntu.com>
+Date: Wed, 20 Jan 2010 20:10:29 +0100
+Subject: [PATCH] Assume Hal is always available (it'll be spawned by dbus on demand anyway).
+
+---
+ src/xfpm-dbus-monitor.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/xfpm-dbus-monitor.c b/src/xfpm-dbus-monitor.c
+index b77b21d..95b66f7 100644
+--- a/src/xfpm-dbus-monitor.c
++++ b/src/xfpm-dbus-monitor.c
+@@ -349,8 +349,7 @@ xfpm_dbus_monitor_init (XfpmDBusMonitor *monitor)
+ 				monitor, 
+ 				NULL);
+ 				
+-    monitor->priv->hal_connected  = xfpm_dbus_name_has_owner (dbus_g_connection_get_connection (monitor->priv->system_bus), 
+-							      "org.freedesktop.Hal");
++    monitor->priv->hal_connected  = TRUE;
+ 							      
+     xfpm_dbus_monitor_add_service (monitor, DBUS_BUS_SESSION, "org.freedesktop.Hal");
+ }
+-- 
+1.6.3.3
+

Added: goodies/trunk/xfce4-power-manager/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-power-manager/debian/patches/series	2011-02-16 08:01:17 UTC (rev 4980)
@@ -0,0 +1 @@
+01_assume-hal-is-available.patch