BuildLiveCD: Stop building ubuntu-defaults-image images with universe.

ubuntu-defaults-zh-cn is in main now, and it causes images to overflow
due to the extra /var/lib/apt/lists indexes.

BuildLiveCD

@@ -149,8 +149,7 @@ for STE in $SUITES; do
 	fi
 	COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
     elif [ "$UBUNTU_DEFAULTS_LOCALE" ]; then
-	# universe enabled until ubuntu-defaults-zh-cn is moved to main
+	COMMAND="ubuntu-defaults-image --locale ${UBUNTU_DEFAULTS_LOCALE} --arch ${ARCH} --release ${STE}"
-	COMMAND="ubuntu-defaults-image --locale ${UBUNTU_DEFAULTS_LOCALE} --arch ${ARCH} --release ${STE} --components main,restricted,universe"
     else
 	COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
     fi

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.43) UNRELEASED; urgency=low
+
+  * BuildLiveCD: Stop building ubuntu-defaults-image images with universe.
+    ubuntu-defaults-zh-cn is in main now, and it causes images to overflow
+    due to the extra /var/lib/apt/lists indexes.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 07 Oct 2011 18:28:12 +0200
+
 livecd-rootfs (2.42) oneiric; urgency=low
 
   * Explicitly select ubuquity frontend as well, to match the