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
This commit is contained in:
Oliver Grawert 2013-07-16 20:12:31 +02:00 committed by usd-importer
parent 34b724be60
commit 07dab9cf2f
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -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 <ogra@ubuntu.com> 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

View File

@ -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