[Pkg-utopia-commits] r3761 - in /packages/experimental/hal/debian: changelog patches/02_libhal_dont_check_running.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Nov 17 20:11:10 2010
New Revision: 3761

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3761
Log:
debian/patches/02_libhal_dont_check_running.patch: In libhal_ctx_init(),
do not check if hal is already running, since it will get D-Bus
activated. Thanks to Lionel Le Folgoc for the patch!

Added:
    packages/experimental/hal/debian/patches/02_libhal_dont_check_running.patch
Modified:
    packages/experimental/hal/debian/changelog
    packages/experimental/hal/debian/patches/series

Modified: packages/experimental/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/changelog?rev=3761&op=diff
==============================================================================
--- packages/experimental/hal/debian/changelog (original)
+++ packages/experimental/hal/debian/changelog Wed Nov 17 20:11:10 2010
@@ -13,6 +13,9 @@
       restart it via D-Bus activation.
     - debian/hal.postinst: Restart hal on upgrades.
     - debian/hal.prerm: Stop hal on remove.
+    - debian/patches/02_libhal_dont_check_running.patch: In libhal_ctx_init(),
+      do not check if hal is already running, since it will get D-Bus
+      activated. Thanks to Lionel Le Folgoc for the patch!
 
  -- Michael Biebl <biebl at debian.org>  Wed, 17 Nov 2010 10:23:43 +0100
 

Added: packages/experimental/hal/debian/patches/02_libhal_dont_check_running.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/patches/02_libhal_dont_check_running.patch?rev=3761&op=file
==============================================================================
--- packages/experimental/hal/debian/patches/02_libhal_dont_check_running.patch (added)
+++ packages/experimental/hal/debian/patches/02_libhal_dont_check_running.patch Wed Nov 17 20:11:10 2010
@@ -1,0 +1,31 @@
+Description: In libhal_ctx_init(), do not check if hal is already running, since it will get D-Bus activated.
+Author: Lionel Le Folgoc <lionel at lefolgoc.net>
+Bug-Ubuntu: https://launchpad.net/bugs/546992
+
+--- hal-0.5.14.orig/libhal/libhal.c
++++ hal-0.5.14/libhal/libhal.c
+@@ -3376,7 +3376,6 @@
+ libhal_ctx_init (LibHalContext *ctx, DBusError *error)
+ {
+ 	DBusError _error;
+-	dbus_bool_t hald_exists;
+ 
+ 	LIBHAL_CHECK_LIBHALCONTEXT(ctx, FALSE);
+ 
+@@ -3384,16 +3383,6 @@
+ 		return FALSE;
+ 
+ 	dbus_error_init (&_error);
+-	hald_exists = dbus_bus_name_has_owner (ctx->connection, "org.freedesktop.Hal", &_error);
+-	dbus_move_error (&_error, error);
+-	if (error != NULL && dbus_error_is_set (error)) {
+-		return FALSE;
+-	}
+-
+-	if (!hald_exists) {
+-		return FALSE;
+-	}
+-
+ 	
+ 	if (!dbus_connection_add_filter (ctx->connection, filter_func, ctx, NULL)) {
+ 		return FALSE;

Modified: packages/experimental/hal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/patches/series?rev=3761&op=diff
==============================================================================
--- packages/experimental/hal/debian/patches/series (original)
+++ packages/experimental/hal/debian/patches/series Wed Nov 17 20:11:10 2010
@@ -1,5 +1,6 @@
 # Debian patches for hal
 01_at_console.patch
+02_libhal_dont_check_running.patch
 10_nonpolkit-mount-policy.patch
 15-probe-input-segfault-fix.patch
 20-ignore-temporary-cryptsetup-devices.patch