From 73945a9e42411ef2452ec2bb7b35a7f9927c8b80 Mon Sep 17 00:00:00 2001 From: Anne Bezemer Date: Mon, 13 Nov 2000 16:48:14 +0000 Subject: [PATCH] * 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 | 2 ++ data/potato/README.html.in | 2 +- data/potato/apt-setup.html.in | 24 +++++++++++++----------- debian/changelog | 10 ++++++++++ debian/control | 2 +- tools/pi-makelist | 8 +++++++- 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/README b/README index 522beb39..878ecaa4 100644 --- a/README +++ b/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 diff --git a/data/potato/README.html.in b/data/potato/README.html.in index bf20a31f..8952b782 100644 --- a/data/potato/README.html.in +++ b/data/potato/README.html.in @@ -719,7 +719,7 @@ for information on contacting us.

-Last Modified: Sat Aug 12 10:53:29 CEST 2000 +Last Modified: Mon Nov 13 17:37:52 CET 2000
diff --git a/data/potato/apt-setup.html.in b/data/potato/apt-setup.html.in index e84b3354..9e4f5934 100644 --- a/data/potato/apt-setup.html.in +++ b/data/potato/apt-setup.html.in @@ -17,8 +17,7 @@ then CD-ROMs, and finally FTP/HTTP mirrors.)

-The final step of the preparation is to update apt's internal database +When the sources.list is correct, +the final step of the preparation is to update apt's internal database with the command

diff --git a/debian/changelog b/debian/changelog index 4656ced9..967ea2e1 100644 --- a/debian/changelog +++ b/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 diff --git a/debian/control b/debian/control index 7c7092b6..d9b0a85a 100644 --- a/debian/control +++ b/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). diff --git a/tools/pi-makelist b/tools/pi-makelist index ad9f70b5..e850d883 100755 --- a/tools/pi-makelist +++ b/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