Support including packages from proposed-updates

This can be useful for pre-release testing of point releases, but should
be used with care when CDs are intended to be published.

CONF.sh

@@ -19,6 +19,7 @@ unset EXTRANONFREE      || true
 unset LOCAL             || true
 unset LOCALDEBS         || true
 unset SECURITY          || true
+unset PROPOSED_UPDATES  || true
 unset BOOTDIR           || true
 unset SYMLINK           || true
 unset COPYLINK          || true
@@ -135,6 +136,12 @@ export CONTRIB=1
 # top directory of a security.debian.org mirror.
 #export SECURITY="$TOPDIR"/debian/debian-security
 
+# Include proposed updates
+# Note that on the CDs it will not be visible where packages came from:
+# from the released archive or from proposed updates archive.
+# NOTE: intended to be used for pre-release testing, not for publication!
+#export PROPOSED_UPDATES=$CODENAME-proposed-updates
+
 # Sparc only : bootdir (location of cd.b and second.b)
 # export BOOTDIR=/boot
 

debian/changelog

@@ -64,7 +64,12 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
     packages from stable but D-I/udebs from testing): don't include source
     for udebs in images.
 
- -- Frans Pop <fjp@debian.org>  Sun, 13 Jul 2008 13:29:49 +0200
+  [ Frans Pop ]
+  * Support including packages from proposed-updates.
+    This can be useful for pre-release testing of point releases, but should
+    be used with care when CDs are intended to be published.
+
+ -- Frans Pop <fjp@debian.org>  Sun, 13 Jul 2008 13:42:02 +0200
 
 debian-cd (3.0.4) unstable; urgency=low
 

tools/apt-selection

@@ -61,6 +61,11 @@ if [ ! -e "$APTTMP/$CODENAME-$ARCH/apt/sources.list" ]; then
 	echo "$ADEB file:$MIRROR $CODENAME $sections" \
 	> $APTTMP/$CODENAME-$ARCH/apt/sources.list
 
+	if [ -n "$PROPOSED_UPDATES" ]; then
+		echo "$ADEB file:$MIRROR $PROPOSED_UPDATES $sections" \
+			>> $APTTMP/$CODENAME-$ARCH/apt/sources.list
+	fi
+
 	# Local packages ...
 	if [ -n "$LOCAL" ]; then
 		echo "$ADEB file:${LOCALDEBS:-$MIRROR} $CODENAME local" \