From b0e649a83c03110dd084bfcfdcf6f6c57e26e39b Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Thu, 21 Jul 2016 02:31:01 -0600 Subject: [PATCH] Switch ubuntu-gnome from using tasks to metapackages (LP: #1602035) --- debian/changelog | 6 ++++++ live-build/auto/config | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e5886c1..176ffd8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.408.2) xenial; urgency=medium + + * Switch ubuntu-gnome from using tasks to metapackages (LP: #1602035) + + -- Adam Conrad Wed, 20 Jul 2016 01:46:41 -0600 + livecd-rootfs (2.408.1) xenial; urgency=medium * Rename old ubuntu-core tarballs to ubuntu-base, for consistency with diff --git a/live-build/auto/config b/live-build/auto/config index 12a72dc1..4d2b728f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -188,6 +188,7 @@ esac SIGNED_KERNEL_PACKAGE="linux-signed-generic" UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity gnome-terminal" +UBUNTUGNOME_HWE_HINTS="unity-settings-daemon- unity-control-center- libaccount-plugin-1.0-0- notification-daemon- libreoffice-style-elementary- libreoffice-style-human- libreoffice-style-breeze- curl- humanity-icon-theme- gnome-shell pinentry-curses" case $PROJECT in ubuntu|ubuntu-dvd) @@ -301,10 +302,11 @@ case $PROJECT in ;; ubuntu-gnome) - add_task install minimal standard ubuntu-gnome-desktop + add_package install ubuntu-minimal ubuntu-standard + add_package install ubuntu-gnome-desktop $UBUNTUGNOME_HWE_HINTS LIVE_TASK='ubuntu-gnome-live' case $ARCH in - amd64) add_package live linux-signed-generic ;; + amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac COMPONENTS='main restricted universe' ;;