From b62151eae74ed58174e544cfe6fa81b2924fc982 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 28 May 2014 10:37:36 +0100 Subject: [PATCH] Import patches-unapplied version 2.214 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: 095562b3972275e8627033f2f8c475acf9a7f802 New changelog entries: * ubuntu-desktop-next: Use the Task fields that the archive now has for this project. --- debian/changelog | 7 +++++++ live-build/auto/config | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ff7e2476..3582ac57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.214) utopic; urgency=medium + + * ubuntu-desktop-next: Use the Task fields that the archive now has for this + project. + + -- Iain Lane Wed, 28 May 2014 10:37:36 +0100 + livecd-rootfs (2.213) utopic; urgency=medium * The EXTRA_ARCHIVES environment variable defined in 2.212 doesn't quite diff --git a/live-build/auto/config b/live-build/auto/config index f81e1c0c..e8cf88fd 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -193,10 +193,9 @@ case $PROJECT in ;; ubuntu-desktop-next) - add_task install minimal standard - add_package install ubuntu-desktop-next + add_task install minimal standard ubuntu-desktop-next ubuntu-sdk-libs COMPONENTS='main restricted universe' - LIVE_TASK='ubuntu-live' + LIVE_TASK='ubuntu-touch-live' ;; kubuntu|kubuntu-dvd)