From a80bcd80d6c4bc7033baf8c276f6942885b9f49d Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 17 Jul 2013 10:15:03 +0100 Subject: [PATCH 1/4] Do the same trick as in 2.158 for kubuntu armhf+omap4 too. --- debian/changelog | 6 ++++++ live-build/auto/config | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9559aa4e..6f9c5fc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.160) UNRELEASED; urgency=low + + * Do the same trick as in 2.158 for kubuntu armhf+omap4 too. + + -- Iain Lane Wed, 17 Jul 2013 10:13:06 +0100 + livecd-rootfs (2.159) saucy; urgency=low * make touch images source the dbus session address from diff --git a/live-build/auto/config b/live-build/auto/config index d01123e5..6fa27e8f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -191,7 +191,21 @@ case $PROJECT in ;; kubuntu|kubuntu-dvd) - add_task install minimal standard kubuntu-desktop + add_task install minimal standard + case "$ARCH+$SUBARCH" in + armhf+omap4) + # Don't use the task as this drags in the regular X + # stack (the metapackage doesn't). We want the + # "reverted" one. + add_package install kubuntu-desktop \ + xserver-xorg-core-omap-revert \ + xserver-xorg-video-omap-revert \ + xserver-xorg-input-evdev-omap-revert + ;; + *) + add_task install kubuntu-desktop + ;; + esac LIVE_TASK='kubuntu-live' COMPONENTS='main restricted universe' add_chroot_hook remove-gnome-icon-cache From 3b8a12dbe63e7848e9b6e1232fb8c14211e4055f Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 17 Jul 2013 11:52:25 +0100 Subject: [PATCH 2/4] releasing version 2.160 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6f9c5fc6..9ffb5f11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.160) UNRELEASED; urgency=low +livecd-rootfs (2.160) saucy; urgency=low * Do the same trick as in 2.158 for kubuntu armhf+omap4 too. - -- Iain Lane Wed, 17 Jul 2013 10:13:06 +0100 + -- Iain Lane Wed, 17 Jul 2013 11:52:23 +0100 livecd-rootfs (2.159) saucy; urgency=low From 46f91565eafcd4275edf204d84d2ce4cf3bf42d1 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 17 Jul 2013 16:31:13 +0200 Subject: [PATCH 3/4] drop bashrc mangling from ubuntu-touch builds --- 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..03ec80dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.161) UNRELEASED; 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 From a066692076169e3afb7f523423908c1368875cc1 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 17 Jul 2013 16:31:52 +0200 Subject: [PATCH 4/4] releasing version 2.161 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 03ec80dd..b8a84c1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.161) UNRELEASED; urgency=low +livecd-rootfs (2.161) saucy; urgency=low * drop bashrc mangling from ubuntu-touch builds \o/