r22931 - in /desktop/unstable/gnome-power-manager/debian: changelog patches/10-do-not-exit-if-hal-is-not-available.patch patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch patches/series

Sun Jan 31 23:01:35 UTC 2010

Author: biebl
Date: Sun Jan 31 23:01:32 2010
New Revision: 22931

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22931
Log:
* debian/patches/10-do-not-exit-if-hal-is-not-available.patch
  - Don't exit if hal is not available as we only need it as fallback for
    systems not supporting XBACKLIGHT.
* debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch
  - If we find hardware with XRandR backlight support don't try to connect
    to the hal D-Bus service.

Added:
    desktop/unstable/gnome-power-manager/debian/patches/10-do-not-exit-if-hal-is-not-available.patch
    desktop/unstable/gnome-power-manager/debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.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=22931&op=diff
==============================================================================

--- desktop/unstable/gnome-power-manager/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog [utf-8] Sun Jan 31 23:01:32 2010
@@ -1,3 +1,14 @@
+gnome-power-manager (2.28.3-2) UNRELEASED; urgency=low
+
+  * debian/patches/10-do-not-exit-if-hal-is-not-available.patch
+    - Don't exit if hal is not available as we only need it as fallback for
+      systems not supporting XBACKLIGHT.
+  * debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch
+    - If we find hardware with XRandR backlight support don't try to connect
+      to the hal D-Bus service.
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 31 Jan 2010 22:58:13 +0100
+
 gnome-power-manager (2.28.3-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gnome-power-manager/debian/patches/10-do-not-exit-if-hal-is-not-available.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/10-do-not-exit-if-hal-is-not-available.patch?rev=22931&op=file
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/10-do-not-exit-if-hal-is-not-available.patch (added)
+++ desktop/unstable/gnome-power-manager/debian/patches/10-do-not-exit-if-hal-is-not-available.patch [utf-8] Sun Jan 31 23:01:32 2010
@@ -1,0 +1,27 @@
+From 3014b64fc4e54c5815923711b584164a19124e51 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Tue, 1 Dec 2009 12:27:11 +0100
+Subject: [PATCH 1/2] do not exit if hal is not available
+
+g-p-m now runs sufficiently well without hal, so people who have working
+XBACKLIGHT (or don't care about missing notifications) should be able to
+uninstall hal.
+---
+ libhal-glib/hal-manager.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/libhal-glib/hal-manager.c b/libhal-glib/hal-manager.c
+index 714509c..87da207 100644
+--- a/libhal-glib/hal-manager.c
++++ b/libhal-glib/hal-manager.c
+@@ -303,7 +303,6 @@ hal_manager_init (HalManager *manager)
+ 				       HAL_DBUS_INTERFACE_MANAGER);
+ 	if (DBUS_IS_G_PROXY (proxy) == FALSE) {
+ 		g_warning ("Either HAL or DBUS are not working!");
+-		exit (0);
+ 	}
+ 
+ 	g_signal_connect (manager->priv->gproxy, "proxy-status",
+-- 
+1.6.6.1
+

Added: desktop/unstable/gnome-power-manager/debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch?rev=22931&op=file
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch (added)
+++ desktop/unstable/gnome-power-manager/debian/patches/11-only-connect-to-hal-if-there-is-no-xrandr-hardware.patch [utf-8] Sun Jan 31 23:01:32 2010
@@ -1,0 +1,43 @@
+From ea72031d9fe0ee3acabe8cc98871f86ae07bb2cb Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Thu, 14 Jan 2010 18:12:22 +0100
+Subject: [PATCH 2/2] only connect to HAL if there is no xrandr hardware
+
+Nowadays it is a valid setup to have hal installed, but only start on demand
+via D-Bus activation (instead of during boot). If we detect xrandr-capable
+hardware, do not try to connect to hal.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=603470
+---
+ src/gpm-brightness.c |   14 ++++++++------
+ 1 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/gpm-brightness.c b/src/gpm-brightness.c
+index eb0ec9d..8e18250 100644
+--- a/src/gpm-brightness.c
++++ b/src/gpm-brightness.c
+@@ -439,13 +439,15 @@ gpm_brightness_init (GpmBrightness *brightness)
+ 	g_signal_connect (brightness->priv->xrandr, "brightness-changed",
+ 			  G_CALLBACK (gpm_brightness_xrandr_changed_cb), brightness);
+ #ifdef HAVE_HAL
+-	brightness->priv->hal = gpm_brightness_hal_new ();
+-	if (gpm_brightness_hal_has_hw (brightness->priv->hal)) {
+-		egg_debug ("detected HAL hardware");
+-		brightness->priv->use_hal = TRUE;
++	if (!brightness->priv->use_xrandr) {
++		brightness->priv->hal = gpm_brightness_hal_new ();
++		if (gpm_brightness_hal_has_hw (brightness->priv->hal)) {
++			egg_debug ("detected HAL hardware");
++			brightness->priv->use_hal = TRUE;
++		}
++		g_signal_connect (brightness->priv->hal, "brightness-changed",
++				  G_CALLBACK (gpm_brightness_hal_changed_cb), brightness);
+ 	}
+-	g_signal_connect (brightness->priv->hal, "brightness-changed",
+-			  G_CALLBACK (gpm_brightness_hal_changed_cb), brightness);
+ #endif
+ }
+ 
+-- 
+1.6.6.1
+

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=22931&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/patches/series [utf-8] Sun Jan 31 23:01:32 2010
@@ -3,4 +3,6 @@
 06-bugreport-debian.patch
 08-desktop-bugreport-path.patch
 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
 90_autoconf.patch


