From 3524c3f117d53dfc017702781e13b516a625479d Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Sat, 30 Jun 2012 07:22:15 +0100
Subject: [PATCH] live-build/auto/config: Emit sources.list entries for
 -proposed if the environment variable PROPOSED is set (LP: #1019514).

---
 debian/changelog       |  7 +++++++
 live-build/auto/config | 15 +++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5bfb3ea5..95679563 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.65.1) UNRELEASED; urgency=low
+
+  * live-build/auto/config: Emit sources.list entries for -proposed if the
+    environment variable PROPOSED is set (LP: #1019514).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 30 Jun 2012 07:10:04 +0100
+
 livecd-rootfs (2.65) precise; urgency=low
 
   * Add (extra-)override parsing to the preinstalled pool to make sure
diff --git a/live-build/auto/config b/live-build/auto/config
index 32bbc1a4..690b7ae8 100755
--- a/live-build/auto/config
+++ b/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