- Synced up all sarge changes to etch.

data/etch/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 "etch" are available on the <A
+href="http://www.debian.org/releases/etch/releasenotes">Debian web
+site</A>.
+#else
+#if DISKNUM == 1
+The Release Notes for Debian GNU/Linux "etch" 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/etch/releasenotes">Debian web
+site</A>.
+else
+See the first CD in this set for the "etch" Release Notes.
+#endif
+#endif
 #endif
 #if TYPEsource
 the source code of programs in the Debian OS.

debian/changelog

@@ -16,6 +16,8 @@ debian-cd (2.2.23) unstable; UNRELEASED
     - Added tools/dedicated_source: simple script used to add extra
       source packages onto _binary_ CDs. Used for the amd64 sarge release
       so far.
+  * Joey Hess
+    - Synced up all sarge changes to etch.
 	
 debian-cd (2.2.22) unstable; urgency=critical
 

tasks/debian-installer+kernel-etch

@@ -7,7 +7,7 @@
  *
  * DO NOT EDIT THIS FILE, edit the above script
  *
- * Last update: Sun Feb 20 16:43:53 MST 2005
+ * Last update: Fri May 27 23:28:27 CEST 2005
  */
 
 #include <debian-installer-etch>
@@ -43,7 +43,11 @@ kernel-pcmcia-modules-2.4.27-2-386
 kernel-image-2.6.8-2-386
 #endif
 #ifdef ARCH_amd64
-kernel-image-2.6.8-9-amd64-generic
+discover
+discover1
+grub
+lilo
+kernel-image-2.6.8-11-amd64-generic
 #endif
 #ifdef ARCH_alpha
 aboot
@@ -106,14 +110,6 @@ initrd-tools
 kernel-image-2.6.8-powerpc
 kernel-image-2.6.8-power3
 kernel-image-2.6.8-power4
-kernel-image-2.4.27-power3-pmac
-kernel-image-2.4.27-power3-chrp-rs6k
-kernel-image-2.4.27-power4-pmac
-kernel-image-2.4.27-power4-chrp-rs6k
-kernel-image-2.4.27-powerpc-pmac
-kernel-image-2.4.27-powerpc-prep
-kernel-image-2.4.27-powerpc-chrp
-kernel-image-2.4.27-powerpc-chrp-rs6k
 kernel-image-2.4.27-apus
 #endif
 #ifdef ARCH_sparc
@@ -123,10 +119,10 @@ kernel-image-2.4-sparc32
 kernel-image-2.4-sparc32-smp
 kernel-image-2.4-sparc64
 kernel-image-2.4-sparc64-smp
-kernel-image-2.4.27-1-sparc32
+kernel-image-2.4.27-2-sparc32
-kernel-image-2.4.27-1-sparc32-smp
+kernel-image-2.4.27-2-sparc32-smp
-kernel-image-2.4.27-1-sparc64
+kernel-image-2.4.27-2-sparc64
-kernel-image-2.4.27-1-sparc64-smp
+kernel-image-2.4.27-2-sparc64-smp
 kernel-image-2.6-sparc32
 kernel-image-2.6-sparc64
 kernel-image-2.6-sparc64-smp

tasks/exclude-etch

@@ -206,26 +206,6 @@ kernel-pcmcia-modules-2.4.28-1-586tsc
 kernel-pcmcia-modules-2.4.28-1-k6
 kernel-pcmcia-modules-2.4.28-1-k7
 kernel-pcmcia-modules-2.4.28-1-k7-smp
-kernel-headers-2.4.27-1-k7
-kernel-headers-2.4.27-1-k6
-kernel-headers-2.4.27-1-586tsc
-kernel-headers-2.4.27-1-k7-smp
-kernel-headers-2.4.27-2-686-smp
-kernel-headers-2.4.27-2-k6
-kernel-headers-2.4.27-2-686
-kernel-headers-2.4.27-2
-kernel-headers-2.4.27-2-586tsc
-kernel-headers-2.4.27-2-k7
-kernel-headers-2.4.27-2-k7-smp
-kernel-headers-2.4.27-2-386
-kernel-headers-2.4-686
-kernel-headers-2.4-k7
-kernel-headers-2.4-k6
-kernel-headers-2.4-586tsc
-kernel-headers-2.4-386
-kernel-headers-2.4.27-2-686-smp
-kernel-headers-2.4-k7-smp
-kernel-headers-2.4-686-smp
 python2.1
 smail
 tcl8.0

tools/boot/etch/boot-powerpc

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

tools/etch/installtools.sh

@@ -3,6 +3,10 @@
 
 set -e
 
+if [ "$RELEASE_NOTES_LOCATION"x = ""x ] ; then
+	export RELEASE_NOTES_LOCATION="http://www.debian.org/releases/etch"
+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"
+	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