From 129b32ff971bdcbd5c11ab00faf6ef70e23817bb Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 24 Sep 2014 10:59:55 +0100 Subject: [PATCH] Import patches-unapplied version 2.246 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: d803954231d5918f20d5d14e01c89060aae40c88 New changelog entries: * live-build/auto/config: Use ubuntukylin-live task for ubuntukylin, not ubuntu-live (LP: #1372731). --- debian/changelog | 7 +++++++ live-build/auto/config | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4a586b8f..92818f9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.246) utopic; urgency=medium + + * live-build/auto/config: Use ubuntukylin-live task for ubuntukylin, not + ubuntu-live (LP: #1372731). + + -- Colin Watson Wed, 24 Sep 2014 10:59:55 +0100 + livecd-rootfs (2.245) utopic; urgency=medium * Add two new hooks for Ubuntu Touch to setup sensible /etc/passwd, diff --git a/live-build/auto/config b/live-build/auto/config index f03b9bf8..733d815b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -317,7 +317,7 @@ case $PROJECT in ubuntukylin) add_task install minimal standard ubuntukylin-desktop add_package install ubuntukylin-default-settings - LIVE_TASK='ubuntu-live' + LIVE_TASK='ubuntukylin-live' case $ARCH in amd64) add_package live linux-signed-generic ;; esac