Import patches-unapplied version 2.31 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: d82b716b81

New changelog entries:
  * Link binary.iso or binary-hybrid.iso, if found, into the output
    directory for use by BuildLiveCD.
  * Tolerate ubuntu-defaults-image's kernel renaming.
  * Add a -u option to BuildLiveCD which calls ubuntu-defaults-image.

BuildLiveCD

@@ -33,8 +33,9 @@ SUITES=""
 PROPOSED=""
 IMAGEFORMAT=""
 LIVE_BUILD=false
+UBUNTU_DEFAULTS_LOCALE=""
 
-while getopts :s:r:d:f:pa:l name; do case $name in
+while getopts :s:r:d:f:pa:lu: name; do case $name in
     s)	SUBARCH="$OPTARG";;
     r)	SUBPROJECT="$OPTARG";;
     d)	NEWSUITE="$OPTARG";;
@@ -42,6 +43,7 @@ while getopts :s:r:d:f:pa:l name; do case $name in
     p)	PROPOSED="-p";;
     a)	APT_SOURCE="-A $OPTARG";;
     l)	LIVE_BUILD=:;;
+    u)	UBUNTU_DEFAULTS_LOCALE="$OPTARG";;
 esac; done;
 shift $((OPTIND-1))
 
@@ -112,7 +114,7 @@ for STE in $SUITES; do
     if [ -d ~/build-${STE}-live/chroot-${STE} ]; then
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true
-	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs || true
+	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs ubuntu-defaults-builder || true
     fi
 done
 for STE in $SUITES; do
@@ -145,6 +147,9 @@ for STE in $SUITES; do
 	    exit 1
 	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} --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,12 @@
+livecd-rootfs (2.31) oneiric; urgency=low
+
+  * Link binary.iso or binary-hybrid.iso, if found, into the output
+    directory for use by BuildLiveCD.
+  * Tolerate ubuntu-defaults-image's kernel renaming.
+  * Add a -u option to BuildLiveCD which calls ubuntu-defaults-image.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 23 Aug 2011 18:35:56 +0100
+
 livecd-rootfs (2.30) oneiric; urgency=low
 
   * provide .bootimg as a link to .bootimg-$FLAVOUR similar to the 

live-build/auto/build

@@ -116,6 +116,13 @@ for OUTPUT in ext2 ext3 ext4 manifest manifest-remove size squashfs; do
 	chmod 644 "$PREFIX.$OUTPUT"
 done
 
+for ISO in binary.iso binary-hybrid.iso; do
+	[ -e "$ISO" ] || continue
+	ln "$ISO" "$PREFIX.iso"
+	chmod 644 "$PREFIX.iso"
+	break
+done
+
 if [ -e "binary/$INITFS/filesystem.dir" ]; then
 	(cd "binary/$INITFS/filesystem.dir/" && tar -c *) | \
 		gzip -9 --rsyncable > "$PREFIX.rootfs.tar.gz"
@@ -141,6 +148,10 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 	fi
 	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
 	if [ -z "$KVERS" ]; then
+		if [ -e "binary/$INITFS/vmlinuz" ]; then
+			# already renamed by ubuntu-defaults-image
+			break
+		fi
 		echo "No kernel output for $FLAVOUR!" >&2
 		exit 1
 	fi
@@ -160,9 +171,17 @@ done
 NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)"
 if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 	# only one kernel flavour
+	if [ -e "binary/$INITFS/vmlinuz" ]; then
+		ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel"
+	else
 		ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel"
+	fi
+	if [ -e "binary/$INITFS/initrd.lz" ]; then
+		ln "binary/$INITFS/initrd.lz" "$PREFIX.initrd"
+	else
 		ln -sf "$PREFIX.initrd-$LB_LINUX_FLAVOURS" "$PREFIX.initrd"
 	fi
+fi
 
 if [ "$SUBARCH" = "ac100" ]; then
 	# create the md5sum file for which we are actually doing all this