Import patches-unapplied version 2.37 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 3bad58702f

New changelog entries:
  * BuildLiveCD: Fix typo that broke installing ubuntu-defaults-builder and
    its recommendations.
  * Squash errors from 'ls vmlinu?-*'.

BuildLiveCD

@@ -115,7 +115,7 @@ for STE in $SUITES; do
 	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-recommends ubuntu-defaults-builder || true
+	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y --install-recommends install ubuntu-defaults-builder || true
     fi
 done
 for STE in $SUITES; do

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.37) oneiric; urgency=low
+
+  * BuildLiveCD: Fix typo that broke installing ubuntu-defaults-builder and
+    its recommendations.
+  * Squash errors from 'ls vmlinu?-*'.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 14 Sep 2011 12:15:02 +0100
+
 livecd-rootfs (2.36) oneiric; urgency=low
 
   [ Colin Watson ]

live-build/auto/build

@@ -146,7 +146,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 	if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
 		continue
 	fi
-	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
+	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
 	if [ -z "$KVERS" ]; then
 		if [ -e "binary/$INITFS/vmlinuz" ]; then
 			# already renamed by ubuntu-defaults-image