Multiple changes before final release:

* Add release notes to CD#1 on full CD/DVD sets, and link them from
    README.html
  * Tweak the generated Release files to be "stable" rather than
    "testing"
  * Added Sven's patch: a pegasos forth boot script

CONF.sh

@@ -43,7 +43,8 @@ unset INSTALLER_CD      || true
 unset DI_CODENAME       || true
 unset MAXCDS            || true
 unset SPLASHPNG         || true
-unset OMIT_MANUAL	|| true
+unset OMIT_MANUAL	    || true
+unset OMIT_RELEASE_NOTES || true
 
 # The debian-cd dir
 # Where I am (hoping I'm in the debian-cd dir)
@@ -288,3 +289,10 @@ export PUBLISH_PATH="/home/jigdo-area/"
 # Set to 1 to save space by omitting the installation manual. 
 # If so the README will link to the manual on the web site.
 #export OMIT_MANUAL=1
+
+# Set to 1 to save space by omitting the release notes
+# If so we will link to them on the web site.
+export OMIT_RELEASE_NOTES=0
+
+# Set this to override the defaul location
+#export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/$CODENAME"

data/sarge/README.html.in

@@ -305,6 +305,23 @@ The programs on the Binary CDs are ordered by popularity. The Binary-1 CD
 contains the most popular programs and the installation tools; it is possible
 to install and run Debian with only the Binary-1 CD. The other CDs, up to
 Binary-TOTALNUM, contain mostly special-interest programs.
+<p>
+#if OMIT_RELEASE_NOTES
+The Release Notes for "sarge" are available on the <A
+href="http://www.debian.org/releases/sarge/releasenotes">Debian web
+site</A>.
+#else
+#if DISKNUM == 1
+The Release Notes for Debian GNU/Linux "sarge" are included on this CD
+in <A href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in
+several languages. Additional translations and updated versions for
+the Release Notes may be available from the <A
+href="http://www.debian.org/releases/sarge/releasenotes">Debian web
+site</A>.
+#else
+See the first CD in this set for the "sarge" Release Notes.
+#endif
+#endif
 #endif
 #if TYPEsource
 the source code of programs in the Debian OS.

debian/changelog

@@ -1,3 +1,13 @@
+debian-cd (2.2.23) unstable; UNRELEASED
+
+  * Steve McIntyre
+    - Added sed hack to make sarge appear as "stable" in the Release
+      files we generate on the CDs.
+    - Download the release notes and try to fit them onto
+      CD#1. Updated sarge's README.html.in to point to them
+    - Added patch from Sven Luther to add a forth script to make
+	  ppc/pegasos easier to boot.  Closes: #311925
+	
 debian-cd (2.2.22) unstable; urgency=critical
 
   * Steve McIntyre

tools/add-bin-doc

@@ -26,6 +26,7 @@ for i in $BDIR/*.packages; do
 
 	cpp -traditional -undef -P -C -Wall -nostdinc -I$dir \
 	    -D OMIT_MANUAL="$OMIT_MANUAL" \
+	    -D OMIT_RELEASE_NOTES="$OMIT_RELEASE_NOTES" \
 	    -D OUTPUTtext $BASEDIR/data/$CODENAME/README.html.in \
 		| sed -e 's/%%.//g' > $dir/README.html
 
@@ -34,6 +35,7 @@ for i in $BDIR/*.packages; do
 
 	cpp -traditional -undef -P -C -Wall -nostdinc -I $dir/ \
 	    -D OMIT_MANUAL="$OMIT_MANUAL" \
+	    -D OMIT_RELEASE_NOTES="$OMIT_RELEASE_NOTES" \
 	    -D OUTPUThtml $BASEDIR/data/$CODENAME/README.html.in \
 		| sed -e 's/%%.//g' > $dir/README.html
 

tools/boot/sarge/boot-powerpc

@@ -124,4 +124,13 @@ do
   fi
 done
 
+#
+# Copy pegasos forth script, since pegasos machines don't support yaboot yet.
+BUILD_DATE=$(date +%Y%m%d)
+cat $BASEDIR/data/sarge/pegasos/pegasos \
+ | sed "s/\${MEDIA_TYPE}/CDROM/" \
+ | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
+ | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
+ > pegasos
+
 exit 0

tools/sarge/installtools.sh

@@ -3,6 +3,10 @@
 
 set -e
 
+if [ "$RELEASE_NOTES_LOCATION"x = ""x ] ; then
+	export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/sarge"
+fi
+
 # The location of the tree for CD#1, passed in
 DIR=$1
 
@@ -27,3 +31,18 @@ if [ "$OMIT_MANUAL" != 1 ]; then
 	    echo "ERROR: Unable to copy installer documentation to CD."
 	fi
 fi
+
+if [ "$OMIT_RELEASE_NOTES" != 1 ]; then
+    RN=$DIR/doc/release-notes
+    mkdir -p $RN
+    cd $RN
+    echo "Downloading most recent release notes for sarge"
+    wget $RELEASE_NOTES_LOCATION/release-notes-$ARCH.tar.gz
+    if [ -e release-notes-$ARCH.tar.gz ] ; then
+        tar xzvf release-notes-$ARCH.tar.gz
+        rm -f release-notes-$ARCH.tar.gz
+        rm -f */*.ps
+    else
+        echo "No release notes found at $RELEASE_NOTES_LOCATION/release-notes-$ARCH.tar.gz"
+    fi
+fi

tools/scanpackages

@@ -45,6 +45,8 @@ if [ -e "$MIRROR/dists/$CODENAME/Release" ]; then
     # Update some other information as well
     sed -e "s/^Architectures: .*$/Architectures: $ARCH/" \
     $MIRROR/dists/$CODENAME/Release | \
+    sed -e "s/^Suite: .*$/Suite: stable/" | \
+    sed -e "s/^Description: .*$/Description: Debian $DEBVERSION/" | \
     sed -e "s|^Components: .*$|Components: $SECTIONS|" | \
     perl -ne 'if (/^(MD5Sum|SHA1):/i) { $f=1; next } 
     if ($f) {