Updated tools/add-bin-doc to stop warnings when generating README.html

Re-add the kernel-headers packages to match kernel images.

debian/changelog

@@ -5,8 +5,11 @@ debian-cd (2.2.23) unstable; UNRELEASED
       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
+	- Updated tools/add-bin-doc to stop warnings on this.
     - Added patch from Sven Luther to add a forth script to make
-	  ppc/pegasos easier to boot.  Closes: #311925
+ 	  ppc/pegasos easier to boot.  Closes: #311925
+    - Re-add the kernel-headers packages to match kernel images.
+	  Closes: #249386
 	
 debian-cd (2.2.22) unstable; urgency=critical
 

tasks/exclude-sarge

@@ -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/add-bin-doc

@@ -9,6 +9,14 @@ SDIR=$TDIR/$CODENAME-src
 
 DEBMAINVER="`echo $DEBVERSION | sed -e 's/[ _r].*//'`"
 
+if [ "$OMIT_RELEASE_NOTES"x = ""x ] ; then
+	OMIT_RELEASE_NOTES=0
+fi
+
+if [ "$OMIT_MANUAL"x = ""x ] ; then
+	OMIT_MANUAL=0
+fi
+
 for i in $BDIR/*.packages; do 
 	dir=${i%%.packages}
 	DISK=${dir##$BDIR/}

tools/generate_di+k_list

@@ -57,6 +57,12 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-2.6.*-386\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
   >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-2.4.*-386\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
+  >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-2.6.*-386\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-i386/Packages|/usr/bin/tail -n 1 \
+  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -77,6 +83,9 @@ else
 	/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.6.*-generic\)$/\1/p' \
 	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
 	  >> debian-installer+kernel-$DI_CODENAME
+	/bin/sed -n 's/Package: \(kernel-headers-2.6.*-generic\)$/\1/p' \
+	  $MIRROR/dists/$CODENAME/main/binary-amd64/Packages|/usr/bin/tail -n 1 \
+	  >> debian-installer+kernel-$DI_CODENAME
 fi
 	 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
@@ -90,6 +99,9 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-alpha/Packages|grep -v 2.4.21 \
   >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-.*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-alpha/Packages|grep -v 2.4.21 \
+  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -100,6 +112,9 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-2.6.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-hppa/Packages|tail -n4 \
   >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-2.6.*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-hppa/Packages|tail -n4 \
+  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -120,6 +135,18 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-2\.6-.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
   >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-2\.4\..*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \
+  >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-2\.4-.*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
+  >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-2\.6\..*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \
+  >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-2\.6-.*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
+  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -133,6 +160,9 @@ for subarch in r4k-ip22 r5k-ip22; do
 		$MIRROR/dists/$CODENAME/main/binary-mips/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
                 >> debian-installer+kernel-$DI_CODENAME
+	sed -n 's/Package: \(kernel-headers-.*-.*\)$/\1/p' \
+		$MIRROR/dists/$CODENAME/main/binary-mips/Packages | tail -n 1 \
+                >> debian-installer+kernel-$DI_CODENAME
 done
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
@@ -147,6 +177,9 @@ for subarch in r3k-kn02 r4k-kn04; do
 		$MIRROR/dists/$CODENAME/main/binary-mipsel/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
                 >> debian-installer+kernel-$DI_CODENAME
+	sed -n 's/Package: \(kernel-headers-.*-.*\)$/\1/p' \
+		$MIRROR/dists/$CODENAME/main/binary-mipsel/Packages | tail -n 1 \
+                >> debian-installer+kernel-$DI_CODENAME
 done
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
@@ -168,6 +201,10 @@ for subarch in powerpc power3 power4 power3-pmac power3-chrp-rs6k \
 		$MIRROR/dists/$CODENAME/main/binary-powerpc/Packages \
 		| grep -- "-$subarch$" | sort -n | tail -n 1 \
                 >> debian-installer+kernel-$DI_CODENAME
+	sed -n 's/Package: \(kernel-headers-.*-.*\)$/\1/p' \
+		$MIRROR/dists/$CODENAME/main/binary-powerpc/Packages \
+		| grep -- "-$subarch$" | sort -n | tail -n 1 \
+                >> debian-installer+kernel-$DI_CODENAME
 done
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
@@ -180,6 +217,9 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-.*-sparc.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
   >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-.*-sparc.*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
+  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -191,10 +231,16 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-2.2.*-mac\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
   >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-2.2.*-mac\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
+  >> debian-installer+kernel-$DI_CODENAME
 # Get the latest 2.4 kernels, except mac
 /bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 7 | \
   grep -v mac >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-2.4.*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 7 | \
+  grep -v mac >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
@@ -205,6 +251,9 @@ EOF
 /bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
   $MIRROR/dists/$CODENAME/main/binary-arm/Packages|tail -n5 \
   >> debian-installer+kernel-$DI_CODENAME
+/bin/sed -n 's/Package: \(kernel-headers-2.4.*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-arm/Packages|tail -n5 \
+  >> debian-installer+kernel-$DI_CODENAME
 
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif