From 123b33de50658a03ee97dbe50f26f4922e4ec44b Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 5 Jun 2015 10:55:39 +0200 Subject: [PATCH] Import patches-unapplied version 2.307 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: 04b0ecd5a61912d3ba2e924c152b482593b7321b New changelog entries: * Remove duplicated code leftover in the previous desktop-next changeset --- debian/changelog | 6 ++++++ live-build/auto/build | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8d9d2cc8..b4a3e82e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.307) wily; urgency=medium + + * Remove duplicated code leftover in the previous desktop-next changeset + + -- Sebastien Bacher Fri, 05 Jun 2015 10:55:39 +0200 + livecd-rootfs (2.306) wily; urgency=medium * Create hooks and image build config for the ubuntu-desktop-next diff --git a/live-build/auto/build b/live-build/auto/build index 5a19d484..97523cb6 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -349,14 +349,6 @@ case $PROJECT:$SUBPROJECT in ;; esac -if [ "$PROJECT" = "ubuntu-desktop-next" ] && [ "$SUBPROJECT" = "system-image" ]; then - LB_LINUX_FLAVOURS=none - - # rename to have the right prefix etc - mv device.tar.gz "$PREFIX.device.tar.gz" - -fi - for FLAVOUR in $LB_LINUX_FLAVOURS; do if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then continue