* Updated pi-makelist, now excludes all of the sparc live filesystem.

* Added Recommends: debianutils because pi-makelist uses tempfile(1)
  since 2.2.3; also mentioned this in the debian-cd/YACS README.
* Some minor updates/rewordings in CD's top-level README.

README

@@ -25,6 +25,8 @@ Software :
 - the perl MD5 module
 - dpkg-dev (>= 1.4.1.6) (for dpkg-scansources)
 - lynx (for text version of README.html)
+- if you want to generate .list files: tempfile, as included in debianutils
+  >= 1.6 (not absolutely necessary, workaround described in tools/pi-makelist)
 Other :
 - lots of free space on your disks
 - a Debian mirror (on a partition where you can write, if you can't write

data/potato/README.html.in

@@ -719,7 +719,7 @@ for information on contacting us.
 	</SMALL><P>
 <SMALL>
 
-Last Modified: Sat Aug 12 10:53:29 CEST 2000
+Last Modified: Mon Nov 13 17:37:52 CET 2000
 
 <BR></SMALL>
 </DIV>

data/potato/apt-setup.html.in

@@ -17,8 +17,7 @@ then CD-ROMs, and finally FTP/HTTP mirrors.)
 <P>
 <UL>
 <LI>
-For a local archive (or a single mounted CD-ROM), that for example has
+For an archive on a local harddisk, that for example has these directories,
-  these directories,
 
 #if OUTPUTtext
 <PRE>
@@ -45,8 +44,9 @@ add:             \           \     |     \
 </PRE>
 #endif
 
-  As shown, the `<tt>dists</tt>' is added implicitly, and the 3rd,...
+  As shown, the `<tt>dists</tt>' is added implicitly, and the 3rd
-  arguments are used to expand the path into multiple directories.
+  and following arguments are used to expand the path into multiple
+  directories.
 
 <BR>&nbsp;<BR>
 
@@ -75,7 +75,7 @@ add:             \           \     |     \
 <BR>&nbsp;<BR>
 <LI>
 
-FTP or HTTP packages mirror addresses can be found on
+FTP and HTTP packages mirror addresses can be found on
 
 #if CDROMreadme
 #if OUTPUTtext
@@ -123,8 +123,9 @@ add:              \               /     |   |
 </PRE>
 #endif
 
-  As shown, the `<tt>dists</tt>' is added implicitly, and the 3rd,...
+  As shown, the `<tt>dists</tt>' is added implicitly, and the 3rd
-  arguments are used to expand the path into multiple directories.
+  and following arguments are used to expand the path into multiple
+  directories.
 
 <BR>&nbsp;<BR>
 
@@ -162,8 +163,8 @@ add:              \               /     |   |
 <BR>&nbsp;<BR>
 <LI>
 
-In case of upgrading from a set of CD-ROMs (also possible for a single,
+If you use (one or more) CD-ROMs, do _not_ add any lines to sources.list
-  unmounted CD-ROM), do _not_ add any lines to sources.list manually.
+  manually.
 
 <BR>&nbsp;<BR>
 
@@ -228,7 +229,7 @@ In case of upgrading from a set of CD-ROMs (also possible for a single,
 
 <BR>&nbsp;<BR>
 
-  to add the data of each individual CD-ROM to apt's internal database.
+  to add the data of each CD-ROM to apt's internal database.
   This command will ask for one CD-ROM per run, and mount/unmount the
   CD-ROM automatically. You should repeat this command for all 2.2 `Binary'
   CD-ROMs you have.
@@ -243,7 +244,8 @@ In case of upgrading from a set of CD-ROMs (also possible for a single,
 </UL>
 <P>
 
-The final step of the preparation is to update apt's internal database
+When the <tt>sources.list</tt> is correct,
+the final step of the preparation is to update apt's internal database
 with the command
 
 <P>

debian/changelog

@@ -1,3 +1,13 @@
+debian-cd (2.2.4) unstable; urgency=low
+
+  * UNRELEASED
+    ----------
+  * Updated pi-makelist, now excludes all of the sparc live filesystem.
+  * Added Recommends: debianutils because pi-makelist uses tempfile(1)
+    since 2.2.3; also mentioned this in the debian-cd/YACS README.
+  * Some minor updates/rewordings in CD's top-level README.
+
+
 debian-cd (2.2.3) unstable; urgency=low
 
   * Fixes several bug caused by changes in the way binary-all packages

debian/control

@@ -7,7 +7,7 @@ Standards-Version: 3.1.1
 Package: debian-cd
 Architecture: all
 Depends: perl5 | perl, libdigest-md5-perl | libmd5-perl, sysutils, apt (>= 0.3.11.1), dpkg-dev (>= 1.4.1.6), dpkg-multicd, make, mkhybrid | mkisofs, lynx
-Recommends: lha, unzip, hfsutils
+Recommends: lha, unzip, hfsutils, debianutils (>= 1.6)
 Description: Tools for building (Official) Debian CD set
  This package was formerly called YACS (for Yet Another CD
  Script).

tools/pi-makelist

@@ -61,12 +61,18 @@ isoinfo -i "$1" -R -l -f			\
 	    -e '^/dedication\.txt$'		\
 	    -e '^/README\.html$'		\
 	    -e '^/README\.txt$'			\
-	    -e '^/etc/'				\
 	    -e '^/pics/'			\
 	    -e '^/doc/package-developer/hello'	\
 	    -e '^/milo/'			\
 	    -e '^/apb/'				\
 	    -e '^/linux$'			\
+	    -e '^/bin/'				\
+	    -e '^/etc/'				\
+	    -e '^/lib/'				\
+	    -e '^/release_notes$'		\
+	    -e '^/sbin/'			\
+	    -e '^/tmp/'				\
+	    -e '^/usr/'				\
   > "$TEMPF"
 
 # Temporarily block the pipe, since we need to inspect it's contents