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

@@ -330,6 +330,8 @@ case $PROJECT in
 		#      we use SUBPROJECT to pass on the information
 		if [ "$SUBPROJECT" = "system-image" ]; then
 			add_task install ubuntu-core
+			# universe needed for 'system-image-cli'
+			COMPONENTS='main restricted universe'
 		fi
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;