Package: debian-cd Tags: patch
For trixie we have some changings regarding the release-notes: They have been migrated from Docbook to reStructedText / Sphinx [1]. During this migration, it has been decided to no longer build separate versions per architecture, but only one generic variant. This leads to a changed directory structure on the website for trixie: While the release-notes had in the past (for example for bookworm): /www.d.o/releases/bookworm/amd64/release-notes/index.en.html /index.de.html /index.da.html [and many more html files for amd64] /www.d.o/releases/bookworm/i386/release-notes/index.en.html /index.de.html /index.da.html [and many more html files for i386] /www.d.o/releases/bookworm/armel/release-notes/index.en.html /index.de.html /index.da.html [and many more html files for armel] ... and so on And for trixie we have now: /www.d.o/releases/trixie/release-notes/index.en.html /index.de.html /index.da.html [and many more html files] So, the architecture part is skipped from the path. This requires changes in debian-cd/tools/trixie/installtools.sh, so that this script can find the release-notes again: The script uses a r-n tarball, which for bookworm is under https://www.debian.org/releases/bookworm/release-notes-amd64.tar.gz https://www.debian.org/releases/bookworm/release-notes-i386.tar.gz https://www.debian.org/releases/bookworm/release-notes-armel.tar.gz ... and so on. For trixie, the tarball is under https://www.debian.org/releases/trixie/release-notes.tar.gz BTW: AFAICS the release-notes are not integrated in the installation images currently, but we should keep the script working nevertheless. I have attached a patch with the required changings. This is however untested, since I'm unable to use debian-cd due to the lack of a local mirror. So, could someone do a test build, to check the script works again? Regards Holger [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=932957#245 -- Holger Wansing <hwans...@mailbox.org> PGP-Fingerprint: 496A C6E8 1442 4B34 8508 3529 59F1 87CA 156E B076
diff --git a/tools/trixie/installtools.sh b/tools/trixie/installtools.sh index 9ecdf688..40780946 100755 --- a/tools/trixie/installtools.sh +++ b/tools/trixie/installtools.sh @@ -42,33 +42,30 @@ if [ "$OMIT_MANUAL" != 1 ]; then echo "ERROR: Unable to copy installer documentation to CD." fi else echo "ERROR: installation-guide package not unpacked correctly." fi else echo "ERROR: package installation-guide-$ARCH not found." fi fi done fi if [ "$OMIT_RELEASE_NOTES"x = "1"x ]; then echo " Omitting release notes, as requested" else - for ARCH in $ARCHES - do if [ $ARCH != source ] ; then RN=$DIR/doc/release-notes mkdir -p $RN cd $RN - echo " Downloading most recent release notes for $ARCH" - $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 + echo " Downloading most recent release notes" + $WGET $RELEASE_NOTES_LOCATION/release-notes.tar.gz + if [ -e release-notes.tar.gz ] ; then + tar xzvf release-notes.tar.gz + rm -f release-notes.tar.gz rm -f */*.ps else - echo " No release notes found at $RELEASE_NOTES_LOCATION/release-notes-$ARCH.tar.gz" + echo " No release notes found at $RELEASE_NOTES_LOCATION/release-notes.tar.gz" fi fi - done fi