Import patches-unapplied version 2.232 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 0bdd198220

New changelog entries:
  [ James Hunt ]
  * live-build/auto/config: Enable universe for system-image ubuntu-core
    sub-project which requires 'system-image-cli'.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.232) utopic; urgency=medium
+
+  [ James Hunt ]
+  * live-build/auto/config: Enable universe for system-image ubuntu-core
+    sub-project which requires 'system-image-cli'.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 30 Jul 2014 17:56:04 +0100
+
 livecd-rootfs (2.231) utopic; urgency=medium
 
   * Hard-code installation of libmirclientplatform-android and

live-build/auto/config

@@ -324,13 +324,15 @@ case $PROJECT in
 
 	ubuntu-core)
 		add_task install minimal
-                # mvo: This is for cron.daily-preinstalled
+		# mvo: This is for cron.daily-preinstalled
-                #      CDIMAGE_PREINSTALLED is not passed from build.py
+		#      CDIMAGE_PREINSTALLED is not passed from build.py
-                #      and PREINSTALLED means something different. So
+		#      and PREINSTALLED means something different. So
-                #      we use SUBPROJECT to pass on the information
+		#      we use SUBPROJECT to pass on the information
-                if [ "$SUBPROJECT" = "system-image" ]; then
+		if [ "$SUBPROJECT" = "system-image" ]; then
-                    add_task install ubuntu-core
+			add_task install ubuntu-core
-                fi
+			# universe needed for 'system-image-cli'
+			COMPONENTS='main restricted universe'
+		fi
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;
 
@@ -436,14 +438,14 @@ esac
 
 case $PROJECT in
 	ubuntu-server|ubuntu-core|ubuntu-touch)
-	        case $SUBPROJECT in
+		case $SUBPROJECT in
 			system-image)
-                                # keep the kernel for the system-image build
+				# keep the kernel for the system-image build
 				;;
 			*)
-		                OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
+				OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
-		                KERNEL_FLAVOURS=none
+				KERNEL_FLAVOURS=none
-		                BINARY_REMOVE_LINUX=false
+				BINARY_REMOVE_LINUX=false
 				;;
 		esac
 esac