From 751153543af4f4fb1824548056b33c4083ad3adb Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 11 Aug 2015 11:27:42 +0200
Subject: [PATCH] merge change for 2.335 from the archive

---
 debian/changelog       | 10 ++++++++++
 live-build/auto/config |  9 ++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93f81a3e..5ce8eaec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.335) UNRELEASED; urgency=medium
+
+  * Attempt to build Ubuntu image using metapackages instead of tasks; this
+    is necessary in order to build a test image out of wily-proposed for the
+    g++5 transition, but may be reverted later if this doesn't turn out to
+    be maintainable.  (Code taken from the trusty HWE LTS branch of
+    livecd-rootfs.)
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 09 Aug 2015 22:54:24 -0700
+
 livecd-rootfs (2.334) wily; urgency=medium
 
   * add dnsmasq user to snappy builds, needed by ubuntu-fan
diff --git a/live-build/auto/config b/live-build/auto/config
index 334fa275..1c9cc697 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -180,9 +180,12 @@ 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_task install minimal standard
+		add_package install ubuntu-minimal ubuntu-standard
 		case "$ARCH+$SUBARCH" in
 			armhf+omap4)
 				# Don't use the task as this drags in the regular X
@@ -194,12 +197,12 @@ case $PROJECT in
 					xserver-xorg-input-evdev-omap-revert 
 				;;
 			*)
-				add_task install ubuntu-desktop
+				add_package install ubuntu-desktop $UNITY_HWE_HINTS
 				;;
 		esac
 		LIVE_TASK='ubuntu-live'
 		case $ARCH in
-			amd64)	add_package live linux-signed-generic ;;
+			amd64)	add_package live $SIGNED_KERNEL_PACKAGE ;;
 		esac
 		;;