From 083335c7c6cc5044d1746329cb8152aad8fb825f Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Wed, 24 Aug 2011 12:24:24 +0100
Subject: [PATCH] BuildLiveCD: Add the subproject (if any) and the
 ubuntu-defaults-image locale (if any) to the output directory name.

---
 BuildLiveCD      | 2 +-
 debian/changelog | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/BuildLiveCD b/BuildLiveCD
index 89b703b9..ce543ccb 100755
--- a/BuildLiveCD
+++ b/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)
diff --git a/debian/changelog b/debian/changelog
index a0e85ec4..3e534117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.33) UNRELEASED; 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:21:08 +0100
+
 livecd-rootfs (2.32) oneiric; urgency=low
 
   * Fix kernel package name for mx5.