Import patches-unapplied version 2.33 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 41bdd2542d

New changelog entries:
  * BuildLiveCD: Add the subproject (if any) and the ubuntu-defaults-image
    locale (if any) to the output directory name.

BuildLiveCD

@@ -125,7 +125,7 @@ for STE in $SUITES; do
 	DIR=~/build.live/chroot-${STE}/./build/
     fi
 
-    PUBDIR=~/public_html/LiveCD/${STE}/${FS}${SUBARCH:+-$SUBARCH}/
+    PUBDIR=~/public_html/LiveCD/${STE}/${FS}${SUBPROJECT:+-$SUBPROJECT}${SUBARCH:+-$SUBARCH}${UBUNTU_DEFAULTS_LOCALE:+-$UBUNTU_DEFAULTS_LOCALE}/
     mkdir -p ${PUBDIR}
 
     NOW=$(date +%Y%m%d)

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.33) oneiric; urgency=low
+
+  * BuildLiveCD: Add the subproject (if any) and the ubuntu-defaults-image
+    locale (if any) to the output directory name.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 24 Aug 2011 12:25:52 +0100
+
 livecd-rootfs (2.32) oneiric; urgency=low
 
   * Fix kernel package name for mx5.