[Pkg-utopia-commits] r3585 - in /packages/experimental/dbus/debian: README.source changelog control dbus-Xsession dbus.init dbus.postinst patches/02_dbus_monitor_no_sigint_handler.patch patches/20_kbsd_cmsgcred.patch patches/30_rt-as-needed.patch patches/series rules

smcv at users.alioth.debian.org smcv at users.alioth.debian.org
Fri Jun 25 12:53:46 UTC 2010 

Author: smcv
Date: Fri Jun 25 12:53:37 2010
New Revision: 3585

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3585
Log:
Merge from unstable, up to r3584

Added:
    packages/experimental/dbus/debian/README.source
      - copied unchanged from r3584, packages/unstable/dbus/debian/README.source
Removed:
    packages/experimental/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch
    packages/experimental/dbus/debian/patches/20_kbsd_cmsgcred.patch
    packages/experimental/dbus/debian/patches/30_rt-as-needed.patch
Modified:
    packages/experimental/dbus/debian/changelog
    packages/experimental/dbus/debian/control
    packages/experimental/dbus/debian/dbus-Xsession
    packages/experimental/dbus/debian/dbus.init
    packages/experimental/dbus/debian/dbus.postinst
    packages/experimental/dbus/debian/patches/series
    packages/experimental/dbus/debian/rules

Modified: packages/experimental/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/changelog?rev=3585&op=diff
==============================================================================
--- packages/experimental/dbus/debian/changelog (original)
+++ packages/experimental/dbus/debian/changelog Fri Jun 25 12:53:37 2010
@@ -1,8 +1,58 @@
-dbus (1.2.16-3~exp1) experimental; urgency=low
-
-  [ Michael Biebl ]
+dbus (1.2.24-1+exp1) UNRELEASED; urgency=low
+
+   * 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 at 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 at 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 at 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 at 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 @@
       (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 at 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 at debian.org>  Wed, 03 Feb 2010 22:49:42 +0100
 
 dbus (1.2.16-2) unstable; urgency=low
 

Modified: packages/experimental/dbus/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/control?rev=3585&op=diff
==============================================================================
--- packages/experimental/dbus/debian/control (original)
+++ packages/experimental/dbus/debian/control Fri Jun 25 12:53:37 2010
@@ -18,8 +18,8 @@
                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 @@
          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 @@
          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

Modified: packages/experimental/dbus/debian/dbus-Xsession
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/dbus-Xsession?rev=3585&op=diff
==============================================================================
--- packages/experimental/dbus/debian/dbus-Xsession (original)
+++ packages/experimental/dbus/debian/dbus-Xsession Fri Jun 25 12:53:37 2010
@@ -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

Modified: packages/experimental/dbus/debian/dbus.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/dbus.init?rev=3585&op=diff
==============================================================================
--- packages/experimental/dbus/debian/dbus.init (original)
+++ packages/experimental/dbus/debian/dbus.init Fri Jun 25 12:53:37 2010
@@ -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.

Modified: packages/experimental/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/dbus.postinst?rev=3585&op=diff
==============================================================================
--- packages/experimental/dbus/debian/dbus.postinst (original)
+++ packages/experimental/dbus/debian/dbus.postinst Fri Jun 25 12:53:37 2010
@@ -31,6 +31,11 @@
     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.

Modified: packages/experimental/dbus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/patches/series?rev=3585&op=diff
==============================================================================
--- packages/experimental/dbus/debian/patches/series (original)
+++ packages/experimental/dbus/debian/patches/series Fri Jun 25 12:53:37 2010
@@ -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

Modified: packages/experimental/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/rules?rev=3585&op=diff
==============================================================================
--- packages/experimental/dbus/debian/rules (original)
+++ packages/experimental/dbus/debian/rules Fri Jun 25 12:53:37 2010
@@ -19,12 +19,12 @@
 
 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

More information about the Pkg-utopia-commits mailing list