From f48c4f3d27088342e85ffcb453c735052fdb6f9c Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Mon, 17 Nov 2008 23:34:32 +0000
Subject: [PATCH] Stop copying the /tools/ directory on from the mirror; it's
 going away

---
 data/etch/README.html.in  | 11 -----------
 data/lenny/README.html.in |  6 ------
 debian/changelog          |  4 ++++
 tools/start_new_disc      | 10 ++--------
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/data/etch/README.html.in b/data/etch/README.html.in
index 3f9493b2..21a0c57f 100644
--- a/data/etch/README.html.in
+++ b/data/etch/README.html.in
@@ -383,17 +383,6 @@ Installing
  <A href="http://www.debian.org/releases/etch/installmanual">the Debian web site</a>.
 #endif
  <P>
- Programs and other files that are needed for the installation can be found on
- this disc under
- <P>
- <tt>&nbsp;
- <A href=%%""tools/%%"">/tools/</a>
- </tt>
-#if ARCHi386
- and
- <tt>&nbsp;
- <A href=%%""install/floppy/%%"">/install/floppy/</a>
- </tt>
 #endif
 
 #if ARCHi386 || ARCHamd64 || ARCHia64 || ARCHalpha || ARCHpowerpc || ARCHsparc
diff --git a/data/lenny/README.html.in b/data/lenny/README.html.in
index 14bd2448..e35968b6 100644
--- a/data/lenny/README.html.in
+++ b/data/lenny/README.html.in
@@ -240,12 +240,6 @@
     updated versions for the Installation Guide are available from
     <a href="http://www.debian.org/releases/lenny/installmanual">the Debian web site</a>.
     </p>
-# endif
-    <p>Programs and other files that are needed for the installation can be
-    found on this disc under
-    <tt><a href=%%""tools/%%"">/tools/</a></tt>
-# if ARCHi386
-    and <tt><a href=%%""install/floppy/%%"">/install/floppy/</a></tt>
 # endif
     </p>
 
diff --git a/debian/changelog b/debian/changelog
index 71d5cb01..e94f7dc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,10 @@ debian-cd (3.1.0) UNRELEASED; urgency=low
     isolinux config gets modified correctly independent of the order in which
     the arches are specified.
 
+  [ Steve McIntyre ]
+  * Stop copying the /tools/ directory on from the mirror; it's going
+    away.
+
  -- Frans Pop <fjp@debian.org>  Thu, 13 Nov 2008 22:17:21 +0100
 
 debian-cd (3.0.5) unstable; urgency=low
diff --git a/tools/start_new_disc b/tools/start_new_disc
index 3c001f82..23dfcb6d 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -110,19 +110,13 @@ fi
 
 if [ $DISKNUM = 1 ] ; then
 	if [ "$OMIT_DOC_TOOLS" != "1" ]; then
-		if [ ! -e $MIRROR/tools ] || [ ! -e $MIRROR/doc ]; then
-			echo "You need a Debian mirror with the doc, tools and"
+		if [ ! -e $MIRROR/doc ]; then
+			echo "You need a Debian mirror with the doc and"
 			echo "indices directories ! "
 			exit 1
 		fi
 	fi
 		
-	# Add install stuff
-	if [ "$SOURCEONLY"x != "yes"x ] && [ "$OMIT_DOC_TOOLS" != "1" ]; then
-		echo "  Adding tools to CD1"
-		$BASEDIR/tools/add_files $CDDIR $MIRROR tools
-	fi
-
 	echo "  Adding .disk/base_components"
 	echo "main" > $CDDIR/.disk/base_components
 	if [ -n "$LOCAL" ] ; then