- detect D-Bus 1.x correctly

- fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=397272

Changed files:
    avahi-dbus.patch -> 1.1

diff --git a/avahi-dbus.patch b/avahi-dbus.patch
new file mode 100644 (file)
index 0000000..45ac910
--- /dev/null
+++ b/avahi-dbus.patch
@@ -0,0 +1,53 @@
+diff -ur avahi-0.6.15/avahi-daemon/dbus-protocol.c avahi-0.6.15-dbus/avahi-daemon/dbus-protocol.c
+--- avahi-0.6.15/avahi-daemon/dbus-protocol.c  2006-11-06 02:03:21.000000000 +0100
++++ avahi-0.6.15-dbus/avahi-daemon/dbus-protocol.c     2006-11-16 17:25:41.000000000 +0100
+@@ -1067,10 +1067,10 @@
+     if (dbus_bus_request_name(
+             server->bus,
+             AVAHI_DBUS_NAME,
+-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
+-            DBUS_NAME_FLAG_DO_NOT_QUEUE,
+-#else
++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
+             DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
++#else
++            DBUS_NAME_FLAG_DO_NOT_QUEUE,
+ #endif
+             &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+         if (dbus_error_is_set(&error)) {
+@@ -1106,11 +1106,6 @@
+         dbus_error_free(&error);
+ 
+     if (server->bus) {
+-#ifdef HAVE_DBUS_CONNECTION_CLOSE
+-        dbus_connection_close(server->bus);
+-#else
+-        dbus_connection_disconnect(server->bus);
+-#endif
+         dbus_connection_unref(server->bus);
+         server->bus = NULL;
+     }
+@@ -1127,11 +1122,6 @@
+     assert(server->n_clients == 0);
+ 
+     if (server->bus) {
+-#ifdef HAVE_DBUS_CONNECTION_CLOSE
+-        dbus_connection_close(server->bus);
+-#else
+-        dbus_connection_disconnect(server->bus);
+-#endif
+         dbus_connection_unref(server->bus);
+         server->bus = NULL;
+     }
+@@ -1166,11 +1156,6 @@
+ 
+ fail:
+     if (server->bus) {
+-#ifdef HAVE_DBUS_CONNECTION_CLOSE
+-        dbus_connection_close(server->bus);
+-#else
+-        dbus_connection_disconnect(server->bus);
+-#endif
+         dbus_connection_unref(server->bus);
+     }
+