From b5d3edf08482656226d349cb03f5c1b99244ccaf Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Wed, 31 Aug 2011 10:02:31 +0100
Subject: [PATCH] BuildLiveCD: Add subproject and ubuntu-defaults-image locale
 to error mail subject.

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

diff --git a/BuildLiveCD b/BuildLiveCD
index ce543ccb..b9dbd4d1 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -14,7 +14,7 @@ finish() {
     fi
     if [ "$SEND_LOG" = "yes" ]; then
         exec >/dev/null 2>&1
-        mailx -s "LiveCD: $STATUS $STE:$FS${SUBARCH:+-$SUBARCH} build on ${ARCH}" buildd+porters < "$BUILD_LOG"
+        mailx -s "LiveCD: $STATUS $STE:$FS${SUBPROJECT:+-$SUBPROJECT}${SUBARCH:+-$SUBARCH}${UBUNTU_DEFAULTS_LOCALE:+-$UBUNTU_DEFAULTS_LOCALE} build on ${ARCH}" buildd+porters < "$BUILD_LOG"
     fi
     rm -f ~/buildLiveCD.lock
     nohup ~/bin/pruneLiveCD >/dev/null 2>&1 &
diff --git a/debian/changelog b/debian/changelog
index b5ee56d6..305c1344 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.36) UNRELEASED; urgency=low
+
+  * BuildLiveCD: Add subproject and ubuntu-defaults-image locale to error
+    mail subject.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 31 Aug 2011 10:02:05 +0100
+
 livecd-rootfs (2.35) oneiric; urgency=low
 
   * Set KERNEL_FLAVOURS for mx5.