Import patches-unapplied version 2.68 to ubuntu/quantal

Imported using git-ubuntu import.

Changelog parent: b714cffe3d

New changelog entries:
  * live-build/auto/config: Emit sources.list entries for -proposed if the
    environment variable PROPOSED is set (LP: #1019514).
  * BuildLiveCD: If the -p option was used, pass PROPOSED=1 to 'lb config'.

BuildLiveCD

@@ -145,7 +145,7 @@ 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} SUBPROJECT=${SUBPROJECT} 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} PROPOSED=${PROPOSED:+1} lb config" >> ${LOG} 2>&1; then
 	    exit 1
 	fi
 	COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.68) quantal; urgency=low
+
+  * live-build/auto/config: Emit sources.list entries for -proposed if the
+    environment variable PROPOSED is set (LP: #1019514).
+  * BuildLiveCD: If the -p option was used, pass PROPOSED=1 to 'lb config'.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 30 Jun 2012 07:13:50 +0100
+
 livecd-rootfs (2.67) quantal; urgency=low
 
   * Switch i386 ubuntustudio to linux-lowlatency flavor (LP: #1018075)

live-build/auto/config

@@ -296,6 +296,16 @@ case $SUBPROJECT in
 		;;
 esac
 
+if [ "$PROPOSED" ]; then
+	. config/bootstrap
+
+	cat > config/archives/proposed.chroot.list << EOF
+deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed $LB_PARENT_ARCHIVE_AREAS
+EOF
+	cp -a config/archives/proposed.chroot.list \
+	      config/archives/proposed.binary.list
+fi
+
 case $PROJECT in
 	*-dvd)
 		. config/bootstrap
@@ -305,6 +315,11 @@ deb $LB_PARENT_MIRROR_BINARY $SUITE universe multiverse
 deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse
 deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-updates universe multiverse
 EOF
+		if [ "$PROPOSED" ]; then
+			cat >> config/archives/dvd.binary.list << EOF
+deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed universe multiverse
+EOF
+		fi
 		;;
 esac