Merge from unstable, up to r3584

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/dbus@3585 ceb527fc-18e6-0310-9fe2-813c157c29e7

11 files changed, 75 insertions, 219 deletions

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 00000000..96fb271a
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,3 @@
+This package uses the quilt patch management system.
+
+Please refer to /usr/share/doc/quilt/README.source for further information.
diff --git a/debian/changelog b/debian/changelog
index 4967184d..e5ee9322 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,58 @@
-dbus (1.2.16-3~exp1) experimental; urgency=low
+dbus (1.2.24-1+exp1) UNRELEASED; urgency=low
 
-  [ Michael Biebl ]
+   * Add separate debugging symbols (Closes: 550517)
+   * Install libdbus shared library to a multiarch directory
+     (/lib/i486-linux-gnu or whatever) as now allowed by Policy, and set
+     Multi-Arch: same as befits a shared library
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 25 Jun 2010 13:51:07 +0100
+
+dbus (1.2.24-1) unstable; urgency=low
+
+  * New upstream release.
+    - Correctly get pointer data from DBusString when creating a syslog
+      message. (Closes: #574697)
+  * debian/dbus-Xsession
+    - Use new "has_option" function from x11-common instead of grepping the
+      option file, to avoid calling an external program. (Closes: #570480)
+      Thanks to Martin Pitt for the patch.
+  * debian/control
+    - Add Breaks: x11-common (<< 1:7.5+4) to dbus-x11 to ensure we have a
+      recent enough version with "has_option" support.
+  * debian/dbus.init
+    - Update LSB header: Remove runlevel 1 from Default-Stop and let killprocs
+      do the job for us.
+  * debian/rules
+    - Update DEB_DH_INSTALLINIT_ARGS accordingly.
+  * debian/dbus.postinst
+    - Remove old stop symlinks from runlevel 1 on upgrades.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 24 Mar 2010 02:04:20 +0100
+
+dbus (1.2.22-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/11_kfreebsd_kqueue_build_fix.patch
+    - Removed, merged upstream.
+  * debian/control
+    - Drop Provides: dbus-1-utils, there is no more package depending on it.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 18 Mar 2010 01:06:13 +0100
+
+dbus (1.2.20-2) unstable; urgency=low
+
+  * debian/patches/11_kfreebsd_kqueue_build_fix.patch
+    - Fix kqueue implementation on GNU/kFreeBSD. (Closes: #568338)
+      Thanks to Cyril Brulebois for the patch.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 03 Feb 2010 23:08:12 +0100
+
+dbus (1.2.20-1) unstable; urgency=low
+
+  * New upstream release.
   * debian/control
     - Drop Build-Depends on docbook-utils, apparently no longer necessary.
+    - Bump Standards-Version to 3.8.4.
   * debian/rules
     - Explicitly disable audit support so we don't accidentally pick up a
       libaudit shlib dependency.
@@ -10,15 +60,14 @@ dbus (1.2.16-3~exp1) experimental; urgency=low
       (Closes: #533460)
     - Improve the way we create the symlink from /usr/lib/ → /lib by using
       readlink.
-
-  [ Simon McVittie ]
-  * Add separate debugging symbols (Closes: 550517)
-  * Install libdbus shared library to a multiarch directory
-    (/lib/i486-linux-gnu or whatever) as now allowed by Policy, and set
-    Multi-Arch: same as befits a shared library
-  * Standards-Version: 3.8.4 (no changes needed)
-
- -- Simon McVittie <smcv@debian.org>  Thu, 28 Jan 2010 23:48:25 +0000
+  * Remove patches:
+    - debian/patches/02_dbus_monitor_no_sigint_handler.patch (fixed upstream)
+    - debian/patches/20_kbsd_cmsgcred.patch (merged upstream)
+    - debian/patches/30_rt-as-needed.patch (merged upstream)
+  * debian/README.source
+    - Add reference to the quilt patch management system documentation.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 03 Feb 2010 22:49:42 +0100
 
 dbus (1.2.16-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6d9b6499..5449590e 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends: cdbs (>= 0.4.43),
                libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
                quilt
 Standards-Version: 3.8.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus
+Vcs-Svn: svn://svn.debian.org/pkg-utopia/packages/unstable/dbus/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/
 Homepage: http://dbus.freedesktop.org/
 
 Package: dbus
@@ -30,7 +30,6 @@ Depends: ${shlibs:Depends},
          lsb-base (>= 3.2-14)
 Conflicts: dbus-1-utils (<< 1.0.2-5)
 Replaces: dbus-1-utils (<< 1.0.2-5)
-Provides: dbus-1-utils
 Suggests: dbus-x11
 Description: simple interprocess messaging system
  D-Bus is a message bus, used for sending messages between applications.
@@ -58,6 +57,7 @@ Depends: ${shlibs:Depends},
          dbus
 Conflicts: dbus (<< 1.1.2)
 Replaces: dbus (<< 1.1.2)
+Breaks: x11-common (<< 1:7.5+4)
 Description: simple interprocess messaging system (X11 deps)
  D-Bus is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in
diff --git a/debian/dbus-Xsession b/debian/dbus-Xsession
index 95117656..af7ba492 100644
--- a/debian/dbus-Xsession
+++ b/debian/dbus-Xsession
@@ -6,7 +6,7 @@
 STARTDBUS=
 DBUSLAUNCH=/usr/bin/dbus-launch
 
-if grep -qs ^use-session-dbus "$OPTIONFILE"; then
+if has_option use-session-dbus; then
   if [ -x "$DBUSLAUNCH" ]; then
     STARTDBUS=yes
   fi
diff --git a/debian/dbus.init b/debian/dbus.init
index 86be98de..6564c103 100644
--- a/debian/dbus.init
+++ b/debian/dbus.init
@@ -4,7 +4,7 @@
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
-# Default-Stop:      1
+# Default-Stop:
 # Short-Description: D-Bus systemwide message bus
 # Description:       D-Bus is a simple interprocess messaging system, used
 #                    for sending messages between applications.
diff --git a/debian/dbus.postinst b/debian/dbus.postinst
index 1031ed63..bdac3426 100644
--- a/debian/dbus.postinst
+++ b/debian/dbus.postinst
@@ -31,6 +31,11 @@ if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.1.20-1; then
     update-rc.d -f dbus remove >/dev/null
 fi
 
+# Remove stop symlinks for runlevel 1 as killprocs already does the job for us.
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.2.24-1; then
+    rm -f /etc/rc1.d/K??dbus
+fi
+
 if [ "$1" = configure ] && [ -n "$2" ] && [ -x "/etc/init.d/dbus" ]; then
     # Restart dbus on upgrades.
     # dh_installinit -r creates the necessary start action.
diff --git a/debian/patches/02_dbus_monitor_no_sigint_handler.patch b/debian/patches/02_dbus_monitor_no_sigint_handler.patch
deleted file mode 100644
index 4675a4b1..00000000
--- a/debian/patches/02_dbus_monitor_no_sigint_handler.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: dbus-1.2.16/tools/dbus-monitor.c
-===================================================================
---- dbus-1.2.16.orig/tools/dbus-monitor.c	2009-07-14 21:42:25.000000000 +0200
-+++ dbus-1.2.16/tools/dbus-monitor.c	2009-07-16 02:08:59.000000000 +0200
-@@ -33,8 +33,6 @@
- 
- #include <time.h>
- 
--#include <signal.h>
--
- #include "dbus-print-message.h"
- 
- #ifdef DBUS_WIN
-@@ -195,14 +193,6 @@
-   exit (ecode);
- }
- 
--static dbus_bool_t sigint_received = FALSE;
--
--static void
--sigint_handler (int signum)
--{
--  sigint_received = TRUE;
--}
--
- int
- main (int argc, char *argv[])
- {
-@@ -338,11 +328,7 @@
-     fprintf (stderr, "Couldn't add filter!\n");
-     exit (1);
-   }
--
--  /* we handle SIGINT so exit() is reached and flushes stdout */
--  signal (SIGINT, sigint_handler);
--  while (dbus_connection_read_write_dispatch(connection, -1)
--          && !sigint_received)
-+  while (dbus_connection_read_write_dispatch(connection, -1))
-     ;
-   exit (0);
-  lose:
diff --git a/debian/patches/20_kbsd_cmsgcred.patch b/debian/patches/20_kbsd_cmsgcred.patch
deleted file mode 100644
index dfae9dc1..00000000
--- a/debian/patches/20_kbsd_cmsgcred.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dbus-1.2.16/dbus/dbus-sysdeps-unix.c
-===================================================================
---- dbus-1.2.16.orig/dbus/dbus-sysdeps-unix.c	2009-07-14 21:42:38.000000000 +0200
-+++ dbus-1.2.16/dbus/dbus-sysdeps-unix.c	2009-07-16 02:09:20.000000000 +0200
-@@ -1241,7 +1241,7 @@
- #elif defined(HAVE_CMSGCRED)
-     struct cmsgcred *cred;
- 
--    cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
-+    cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
-     pid_read = cred->cmcred_pid;
-     uid_read = cred->cmcred_euid;
- #elif defined(LOCAL_CREDS)
diff --git a/debian/patches/30_rt-as-needed.patch b/debian/patches/30_rt-as-needed.patch
deleted file mode 100644
index 8dbe6ac8..00000000
--- a/debian/patches/30_rt-as-needed.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/bus/Makefile.am b/bus/Makefile.am
-index 3b4f69d..ad49e6d 100644
---- a/bus/Makefile.am
-+++ b/bus/Makefile.am
-@@ -78,8 +78,8 @@ dbus_daemon_SOURCES=				\
- 
- dbus_daemon_LDADD=					\
- 	$(EFENCE)					\
--	$(DBUS_BUS_LIBS)				\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la	\
-+	$(DBUS_BUS_LIBS)
- 
- dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
- 
-@@ -103,8 +103,8 @@ dbus_daemon_launch_helper_SOURCES=		\
- 	$(LAUNCH_HELPER_SOURCES)
- 
- dbus_daemon_launch_helper_LDADD=		\
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- 
-@@ -115,8 +115,8 @@ dbus_daemon_launch_helper_test_SOURCES=		\
- 	$(LAUNCH_HELPER_SOURCES)
- 
- dbus_daemon_launch_helper_test_LDADD=		\
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- dbus_daemon_launch_helper_test_CPPFLAGS=	\
-@@ -129,8 +129,8 @@ bus_test_launch_helper_SOURCES=		\
- 	$(LAUNCH_HELPER_SOURCES)
- 
- bus_test_launch_helper_LDADD=		\
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- bus_test_launch_helper_CPPFLAGS=	\
-diff --git a/bus/Makefile.in b/bus/Makefile.in
-index fde3829..02520b6 100644
---- a/bus/Makefile.in
-+++ b/bus/Makefile.in
-@@ -111,8 +111,9 @@ am_bus_test_launch_helper_OBJECTS =  \
- 	bus_test_launch_helper-test-launch-helper.$(OBJEXT) \
- 	$(am__objects_5)
- bus_test_launch_helper_OBJECTS = $(am_bus_test_launch_helper_OBJECTS)
--bus_test_launch_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(top_builddir)/dbus/libdbus-convenience.la
-+bus_test_launch_helper_DEPENDENCIES =  \
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(am__DEPENDENCIES_1)
- bus_test_launch_helper_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(bus_test_launch_helper_LDFLAGS) $(LDFLAGS) -o $@
-@@ -142,8 +143,9 @@ am__dbus_daemon_SOURCES_DIST = activation.c activation.h \
- 	config-loader-libxml.c main.c
- am_dbus_daemon_OBJECTS = $(am__objects_3) main.$(OBJEXT)
- dbus_daemon_OBJECTS = $(am_dbus_daemon_OBJECTS)
--dbus_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(top_builddir)/dbus/libdbus-convenience.la
-+dbus_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(am__DEPENDENCIES_1)
- dbus_daemon_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(dbus_daemon_LDFLAGS) $(LDFLAGS) -o $@
-@@ -160,8 +162,9 @@ am_dbus_daemon_launch_helper_OBJECTS =  \
- 	activation-helper-bin.$(OBJEXT) $(am__objects_6)
- dbus_daemon_launch_helper_OBJECTS =  \
- 	$(am_dbus_daemon_launch_helper_OBJECTS)
--dbus_daemon_launch_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(top_builddir)/dbus/libdbus-convenience.la
-+dbus_daemon_launch_helper_DEPENDENCIES =  \
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(am__DEPENDENCIES_1)
- dbus_daemon_launch_helper_LINK = $(LIBTOOL) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(AM_CFLAGS) $(CFLAGS) $(dbus_daemon_launch_helper_LDFLAGS) \
-@@ -185,8 +188,9 @@ am_dbus_daemon_launch_helper_test_OBJECTS = dbus_daemon_launch_helper_test-activ
- 	$(am__objects_8)
- dbus_daemon_launch_helper_test_OBJECTS =  \
- 	$(am_dbus_daemon_launch_helper_test_OBJECTS)
--dbus_daemon_launch_helper_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(top_builddir)/dbus/libdbus-convenience.la
-+dbus_daemon_launch_helper_test_DEPENDENCIES =  \
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(am__DEPENDENCIES_1)
- dbus_daemon_launch_helper_test_LINK = $(LIBTOOL) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(AM_CFLAGS) $(CFLAGS) \
-@@ -497,8 +501,8 @@ dbus_daemon_SOURCES = \
- 
- dbus_daemon_LDADD = \
- 	$(EFENCE)					\
--	$(DBUS_BUS_LIBS)				\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la	\
-+	$(DBUS_BUS_LIBS)
- 
- dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
- LAUNCH_HELPER_SOURCES = \
-@@ -520,8 +524,8 @@ dbus_daemon_launch_helper_SOURCES = \
- 	$(LAUNCH_HELPER_SOURCES)
- 
- dbus_daemon_launch_helper_LDADD = \
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- dbus_daemon_launch_helper_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- dbus_daemon_launch_helper_test_SOURCES = \
-@@ -529,8 +533,8 @@ dbus_daemon_launch_helper_test_SOURCES = \
- 	$(LAUNCH_HELPER_SOURCES)
- 
- dbus_daemon_launch_helper_test_LDADD = \
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- dbus_daemon_launch_helper_test_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- dbus_daemon_launch_helper_test_CPPFLAGS = \
-@@ -541,8 +545,8 @@ bus_test_launch_helper_SOURCES = \
- 	$(LAUNCH_HELPER_SOURCES)
- 
- bus_test_launch_helper_LDADD = \
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- bus_test_launch_helper_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- bus_test_launch_helper_CPPFLAGS = \
diff --git a/debian/patches/series b/debian/patches/series
index 0149cb8e..2867e270 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
 00_dbus-quiesce-startup-errors.patch
 01_no-fatal-warnings.patch
-02_dbus_monitor_no_sigint_handler.patch
 10_dbus-1.0.1-generate-xml-docs.patch
-20_kbsd_cmsgcred.patch
-30_rt-as-needed.patch
diff --git a/debian/rules b/debian/rules
index f5453f30..b9951d50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,12 +19,12 @@ common-binary-post-install-arch:: list-missing
 
 DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/dbus-1.0"
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
+DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-xml-docs \
 	--enable-doxygen-docs \
 	--disable-libaudit
 
-DEB_DH_INSTALLINIT_ARGS := -r -- start 12 2 3 4 5 . stop  88 1 .
+DEB_DH_INSTALLINIT_ARGS := -r -- start 12 2 3 4 5 .
 
 binary-post-install/dbus-x11::
 	mkdir -p debian/dbus-x11/etc/X11/Xsession.d