Sync remaining changes from unstable

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

3 files changed, 15 insertions, 11 deletions

diff --git a/debian/dbus.postrm b/debian/dbus.postrm
new file mode 100644
index 00000000..cd981662
--- /dev/null
+++ b/debian/dbus.postrm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ] ; then
+	rmdir /var/run/dbus || true
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/patches/20-dbus-alpha-unaligned.patch b/debian/patches/20-dbus-alpha-unaligned.patch
deleted file mode 100644
index c9f13c81..00000000
--- a/debian/patches/20-dbus-alpha-unaligned.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dbus/dbus-marshal-basic.c.ORIG	2008-04-23 17:54:58.000000000 -0400
-+++ b/dbus/dbus-marshal-basic.c	2008-04-23 18:00:06.000000000 -0400
-@@ -518,7 +518,7 @@ _dbus_marshal_read_basic (const DBusStri
-   switch (type)
-     {
-     case DBUS_TYPE_BYTE:
--      vp->byt = _dbus_string_get_byte (str, pos);
-+      *((volatile char *)&vp->byt) = _dbus_string_get_byte (str, pos);
-       (pos)++;
-       break;
-     case DBUS_TYPE_INT16:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..89fe3d72
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+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