From b84c867ffbc8f0a8f12e1f294039110d3b1397e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Mon, 19 Jun 2000 22:25:24 +0000
Subject: [PATCH] * Fixed tools/potato/upgrade.sh for s/1/CD1/ change and
 include the upgrade   stuff on all CD1* ... * Added some explication in
 README.

---
 README                  | 4 ++++
 tools/potato/upgrade.sh | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 9a06bcac..dac40eb3 100644
--- a/README
+++ b/README
@@ -42,6 +42,7 @@ For people that do not have time, here's the quick explanation :
 Edit the CONF.sh and change the PATHs for the mirror and so on.
 $ vim CONF.sh
 $ . CONF.sh
+$ make distclean
 $ make status
 $ make list COMPLETE=1 SIZELIMIT1=555000000 SRCSIZELIMIT=665000000
 $ make official_images
@@ -73,6 +74,9 @@ The process of building a CD is decomposed as follow :
   tree. If you can't do this, you'll have to use the symlink farm.
   The symlink farm is explained at the end of this README.
 
+- let's clean everything that may still be there from previous runs :
+  $ make distclean
+
 - now we'll check if your mirror is ok (with good Packages files) :
   $ make mirrorcheck
 
diff --git a/tools/potato/upgrade.sh b/tools/potato/upgrade.sh
index 160d8708..63d6668c 100755
--- a/tools/potato/upgrade.sh
+++ b/tools/potato/upgrade.sh
@@ -9,8 +9,11 @@ for arch in i386 alpha sparc m68k
 do
   if [ "$ARCH" = "$arch" -a -d "$MIRROR/dists/$CODENAME/main/upgrade-$ARCH" ];
   then
-    cp -a $MIRROR/dists/$CODENAME/main/upgrade-$ARCH $TDIR/$CODENAME-$ARCH/1/
-    mv $TDIR/$CODENAME-$ARCH/1/upgrade-$ARCH $TDIR/$CODENAME-$ARCH/1/upgrade
+    for dir in $TDIR/$CODENAME-$ARCH/CD1*
+    do
+      cp -a $MIRROR/dists/$CODENAME/main/upgrade-$ARCH $dir/
+      mv $dir/upgrade-$ARCH $dir/upgrade
+    done
   fi
 done