* Does now include the boot-floppies documentation again.

* Removed some cruft (master file for potato and master.i386)

Makefile

@@ -42,6 +42,9 @@ endif
 ifndef HOOK
 HOOK=$(BASEDIR)/tools/$(CODENAME).hook
 endif
+ifndef BOOTDISKS
+BOOTDISKS=$(MIRROR)/dists/$(CODENAME)/main/disks-$(ARCH)
+endif
 
 ## Internal variables  
 apt=$(BASEDIR)/tools/apt-selection
@@ -141,7 +144,7 @@ $(BDIR)/status:
 	# Checking the consistence of the standard system
 	# If this does fail, then launch make correctstatus
 	#
-	@$(apt) check
+	@$(apt) check || $(MAKE) correctstatus
 
 # Only useful if the standard system is broken
 # It tries to build a better status file with apt-get -f install
@@ -359,12 +362,9 @@ $(BDIR)/1/tools:
 	@echo "Adding install tools and documentation ..."
 	@$(addfiles) $(BDIR)/1 $(MIRROR) tools
 	@mkdir $(BDIR)/1/install
-	@cd \
-	 $(BDIR)/1/dists/$(CODENAME)/main/disks-$(ARCH)/current; \
-	 cp *.html *.txt $(BDIR)/1/install/
-	@ln -sf install.html $(BDIR)/1/install/index.html
-	@cd $(BDIR)/1/doc; \
-	 for file in ../install/*.{html,txt}; do ln -s $$file; done
+	@if [ -x "$(BASEDIR)/tools/$(CODENAME)/installtools.sh" ]; then \
+		$(BASEDIR)/tools/$(CODENAME)/installtools.sh; \
+	 fi
 
 # Add the disks-arch directories where needed
 disks: ok bin-infos $(BDIR)/1/dists/$(CODENAME)/main/disks-$(ARCH)
@@ -374,7 +374,7 @@ $(BDIR)/1/dists/$(CODENAME)/main/disks-$(ARCH):
 	    $(BDIR)/1/dists/$(CODENAME)/main/disks-$(ARCH)
 	@$(addfiles) \
 	  $(BDIR)/1/dists/$(CODENAME)/main/disks-$(ARCH) \
-	  $(MIRROR)/dists/$(CODENAME)/main/disks-$(ARCH) .
+	  $(BOOTDISKS) .
 	@#Keep only one copy of the disks stuff
 	@cd $(BDIR)/1/dists/$(CODENAME)/main/disks-$(ARCH); \
 	if [ "$(SYMLINK)" != "" ]; then exit 0; fi; \

README

@@ -36,7 +36,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 potato_status
+$ make status
 $ make list COMPLETE=1 SIZELIMIT1=576716800
 $ make official_images
 [ or if you want only binary images :
@@ -47,7 +47,7 @@ But you really should consider reading further for more information.
 How to build a CD set - step by step
 ====================================
 
-If not yet done, first decompact the archive and cd to the "yacs" directory.
+If not yet done, cd to the /usr/share/debian-cd/ directory.
 
 The process of building a CD is decomposed as follow :
 
@@ -67,16 +67,11 @@ The process of building a CD is decomposed as follow :
 - then you will have to launch this for initializing the
   temporary directory used for the build :
   $ make status
-  If this has failed then you'll have to launch :
+  If this has failed then this will be automatically launched :
   $ make correctstatus
   However note that make status should never fail if it is
   used for building a CD set for the stable release ...
 
-  NOTE: Actually (11/7/99) potato is in a bad state, I advise you
-  to use the potato.status file in the data dir as your status file,
-  to do so you can launch : 
-  $ make potato_status
-
 - now you can decide what you want on your CDs
   $ make list TASK=tasks/debian-2.2 COMPLETE=1
   or
@@ -112,6 +107,13 @@ The process of building a CD is decomposed as follow :
   $ make bootable
   This does affect only the binary CDs.
 
+  If you want to use boot-floppies built by yourself you can give
+  a parameter BOOTDISKS=<dir> giving the directory where
+  they are (note that $BOOTDISKS/current must be a symlink to the
+  real directory, it must follow the same setup than in the FTP
+  mirror). Your boot-floppies must also be on the same partiton than
+  your mirror & temporary dir (hardlinks are used here too).
+
 - now, we'll add the binary packages to the temporary tree :
   $ make packages
 

README.devel

@@ -33,6 +33,9 @@ Log files :
 
 TODO list :
 -----------
++ be able to use an alternate location for the boot disks
+  (in order to use i18ned boot disks and to more easily
+   test debian-cd with CVS version of the boot-floppies)
 + a way to force the inclusion of packages (even broken)
 + possibility to add project/* to the last CD
 + check the source files on the mirror (with Sources.gz)

data/potato/README.multicd

@@ -0,0 +1,7 @@
+Multi CD installation for Debian 2.2
+
+You must use apt-cdrom ...
+
+EXPLAIN WHAT'S NEEDED HERE
+
+...

debian/changelog

@@ -5,6 +5,15 @@ debian-cd (2.1.91) unstable; urgency=low
   * Updated the tasks/Debian_potato to use the new task-* packages.
   * New boot-i386 which does use resc2880.bin (the tecra image has
     been removed since it does no more exist in the latest boot-floppies).
+  * Can now build CD with bootdisks taken from somewhere else than
+    the mirror (allow you to use your own boot floppies, notably those
+    built with translated documentation).
+  * The documentation from the boot-floppies are now installed
+    in /install and /doc by the scripts tools/$CODENAME/installtools.sh
+    It was needed since the documentation of the boot-floppies does
+    differ from one dist to another ...
+  * Removed some cruft which is no more needed (master for potato,
+    status.i386).
 
  -- Raphael Hertzog <hertzog@debian.org>  Thu, 11 Nov 1999 20:50:26 +0100
 

tools/potato/installtools.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Install files in /install and some in /doc
+
+set -e
+
+BDIR=$TDIR/$CODENAME-$ARCH
+
+# Put the install documentation in /install
+cd $BDIR/1/dists/$CODENAME/main/disks-$ARCH/current/documentation
+mkdir $BDIR/1/install/documentation
+cp *.{html,txt} $BDIR/1/install/documentation/
+ln -sf install*.html $BDIR/1/install/index.html
+
+# Put the boot-disk documentation in /doc too
+mkdir $BDIR/1/doc/install
+cd $BDIR/1/doc/install
+for file in ../../install/documentation/*.{html,txt}
+do
+	ln -s $file
+done
+

tools/slink/installtools.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Install files in /install and some in /doc
+
+set -e
+
+BDIR=$TDIR/$CODENAME-$ARCH
+
+# Put the install documentation in /install
+cd $BDIR/1/dists/$CODENAME/main/disks-$ARCH/current
+cp *.{html,txt} $BDIR/1/install/
+ln -sf install.html $BDIR/1/install/index.html
+
+# Put the boot-disk documentation in /doc too
+cd $BDIR/1/doc
+for file in ../install/*.{html,txt}
+do
+	ln -s $file
+done
+