diff -Nru dbus-1.10.6/debian/changelog dbus-1.10.6/debian/changelog --- dbus-1.10.6/debian/changelog 2016-11-30 10:48:01.000000000 +0000 +++ dbus-1.10.6/debian/changelog 2017-01-12 18:04:36.000000000 +0000 @@ -1,3 +1,11 @@ +dbus (1.10.6-1ubuntu3.3) xenial; urgency=medium + + * debian/dbus.user-session.upstart: + - Temporarily revert latest changes as those seem to cause issues in the + unity8 session on touch (LP: #1654241). + + -- Ɓukasz 'sil2100' Zemczak Thu, 12 Jan 2017 19:01:21 +0100 + dbus (1.10.6-1ubuntu3.2) xenial; urgency=medium [ Iain Lane ] diff -Nru dbus-1.10.6/debian/dbus.user-session.upstart dbus-1.10.6/debian/dbus.user-session.upstart --- dbus-1.10.6/debian/dbus.user-session.upstart 2016-11-30 10:47:00.000000000 +0000 +++ dbus-1.10.6/debian/dbus.user-session.upstart 2017-01-12 18:01:17.000000000 +0000 @@ -6,27 +6,17 @@ env DBUS_DEBUG_OUTPUT=1 respawn - +expect fork pre-start script - if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - DBUS_SESSION_BUS_ADDRESS=unix:abstract=$(mktemp -u /tmp/dbus-XXXXXXXXXX) - initctl set-env do_launch=1 - fi + DBUS_SESSION_BUS_ADDRESS=unix:abstract=$(mktemp -u /tmp/dbus-XXXXXXXXXX) initctl set-env DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS end script -script - if [ -n "$do_launch" ]; then - exec dbus-daemon --session --address="$DBUS_SESSION_BUS_ADDRESS" - else - # if there already is an existing user bus, don't launch another one, - # but keep running to start jobs that trigger on dbus - exec sleep infinity - fi -end script +exec dbus-daemon --fork --session --address="$DBUS_SESSION_BUS_ADDRESS" post-start script initctl set-env --global DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS + [ -d "$HOME/.cache/upstart" ] || mkdir -p "$HOME/.cache/upstart" || true echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >$XDG_RUNTIME_DIR/dbus-session || true initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS" || true end script