From a36b4aa2756925756d65a467ea6a798870c1a6eb Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 10 Sep 2014 10:54:17 +0100 Subject: [PATCH] Import patches-unapplied version 2.241 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: eb694e09bceb0c3aa4f458c991c891bd0509d219 New changelog entries: * live-build/auto/config: Use ubuntukylin-desktop task for ubuntukylin, not ubuntu-desktop. --- debian/changelog | 7 +++++++ live-build/auto/config | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ce06850d..a5abf6b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.241) utopic; urgency=medium + + * live-build/auto/config: Use ubuntukylin-desktop task for ubuntukylin, + not ubuntu-desktop. + + -- Colin Watson Wed, 10 Sep 2014 10:54:17 +0100 + livecd-rootfs (2.240) utopic; urgency=medium * live-build/ubuntu-touch/hooks/01-setup_user.chroot: diff --git a/live-build/auto/config b/live-build/auto/config index e8443308..f03b9bf8 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -315,7 +315,7 @@ case $PROJECT in ;; ubuntukylin) - add_task install minimal standard ubuntu-desktop + add_task install minimal standard ubuntukylin-desktop add_package install ubuntukylin-default-settings LIVE_TASK='ubuntu-live' case $ARCH in