From 949b1026a5df5224621ce93f5c0d76a06b177b54 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 17 Jul 2013 16:30:12 +0200 Subject: [PATCH] Import patches-unapplied version 2.161 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 514e3fd58b0c906b2535a03d8189043071437a88 New changelog entries: * drop bashrc mangling from ubuntu-touch builds \o/ --- debian/changelog | 6 ++++++ live-build/ubuntu-touch/hooks/48-setup-env.chroot | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ffb5f11..b8a84c1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.161) saucy; urgency=low + + * drop bashrc mangling from ubuntu-touch builds \o/ + + -- Oliver Grawert Wed, 17 Jul 2013 16:30:12 +0200 + livecd-rootfs (2.160) saucy; urgency=low * Do the same trick as in 2.158 for kubuntu armhf+omap4 too. diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot index 0e3b72f3..0ab0c9fe 100755 --- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot +++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot @@ -26,7 +26,3 @@ LANGUAGE=en_US:en QT_IM_MODULE=maliitphablet 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/.cache/upstart/dbus-session -export DBUS_SESSION_BUS_ADDRESS" >> /home/phablet/.bashrc