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/
This commit is contained in:
Oliver Grawert 2013-07-17 16:30:12 +02:00 committed by usd-importer
parent 514e3fd58b
commit 949b1026a5
2 changed files with 6 additions and 4 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.161) saucy; urgency=low
* drop bashrc mangling from ubuntu-touch builds \o/
-- Oliver Grawert <ogra@ubuntu.com> 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.

View File

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