From 597d603590653fd4bd7ae259f2090ddd8a68adbe Mon Sep 17 00:00:00 2001
From: Evan Dandrea <ev@ubuntu.com>
Date: Wed, 6 Jul 2011 11:59:24 +0100
Subject: [PATCH] Import patches-unapplied version 2.11 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 8a101c356321fc152c30c5c5bc08229eea1e7efa

New changelog entries:
  * Pass SUBPROJECT to live-build.
---
 BuildLiveCD      | 7 ++++---
 debian/changelog | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/BuildLiveCD b/BuildLiveCD
index 2d462fc0..fb8dd96d 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -98,7 +98,8 @@ if [ "`echo $@ | wc -w`" -gt "1" ]; then
     exit 0
 fi
 FS="$1"
-shift
+SUBPROJECT="$2"
+shift 2
 
 lockfile ~/buildLiveCD.lock || exit 1
 trap "finish" 0
@@ -138,10 +139,10 @@ for STE in $SUITES; do
     if $LIVE_BUILD; then
 	$LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && rm -rf auto && mkdir -p auto && for f in config build clean; do ln -s /usr/share/livecd-rootfs/live-build/auto/\$f auto/; done" >> ${LOG} 2>&1 || true
 	$LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && lb clean --purge" >> ${LOG} 2>&1 || true
-	if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && SUITE=${STE} PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} lb config" >> ${LOG} 2>&1; then
+	if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && SUITE=${STE} PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} lb config" >> ${LOG} 2>&1; then
 	    exit 1
 	fi
-	COMMAND="PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
+	COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
     else
 	COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
     fi
diff --git a/debian/changelog b/debian/changelog
index 9a502d2d..4ecb3581 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.11) oneiric; urgency=low
+
+  * Pass SUBPROJECT to live-build.
+
+ -- Evan Dandrea <ev@ubuntu.com>  Wed, 06 Jul 2011 11:59:24 +0100
+
 livecd-rootfs (2.10) oneiric; urgency=low
 
   * Initial Wubi support.