[Pkg-utopia-commits] r3149 - in /packages/experimental/dbus/debian: changelog dbus.postinst dbus.postrm rules

[smcv at users.alioth.debian.org]

Author: smcv
Date: Wed Jul  8 19:00:42 2009
New Revision: 3149

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3149
Log:
Merge from unstable, r3135

Modified:
    packages/experimental/dbus/debian/changelog
    packages/experimental/dbus/debian/dbus.postinst
    packages/experimental/dbus/debian/dbus.postrm
    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=3149&op=diff
==============================================================================
--- packages/experimental/dbus/debian/changelog (original)
+++ packages/experimental/dbus/debian/changelog Wed Jul  8 19:00:42 2009
@@ -1,9 +1,22 @@
-dbus (1.2.14-3~exp1) UNRELEASED; urgency=low
+dbus (1.2.14-4~exp1) UNRELEASED; urgency=low
 
   * Sync unstable into experimental
   * Add dbus-1-dbg package containing separated debug symbols
 
  -- Simon McVittie <smcv at debian.org>  Wed, 27 May 2009 10:30:25 +0100
+
+dbus (1.2.14-3) unstable; urgency=low
+
+  * debian/dbus.postinst
+    - Suppress output from adduser.
+  * debian/dbus.postrm
+    - Cleanup /var/lib/dbus on purge.
+  * debian/rules
+    - Compile dbus-daemon without -pie on mipsen. This is a workaround for a
+      toolchain bug on mipsen (#532821) which causes dbus-daemon to segfault.
+      (Closes: #528145)
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 17 Jun 2009 21:03:57 +0200
 
 dbus (1.2.14-2) unstable; urgency=low
 

Modified: packages/experimental/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/dbus.postinst?rev=3149&op=diff
==============================================================================
--- packages/experimental/dbus/debian/dbus.postinst (original)
+++ packages/experimental/dbus/debian/dbus.postinst Wed Jul  8 19:00:42 2009
@@ -10,6 +10,7 @@
 
 if [ "$1" = configure ]; then
     adduser --system \
+            --quiet \
             --home "$MESSAGEHOME" \
             --no-create-home \
             --disabled-password \

Modified: packages/experimental/dbus/debian/dbus.postrm
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/dbus.postrm?rev=3149&op=diff
==============================================================================
--- packages/experimental/dbus/debian/dbus.postrm (original)
+++ packages/experimental/dbus/debian/dbus.postrm Wed Jul  8 19:00:42 2009
@@ -4,6 +4,9 @@
 
 if [ "$1" = "purge" ] ; then
 	rmdir /var/run/dbus || true
+
+	rm -f /var/lib/dbus/machine-id
+	rmdir /var/lib/dbus || true
 fi
 
 #DEBHELPER#

Modified: packages/experimental/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/rules?rev=3149&op=diff
==============================================================================
--- packages/experimental/dbus/debian/rules (original)
+++ packages/experimental/dbus/debian/rules Wed Jul  8 19:00:42 2009
@@ -25,6 +25,13 @@
 
 DEB_DH_INSTALLINIT_ARGS := -r -- start 12 2 3 4 5 . stop  88 1 .
 
+ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
+common-configure-impl::
+	# Workaround for a bug in binutils on mipsen (see #528145).
+	# Remove again when #532821 has been fixed.
+	sed -i -e 's/\-fPIE//' -e 's/\-pie\ \-Wl\,\-z\,relro//' bus/Makefile
+endif
+
 binary-post-install/dbus-x11::
 	mkdir -p debian/dbus-x11/etc/X11/Xsession.d
 	cp debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch