New upstream stable release

* New upstream stable release
  - dbus-launch --exit-with-session no longer monitors its stdin if
    run under X11 (Closes: #453755)
* Remove the workaround for #453755 from dbus-Xsession

2 files changed, 9 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 322548e4..596d1d4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dbus (1.6.2-1) UNRELEASED; urgency=low
+
+  * New upstream stable release
+    - dbus-launch --exit-with-session no longer monitors its stdin if
+      run under X11 (Closes: #453755)
+  * Remove the workaround for #453755 from dbus-Xsession
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 27 Jun 2012 17:57:46 +0100
+
 dbus (1.6.0-1) unstable; urgency=low
 
   * Merge from "experimental" (1.5.12 was accidentally uploaded to unstable)
diff --git a/debian/dbus-Xsession b/debian/dbus-Xsession
index 14390231..af7ba492 100644
--- a/debian/dbus-Xsession
+++ b/debian/dbus-Xsession
@@ -13,19 +13,5 @@ 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