From 220413d16be260b7a09ecde1e967078bee4382c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Tue, 18 Dec 2001 22:51:14 +0000
Subject: [PATCH] * Removed bashism. * Updated documentation. * Improved
 debian/rules to clean some CVS files.

---
 README                      |  7 +++----
 debian/changelog            |  4 ++++
 debian/rules                |  1 +
 tools/boot/potato/boot-i386 | 14 +++++++-------
 tools/boot/woody/boot-i386  |  4 ++--
 tools/pi-makelist           |  2 +-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/README b/README
index be6bff68..01700c21 100644
--- a/README
+++ b/README
@@ -101,7 +101,7 @@ The process of building a CD is decomposed as follow :
   or
   $ make list TASK=tasks/gnome COMPLETE=0 SIZELIMIT=576716800
   or
-  $ export NONFREE=1; make list TASK=tasks/kde COMPLETE=1
+  $ export NONFREE=1; make list TASK=tasks/your-task-here COMPLETE=1
   or for something like an official image for the USA (without non-US &
   non-free) :
   $ make list COMPLETE=1 SIZELIMIT1=576716800
@@ -109,9 +109,8 @@ The process of building a CD is decomposed as follow :
   
   You can change the behaviour of this command with the following
   variables :
-  - if NONUS is set, then packages from non-US will be allowed (remember
-    that the value of NONUS must be the path to the non-US mirror
-    if you have one)
+  - if NONUS is set, then packages from non-US will be allowed (the value
+    of NONUS must be the path to the non-US mirror if you have one)
   - if FORCENONUSONCD1 is set also, then packages will be
     rearranged so that non-US packages are all on CD#1. This
     includes the non-free ones if you specify NONFREE. Then 2 separate
diff --git a/debian/changelog b/debian/changelog
index 57366952..a2111155 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 debian-cd (2.2.11) unstable; urgency=low
 
   * UNRELEASED.
+  * Changed "==" test by "=" test that works with ash also. Closes: #125727
+  * Corrected the rules files to remove the .#* files of CVS merges.
+    Closes: #125728
+  * Corrected the documentation. Closes: #125729
 
  -- Raphael Hertzog <hertzog@debian.org>  Sun, 16 Dec 2001 04:34:03 +0100
 
diff --git a/debian/rules b/debian/rules
index 1e9e485f..3b4fdaeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ install-stamp: build-stamp
 	ln -sf /etc/debian-cd/conf.sh \
                debian/debian-cd/usr/share/debian-cd/CONF.sh
 	find debian/debian-cd -name 'CVS' | xargs -r rm -rf
+	find debian/debian-cd -name '.#*' | xargs -r rm -f
 	find debian/debian-cd/usr/share/debian-cd/tools/boot \
 	  \( -name 'boot-*' -o -name 'post-boot-*' \) -a \! -name '*.txt' \
 	  -a \! -name '*.calc' |  xargs chmod 0755
diff --git a/tools/boot/potato/boot-i386 b/tools/boot/potato/boot-i386
index 0b5715c2..97b1347c 100755
--- a/tools/boot/potato/boot-i386
+++ b/tools/boot/potato/boot-i386
@@ -29,12 +29,12 @@ cd $CDDIR/..
 
 # Strip stupid NONUS sutff
 #
-if [ $N == "1_NONUS" ] || [ $N == "1" ] ; then NN=1 ; fi
-if [ $N == "2_NONUS" ] || [ $N == "2" ] ; then NN=2 ; fi
-if [ $N == "3_NONUS" ] || [ $N == "3" ] ; then NN=3 ; fi
-if [ $N == "4_NONUS" ] || [ $N == "4" ] ; then NN=4 ; fi
-if [ $N == "5_NONUS" ] || [ $N == "5" ] ; then NN=5 ; fi
-if [ $N == "6_NONUS" ] || [ $N == "6" ] ; then NN=6 ; fi
+if [ $N = "1_NONUS" ] || [ $N = "1" ] ; then NN=1 ; fi
+if [ $N = "2_NONUS" ] || [ $N = "2" ] ; then NN=2 ; fi
+if [ $N = "3_NONUS" ] || [ $N = "3" ] ; then NN=3 ; fi
+if [ $N = "4_NONUS" ] || [ $N = "4" ] ; then NN=4 ; fi
+if [ $N = "5_NONUS" ] || [ $N = "5" ] ; then NN=5 ; fi
+if [ $N = "6_NONUS" ] || [ $N = "6" ] ; then NN=6 ; fi
 # NN is now 1...N so it can be used as an index
 
 # what kernel-type to put on what disk?
@@ -61,7 +61,7 @@ echo -n "-J -b boot/rescue.bin -c boot/boot.catalog boot$N"  > $N.mkisofs_opts
 
 # Only disk one gets the extra files installed
 #
-if [ $N == "1" ] || [ $N == "1_NONUS" ] ; then
+if [ $N = "1" ] || [ $N = "1_NONUS" ] ; then
 
 # populate the install directory as well
 (cd $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/ ; \
diff --git a/tools/boot/woody/boot-i386 b/tools/boot/woody/boot-i386
index a00836fd..99e0bb17 100755
--- a/tools/boot/woody/boot-i386
+++ b/tools/boot/woody/boot-i386
@@ -61,7 +61,7 @@ echo -n "-J -b boot/rescue.bin "  > $N.mkisofs_opts
 
 # Only disk one gets the extra files installed
 #
-if [ $N == "1" ] || [ $N == "1_NONUS" ] ; then
+if [ $N = "1" ] || [ $N = "1_NONUS" ] ; then
 
 
 
@@ -72,7 +72,7 @@ if [ $N == "1" ] || [ $N == "1_NONUS" ] ; then
 # Setup all boot-disk images (currently 5)
 
 
-if [ $MULTIBOOT == "yes" ] ; then
+if [ $MULTIBOOT = "yes" ] ; then
         echo "Adding additional boot images to CD1"
 
     for i in 2 3 4 5 ; do
diff --git a/tools/pi-makelist b/tools/pi-makelist
index e850d883..8773ba66 100755
--- a/tools/pi-makelist
+++ b/tools/pi-makelist
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-if [ "$1" == "" ] ; then
+if [ "$1" = "" ] ; then
   echo ""
   echo 'Usage: pi-makelist cdimage.iso > cdimage.list'
   echo ""