From 514e3fd58b0c906b2535a03d8189043071437a88 Mon Sep 17 00:00:00 2001 From: Iain Lane <iain.lane@canonical.com> Date: Wed, 17 Jul 2013 11:52:23 +0100 Subject: [PATCH] Import patches-unapplied version 2.160 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 07dab9cf2f997b6290c8756e6bc68aacdd785398 New changelog entries: * 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..9ffb5f11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.160) saucy; urgency=low + + * Do the same trick as in 2.158 for kubuntu armhf+omap4 too. + + -- Iain Lane <iain.lane@canonical.com> Wed, 17 Jul 2013 11:52:23 +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