[Pkg-utopia-commits] r1130 - in packages/unstable/hal/debian: . patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-11-09 23:50:06 +0100 (Thu, 09 Nov 2006)
New Revision: 1130

Added:
   packages/unstable/hal/debian/patches/24_dbus_connection_close.patch
Modified:
   packages/unstable/hal/debian/changelog
Log:
* fix dbus_connection_close calls in hal tools


Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-11-06 22:23:34 UTC (rev 1129)
+++ packages/unstable/hal/debian/changelog	2006-11-09 22:50:06 UTC (rev 1130)
@@ -1,9 +1,15 @@
 hal (0.5.8.1-4) unstable; urgency=low
 
+  [ Michael Biebl ]
   * Improve short description of the hal-doc package. (Closes: #387374)
 
- -- Michael Biebl <biebl at debian.org>  Thu, 26 Oct 2006 16:16:45 +0200
+  [ Sebastian Dröge ]
+  * debian/patches/24_dbus_connection_close.patch:
+    + Don't call dbus_connection_close() in some hal tools as dbus 0.95 and
+      above abort if this is called when it shouldn't. Patch from upstream GIT
 
+ -- Sebastian Dröge <slomo at ubuntu.com>  Thu,  9 Nov 2006 23:48:31 +0100
+
 hal (0.5.8.1-3) unstable; urgency=low
 
   * debian/control

Added: packages/unstable/hal/debian/patches/24_dbus_connection_close.patch
===================================================================
--- packages/unstable/hal/debian/patches/24_dbus_connection_close.patch	2006-11-06 22:23:34 UTC (rev 1129)
+++ packages/unstable/hal/debian/patches/24_dbus_connection_close.patch	2006-11-09 22:50:06 UTC (rev 1130)
@@ -0,0 +1,36 @@
+From: Timo Hoenig <thoenig at suse.de>
+Date: Mon, 23 Oct 2006 15:35:17 +0000 (-0400)
+Subject: don't call dbus_connection_close() for some of our tools
+X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c85e02d58d6503b494bb4c8584a7c44ac6923208
+
+don't call dbus_connection_close() for some of our tools
+
+lshal and hal-device should not call dbus_connection_close() as they do
+not have a private connection to the bus.
+
+This is not critical. However, with D-Bus 0.94+ it will spawn ugly error
+messages.  Note: It is safe to apply this patch for HAL when using older
+versions of D-Bus, too.
+---
+
+--- a/tools/hal-device.c
++++ b/tools/hal-device.c
+@@ -161,7 +161,6 @@ int main(int argc, char **argv)
+ 
+ 	libhal_ctx_shutdown(hal_ctx, &error);
+ 	libhal_ctx_free(hal_ctx);
+-	dbus_connection_close(conn);
+ 	dbus_connection_unref(conn);
+ 	dbus_error_free(&error);
+ 
+--- a/tools/lshal.c
++++ b/tools/lshal.c
+@@ -723,7 +723,6 @@ main (int argc, char *argv[])
+ 		LIBHAL_FREE_DBUS_ERROR (&error);
+ 	libhal_ctx_free (hal_ctx);
+ 
+-	dbus_connection_close (conn);
+ 	dbus_connection_unref (conn);
+ 
+ 	if (show_device)
+