From 07dab9cf2f997b6290c8756e6bc68aacdd785398 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 16 Jul 2013 20:12:31 +0200 Subject: [PATCH] Import patches-unapplied version 2.159 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 34b724be60a567ac2138ddad7dbce4996c2a5aa9 New changelog entries: * make touch images source the dbus session address from ~/.cache/upstart/dbus-session instead of ~/.dbus-session --- debian/changelog | 7 +++++++ live-build/ubuntu-touch/hooks/48-setup-env.chroot | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 48fa4a9d..9559aa4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.159) saucy; urgency=low + + * make touch images source the dbus session address from + ~/.cache/upstart/dbus-session instead of ~/.dbus-session + + -- Oliver Grawert Tue, 16 Jul 2013 20:12:31 +0200 + livecd-rootfs (2.158) saucy; urgency=low * Under armhf+omap4, don't use the ubuntu-desktop Task, but use the diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot index 5a007031..0e3b72f3 100755 --- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot +++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot @@ -28,5 +28,5 @@ HUD_NO_STORE_USAGE_DATA=1 INDICATOR_ALLOW_NO_WATCHERS=1" > /etc/environment echo -e "\n# export the phablet shell dbus session on normal login shells -source /home/phablet/.dbus-session +source /home/phablet/.cache/upstart/dbus-session export DBUS_SESSION_BUS_ADDRESS" >> /home/phablet/.bashrc