diff -u dbus-1.0.2/debian/changelog dbus-1.0.2/debian/changelog
--- dbus-1.0.2/debian/changelog
+++ dbus-1.0.2/debian/changelog
@@ -1,3 +1,10 @@
+dbus (1.0.2-1ubuntu4) feisty; urgency=low
+
+  * debian/patches/82-Xsession-gnome-no-session-bus.patch: do not start
+    dbus session daemon for gnome-session. (LP: #62163)
+
+ -- Michael Hofmann <mh21@piware.de>  Thu,  5 Apr 2007 17:09:06 +0200
+
 dbus (1.0.2-1ubuntu3) feisty; urgency=low
 
   * debian/rules: Start dbus at runlevel priority 12, so that it comes before
only in patch2:
unchanged:
--- dbus-1.0.2.orig/debian/patches/82-Xsession-gnome-no-session-bus.patch
+++ dbus-1.0.2/debian/patches/82-Xsession-gnome-no-session-bus.patch
@@ -0,0 +1,21 @@
+diff -ur dbus-1.0.2.orig/debian/dbus-Xsession dbus-1.0.2/debian/dbus-Xsession
+--- dbus-1.0.2.orig/debian/dbus-Xsession        2007-04-05 16:56:30.000000000 +0200
++++ dbus-1.0.2/debian/dbus-Xsession     2007-04-05 17:02:56.000000000 +0200
+@@ -12,6 +12,17 @@
+   fi
+ fi
+ 
++# GNOME gets it right: the session bus has to be started by the session
++# manager. Otherwise programs started by dbus do not get environment variables
++# set by the session manager like SESSION_MANAGER etc.
++BASESTARTUP=`basename "$STARTUP" | cut -d\  -f1`
++if [ "$BASESTARTUP" = gnome-session -o \
++        \( "$BASESTARTUP" = x-session-manager -a \
++        `readlink /etc/alternatives/x-session-manager` = \
++                /usr/bin/gnome-session \) ]; then
++  STARTDBUS=
++fi
++
+ if [ -n "$STARTDBUS" ]; then
+   STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP"
+ fi