Merge branch 'master' into experimental

Conflicts:
	debian/changelog
	debian/control
	debian/rules

9 files changed, 76 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 87e79409..44445c0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,48 @@
+dbus (1.5.4-3) UNRELEASED; urgency=low
+
+  * Merge from unstable
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 15 Jul 2011 11:23:48 +0100
+
+dbus (1.4.12-5) unstable; urgency=low
+
+  * Undo the changed invocation for dbus-launch, which seems to cause
+    more problems than it solves (LP: #807614, LP: #809900, probably also
+    Closes: #633652)
+  * Work around #453755 by just reopening stdin from /dev/null instead,
+    until fd.o #39197 gets fixed
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 15 Jul 2011 10:45:56 +0100
+
+dbus (1.4.12-4) unstable; urgency=low
+
+  * Override missing-pre-dependency-on-multiarch-support for the -dev
+    package, ftp-master doesn't have lintian 2.5.1 yet
+  * Check all Description fields for correct use of dbus (package name)
+    vs. D-Bus (project name), and override lintian false-positives
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 01 Jul 2011 07:55:01 +0100
+
+dbus (1.4.12-3) unstable; urgency=low
+
+  * Mention CVE-2011-2200 in the changelog for 1.4.12-1 now it has a CVE ID
+  * Merge some things from Ubuntu, via experimental:
+    - move libraries into multiarch locations (but don't move binaries
+      from /usr to /, which is not needed on Debian)
+    - run dbus-uuidgen --ensure in postinst
+    - call ReloadConfig with dbus-send in the postinst, since that'll work
+      regardless of whether dbus was started with sysvinit or Upstart; just
+      call it unconditionally, and ignore any failures we might see (in
+      chroots or if dbus-daemon wasn't running)
+  * and more things from experimental:
+    - improve comments in postinst explaining why it behaves as it does
+  * Run dbus-launch for X sessions in a way that doesn't consume characters
+    from startx's stdin, or the stdin of certain display managers' init scripts
+    (known to affect slim, but not xdm or gdm) (Closes: #453755)
+  * Remove the .la file for the debug build, not just the normal build
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 30 Jun 2011 17:21:03 +0100
+
 dbus (1.5.4-2) experimental; urgency=low
 
   * Merge from unstable
@@ -33,7 +78,7 @@ dbus (1.5.4-1) experimental; urgency=low
 
 dbus (1.4.12-1) unstable; urgency=medium
 
-  * New upstream release fixes local DoS (Closes: #629938, no CVE number yet)
+  * New upstream release fixes local DoS (Closes: #629938, CVE-2011-2200)
   * Don't delete jquery.js, no longer installed by recent Doxygen
   * Build-depend on libglib2.0-dev, libdbus-glib-1-dev for better regression
     test coverage (dbus-glib is a circular dependency, but both of these
diff --git a/debian/control b/debian/control
index 250aae7d..7498e3cd 100644
--- a/debian/control
+++ b/debian/control
@@ -115,8 +115,7 @@ Description: simple interprocess messaging system (documentation)
 Package: libdbus-1-dev
 Section: libdevel
 Architecture: any
-Pre-Depends: multiarch-support,
-             ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libdbus-1-3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
diff --git a/debian/dbus-1-dbg.lintian-overrides b/debian/dbus-1-dbg.lintian-overrides
new file mode 100644
index 00000000..4281e3e2
--- /dev/null
+++ b/debian/dbus-1-dbg.lintian-overrides
@@ -0,0 +1,2 @@
+# false positive: we only say dbus when talking about a package name
+dbus-1-dbg: capitalization-error-in-description dbus D-Bus
diff --git a/debian/dbus-1-doc.lintian-overrides b/debian/dbus-1-doc.lintian-overrides
new file mode 100644
index 00000000..b8fb8251
--- /dev/null
+++ b/debian/dbus-1-doc.lintian-overrides
@@ -0,0 +1,2 @@
+# false positive: we only say dbus when talking about a package name
+dbus-1-doc: capitalization-error-in-description dbus D-Bus
diff --git a/debian/dbus-Xsession b/debian/dbus-Xsession
index af7ba492..14390231 100644
--- a/debian/dbus-Xsession
+++ b/debian/dbus-Xsession
@@ -13,5 +13,19 @@ if has_option use-session-dbus; then
 fi
 
 if [ -n "$STARTDBUS" ]; then
+  # dbus-launch misbehaves when stdin is a console:
+  # - http://bugs.debian.org/453755
+  # - https://bugs.freedesktop.org/show_bug.cgi?id=39197
+  #
+  # While we sort out with upstream what the right solution is,
+  # work around it by ensuring that stdin is not a console (this is a no-op
+  # on xdm and gdm, but not on startx, slim, nodm).
+  #
+  # It isn't really D-Bus' place to do this - we're changing the environment
+  # of everything executed from Xsession.d, not just dbus-launch - but having
+  # X apps whose stdin is the console makes very little sense, so arguably
+  # startx, slim, nodm etc. should be doing this themselves.
+  exec < /dev/null
+
   STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP"
 fi
diff --git a/debian/dbus-x11.lintian-overrides b/debian/dbus-x11.lintian-overrides
new file mode 100644
index 00000000..af6061fa
--- /dev/null
+++ b/debian/dbus-x11.lintian-overrides
@@ -0,0 +1,2 @@
+# false positive: we only say dbus when talking about a package name
+dbus-x11: capitalization-error-in-description dbus D-Bus
diff --git a/debian/libdbus-1-3.lintian-overrides b/debian/libdbus-1-3.lintian-overrides
new file mode 100644
index 00000000..30ebce0a
--- /dev/null
+++ b/debian/libdbus-1-3.lintian-overrides
@@ -0,0 +1,2 @@
+# false positive: we only say dbus when talking about a package name
+libdbus-1-3: capitalization-error-in-description dbus D-Bus
diff --git a/debian/libdbus-1-dev.lintian-overrides b/debian/libdbus-1-dev.lintian-overrides
new file mode 100644
index 00000000..891b7215
--- /dev/null
+++ b/debian/libdbus-1-dev.lintian-overrides
@@ -0,0 +1,6 @@
+# false positive, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629648
+# remove this override when the ftp-masters install lintian 2.5.1
+libdbus-1-dev: missing-pre-dependency-on-multiarch-support
+
+# false positive: we only say dbus when talking about a package name
+libdbus-1-dev: capitalization-error-in-description dbus D-Bus
diff --git a/debian/rules b/debian/rules
index 4f9eac1f..ce644158 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,7 @@ override_dh_link:
 override_dh_install:
 	install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/test
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1.la
+	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/debug-build/lib/libdbus-1.la
 	dh_install -p$(libdbusN) \
 		"usr/lib/$(DEB_HOST_MULTIARCH)/$(libdbus_soname)*" \
 		lib/$(DEB_HOST_MULTIARCH)