From 37ab5b703bce5bf54f66f6873ab80eb4c963714f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Tue, 14 Mar 2000 21:49:00 +0000
Subject: [PATCH] * Reverted the removal of */doc dirs in disks 2-4. * Removed
 $ADIR too in target bin-distclean.

---
 Makefile                     | 1 +
 debian/changelog             | 5 +++--
 tools/boot/potato/boot-i386  | 2 --
 tools/potato/installtools.sh | 5 -----
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index ae5eeaf3..bfc8c2c6 100755
--- a/Makefile
+++ b/Makefile
@@ -125,6 +125,7 @@ realclean: distclean
 distclean: ok bin-distclean src-distclean
 bin-distclean:
 	@-rm -rf $(BDIR)
+	@-rm -rf $(ADIR)
 src-distclean:
 	@-rm -rf $(SDIR)
 
diff --git a/debian/changelog b/debian/changelog
index e3283300..a513d42f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,11 @@ debian-cd (2.2.0) frozen unstable; urgency=low
 
   * The final debian-cd for potato ! Must go to frozen ...
   * Changes to tools/potato/boot-sparc for new bootdisk
-    organization. --jwest 
+    organization. --jwest
   * Changes to /tools/boot/potato/boot-i386 for new bootdisks --jwest
+  * Added missing semi-colon in the target pi-makelist.
 
- -- Raphael Hertzog <hertzog@debian.org>  Tue,  7 Mar 2000 20:31:18 +0100
+ -- Raphael Hertzog <hertzog@debian.org>  Mon, 13 Mar 2000 13:15:11 +0100
 
 debian-cd (2.1.92) frozen unstable; urgency=low
 
diff --git a/tools/boot/potato/boot-i386 b/tools/boot/potato/boot-i386
index 87bc50fe..0464b6d1 100755
--- a/tools/boot/potato/boot-i386
+++ b/tools/boot/potato/boot-i386
@@ -24,7 +24,6 @@ cd $CDDIR/..
 # Compact image for disk 2
 if [ $N == 2 ]; then
 	:> 2.mkisofs_opts
-	rm -r $CDDIR/doc        #remove doc dir on #2,#3,#4
 	if [ -e 1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/compact/rescue.bin ] 
 	then
 	  mkdir -p boot2/boot
@@ -38,7 +37,6 @@ fi
 # Disks != 1 and not 2
 if [ $N != 1 ]; then 
 	echo -n "-J" > $N.mkisofs_opts
-        rm -r $CDDIR/doc        #remove doc dir on #2,#3,#4
 	exit 0; 
 fi
 
diff --git a/tools/potato/installtools.sh b/tools/potato/installtools.sh
index 8bc1968d..d0322b48 100755
--- a/tools/potato/installtools.sh
+++ b/tools/potato/installtools.sh
@@ -34,8 +34,3 @@ do
 	ln -s $file
 done
 
-# now make sure that the /doc directory is NOT on cd 2,3,4.etc
-       rm -r $BDIR/2/doc        #remove doc dir on cd 2 
-       rm -r $BDIR/3/doc        #remove doc dir on cd 3 
-       rm -r $BDIR/4/doc        #remove doc dir on cd 4 
-