* Make sure we install base packages from debootstrap on first CD

* Little fixes.
* Only includes latest version of a package when concurrent versions
  are available (in a local repository for example)

debian/changelog

@@ -3,6 +3,9 @@ debian-cd (2.2.5) unstable; urgency=low
   * UNRELEASED
   * Remove (obsolete) -a from mkhybrid call. Changed mkhybrid to mkisofs
     since mkhybrid has been superseded by mkisofs. Closes: #97439
+  * Only includes latest version of a package if a newer version
+    is provided in a local repository.
+  * Includes on CD1 packages needed by debootstrap. Closes: #100353
 
  -- Raphael Hertzog <hertzog@debian.org>  Sat, 19 May 2001 15:15:29 +0200
 

debian/rules

@@ -69,7 +69,6 @@ binary-indep: build install
 	dh_compress
 	dh_fixperms
 	# You may want to make some executables suid here
-	dh_suidregister
 #	dh_makeshlibs
 	dh_installdeb
 #	dh_perl 

tasks/Debian_sid

@@ -14,6 +14,7 @@
 #include <interesting-tasks-potato>
 
 /* Packages that should really be on CD1 */
+#include <base-woody>
 #include <forcd1>
 
 #include <xservers-XFree3>

tasks/Debian_woody

@@ -14,6 +14,7 @@
 #include <interesting-tasks-potato>
 
 /* Packages that should really be on CD1 */
+#include <base-woody>
 #include <forcd1>
 
 #include <xservers-XFree3>

tasks/base-woody

@@ -0,0 +1,131 @@
+
+# This file lists the packages needed by debootstrap
+#
+# Those should be on CD1 to be able to bootstrap a woody system
+# with debootstrap.
+# It's a pity but this file is not automatically generated, so it
+# needs to be manually updated from time to time with the
+# source information from /usr/lib/debootstrap/scripts/woody
+#
+# Latest update : in sync with debootstrap 0.1.11
+#
+# -- Raphael Hertzog
+
+# Required packages
+# They are already automatically included
+
+# Base packages
+adduser
+perl
+perl-modules
+apt
+apt-utils
+at
+base-config
+bsdmainutils
+console-common
+console-tools
+console-tools-libs
+console-data
+cpio
+cron
+dhcp-client
+ed
+exim
+fdutils
+gettext-base
+groff
+ifupdown
+info
+ipchains
+klogd
+libident
+libldap2
+liblockfile1
+libncurses4
+libpcre3
+libsasl7
+libwrap0
+logrotate
+mailx
+man-db
+manpages
+modconf
+nano
+net-tools
+netbase
+netkit-inetd
+netkit-ping
+nvi
+ppp
+sysklogd
+tasksel
+tcpd
+telnet
+
+# Arch specific for the base system
+
+#if (@ARCH@ = alpha)
+setserial
+aboot
+pciutils
+#endif
+
+#if (@ARCH@ = arm)
+setserial
+libgpmg1
+#endif
+
+#if (@ARCH@ = i386)
+lo
+pciutils
+setserial
+syslinux
+#endif
+
+#if (@ARCH@ = m68k)
+atari-bootstrap
+atari-fdisk
+amiga-fdisk
+eject
+mac-fdisk
+pmac-fdisk-cross
+setserial
+vmelilo
+#endif
+
+#if (@ARCH@ = powerpc)
+quik
+mac-fdisk
+amiga-fdisk
+psmisc
+powerpc-utils
+setserial
+pciutils
+hfsutils
+yaboot
+#endif
+
+#if (@ARCH@ = sparc)
+silo
+eject
+pciutils
+sparc-utils
+#endif
+
+#if (@ARCH@ = mips)
+dvhtool
+pciutils
+setserial
+#endif
+
+#if (@ARCH@ = mipsel)
+delo
+pciutils
+setserial
+#endif
+
+#if (@ARCH@ = hppa)
+palo
+#endif
+

tasks/forcd1

@@ -24,3 +24,7 @@ twm
 menu
 wmaker
 wmakerconf
+libterm-stool-perl
+libterm-readline-gnu-perl
+whiptail
+dialog

tools/apt-selection

@@ -25,6 +25,7 @@ options=" -o Dir::State::status=$APTTMP/$CODENAME-$ARCH/status \
           -o Dir::State=$APTTMP/$CODENAME-$ARCH/apt-state/ \
 	  -o Dir::Cache=$APTTMP/$CODENAME-$ARCH/apt-cache/ \
 	  -o Dir::Etc=$APTTMP/$CODENAME-$ARCH/apt/ \
+	  -o APT::Cache::AllVersions=0 \
 	  -o APT::Architecture=$ARCH "
 
 if [ -n "$NONFREE" -o -n "$EXTRANONFREE" ]; then

tools/woody/installtools.sh

@@ -22,12 +22,12 @@ fi
 
 # Put the install documentation in /install
 cd $MIRROR/dists/$CODENAME1/main/disks-$ARCH/current/$DOCDIR
-mkdir $DIR/install/$DOCDIR
+mkdir -p $DIR/install/$DOCDIR
 cp -a * $DIR/install/$DOCDIR/
 ln -sf install.en.html $DIR/install/$DOCDIR/index.html
 
 # Put the boot-disk documentation in /doc too
-mkdir $DIR/doc/install
+mkdir -p $DIR/doc/install
 cd $DIR/doc/install
 for file in ../../install/$DOCDIR/*.{html,txt}
 do