From 1a48d101d5805b0e79a1ca40f90ace99ae9cd317 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Fri, 2 Jun 2017 15:08:29 +0200 Subject: [PATCH] Import patches-unapplied version 2.446 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: e55a4a791001ac3d9845de89c09c61b08d3e244a New changelog entries: * Build ubuntu back with tasks. The metapackage switch was due to g++ transition and needed some additional hint. This is adding maintenance and as mentioned in 2.335, we can revert this. --- debian/changelog | 8 ++++++++ live-build/auto/config | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a7e22612..a17697fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.446) artful; urgency=medium + + * Build ubuntu back with tasks. The metapackage switch was due to g++ + transition and needed some additional hint. This is adding maintenance + and as mentioned in 2.335, we can revert this. + + -- Didier Roche Fri, 02 Jun 2017 15:08:29 +0200 + livecd-rootfs (2.445) artful; urgency=medium * Resurrect Balint's fix from diff --git a/live-build/auto/config b/live-build/auto/config index 60be6328..53ee496b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -233,12 +233,10 @@ case $BINARYFORMAT in esac SIGNED_KERNEL_PACKAGE="linux-signed-generic" -UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity gnome-terminal" case $PROJECT in ubuntu|ubuntu-dvd) - add_package install ubuntu-minimal ubuntu-standard - add_package install ubuntu-desktop $UNITY_HWE_HINTS + add_task install minimal standard ubuntu-desktop LIVE_TASK='ubuntu-live' case $ARCH in amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;