Merge ~mwhudson/debian-cd/+git/ubuntu:remove-non-us into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Steve Langasek]

[Steve Langasek (vorlon)]

this does remove only most references, should we remove all?

[Steve Langasek (vorlon)]

Seems to have missed removal of data/sarge

also, comments inline

review: Needs Fixing

[Michael Hudson-Doyle (mwhudson)]

> this does remove only most references, should we remove all?

Most of the remaining ones are in tasks/ which I think we can just delete entirely. But I'm not sure yet.

> Seems to have missed removal of data/sarge

Fixed.

> also, comments inline

Not yet read!

[Michael Hudson-Doyle (mwhudson)]

OK I hacked out some more things. Not sure how to test this -- I guess it should be easier to run this all locally now...

[Steve Langasek (vorlon)]

do we need an empty tasks directory so that tasks/auto can be created?

[Steve Langasek (vorlon)]

nope, we're ok there:
    def update_tasks(self, date):
        tasks_dir = self.tasks_output_dir(self.config.project)
        previous_tasks_dir = "%s-previous" % tasks_dir
        debian_cd_tasks_dir = os.path.join(
            self.config.root, "debian-cd", "tasks", "auto",
            self.config.image_type, self.config.project,
            self.config.full_series)
[...]
        osextras.mkemptydir(debian_cd_tasks_dir)

diff --git a/CONF.sh b/CONF.sh
index e12c97f..01751f5 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -3,7 +3,6 @@
 #
 
 # Unset all optional variables first to start from a clean state
-unset NONUS             || true
 unset NONFREE           || true
 unset CONTRIB           || true
 unset EXTRANONFREE      || true
@@ -150,9 +149,6 @@ export FULLARCH=$ARCH${SUBARCH:++$SUBARCH}
 # Paths to the mirrors
 export MIRROR=${MIRROR:-$CDIMAGE_ROOT/ftp}
 
-# Comment the following line if you don't have/want non-US
-#export NONUS=/ftp/debian-non-US
-
 # Path of the temporary directory
 export TDIR=$CDIMAGE_ROOT/scratch/$PROJECT/$DIST/$IMAGE_TYPE/tmp
 
diff --git a/Makefile b/Makefile
index c597185..3805b4c 100644
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,6 @@ scanpackages=$(BASEDIR)/tools/scanpackages
 scansources=$(BASEDIR)/tools/scansources
 add_files=$(BASEDIR)/tools/add_files
 set_mkisofs_opts=$(BASEDIR)/tools/set_mkisofs_opts
-strip_nonus_bin=$(BASEDIR)/tools/strip-nonUS-bin
 add_secured=$(BASEDIR)/tools/add_secured
 md5sum=/usr/bin/md5sum
 sha1sum=/usr/bin/sha1sum
@@ -327,13 +326,11 @@ $(ADIR):
 clean: ok bin-clean src-clean
 bin-clean:
 	$(Q)rm -rf $(BDIR)/CD[1234567890]*
-	$(Q)rm -rf $(BDIR)/*_NONUS
 	$(Q)rm -f $(BDIR)/*.filelist*
 	$(Q)rm -f  $(BDIR)/packages-stamp $(BDIR)/bootable-stamp \
 	         $(BDIR)/upgrade-stamp $(BDIR)/secured-stamp $(BDIR)/md5-check
 src-clean:
 	$(Q)rm -rf $(SDIR)/CD[1234567890]*
-	$(Q)rm -rf $(SDIR)/*_NONUS
 	$(Q)rm -rf $(SDIR)/sources-stamp $(SDIR)/secured-stamp $(SDIR)/md5-check
 
 # Completely cleans the current arch tree
@@ -525,7 +522,7 @@ $(BDIR)/CD1/.disk/info:
 	for i in $(BDIR)/*.packages; do \
 		num=$${i%%.packages}; num=$${num##$(BDIR)/}; \
 		dir=$(BDIR)/CD$$num; \
-		echo -n $(BINDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \
+		echo -n $(BINDISKINFO) > $$dir/.disk/info; \
 		echo -n $(BINVOLID) > $(BDIR)/$${num}.volid; \
 		$(set_mkisofs_opts) bin $$num > $(BDIR)/$${num}.mkisofs_opts; \
 	done
@@ -538,7 +535,7 @@ $(SDIR)/CD1/.disk/info:
 	for i in $(SDIR)/*.sources; do \
 		num=$${i%%.sources}; num=$${num##$(SDIR)/}; \
 		dir=$(SDIR)/CD$$num; \
-		echo -n $(SRCDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \
+		echo -n $(SRCDISKINFO) > $$dir/.disk/info; \
 		echo -n $(SRCVOLID) > $(SDIR)/$${num}.volid; \
 		$(set_mkisofs_opts) src $$num > $(SDIR)/$${num}.mkisofs_opts; \
 	done
@@ -606,7 +603,7 @@ $(SDIR)/sources-stamp:
 		dir=$(SDIR)/CD$$n; \
 		echo -n "$$n ... "; \
 		echo -n "main ... "; \
-		grep -vE "(non-US/|/local/)" $$i > $$i.main || true ; \
+		grep -vE "/local/" $$i > $$i.main || true ; \
 		if [ -s $$i.main ] ; then \
 			cat $$i.main | xargs $(add_files) $$dir $(MIRROR); \
 		fi ; \
@@ -623,13 +620,6 @@ $(SDIR)/sources-stamp:
 				fi; \
 		    fi; \
 		fi; \
-		if [ -n "$(NONUS)" ]; then \
-			echo -n "non-US ... "; \
-			grep "non-US/" $$i > $$i.nonus || true ; \
-			if [ -s $$i.nonus ] ; then \
-				cat $$i.nonus | xargs $(add_files) $$dir $(NONUS); \
-			fi; \
-		fi; \
 		$(scansources) $$dir; \
 		echo "done."; \
 	done
diff --git a/README b/README
index 79d0282..fca2806 100644
--- a/README
+++ b/README
@@ -114,8 +114,7 @@ The process of building a CD is composed of the following steps:
 
     $ 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) :
+  or for something like an official image (without non-free) :
 
     $ make list COMPLETE=1 SIZELIMIT1=576716800
 
@@ -123,8 +122,6 @@ The process of building a CD is composed of the following steps:
   
   You can change the behaviour of this command with the following
   variables:
-  - 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 NONFREE is set, then packages from non-free will be allowed
     (NONFREE must be exported to all sub-shells)
   - if EXTRANONFREE is set, then non-free packages will be included
diff --git a/data/cts_amiga_info.tar.gz b/data/cts_amiga_info.tar.gz
 deleted file mode 100644
index 0e17cc3..0000000
 Binary files a/data/cts_amiga_info.tar.gz and /dev/null differ
diff --git a/data/etch/README.html.in b/data/etch/README.html.in
 deleted file mode 100644
index f587ec4..0000000
--- a/data/etch/README.html.in
+++ /dev/null
@@ -1,693 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  <title>Debian GNU/Linux -- The Universal Operating System</title>
-  <meta name="Description" content="Debian GNU/Linux is a free distribution of the GNU/Linux operating system. It is maintained and updated through the work of many users who volunteer their time and effort.">
-  <meta name="Keywords" content="debian, GNU, linux, unix, open source, free, DFSG">
-  <meta name="Language" content="English">
-  <meta name="Author" content="J.A. Bezemer, [e-mail]">
-  <link rev="made" href="mailto:[e-mail]">
-</head>
-<body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#800080" alink="#FF0000">
-
-  <!-- The HTML and TEXT file are NOT the actual source code. -->
-  <!-- For that, see http://cvs.debian.org/debian-cd/data/woody/README.html.in?cvsroot=debian-boot -->
-#if 0
-        If you read THIS, you're viewing the actual source file ;-)
-#endif
-
-#undef i386
-#undef amd64
-#undef alpha
-#undef powerpc
-#undef ppc
-#undef sparc
-#undef ultrasparc
-#undef m68k
-#undef arm
-#undef binary
-#undef bin
-#undef source
-#undef src
-
-#if OUTPUTtext
-#define	  href  nothing
-#endif
-
-#include <README.diskdefines>
-
-
-#if OUTPUThtml
-<div align=right>
-(<a href="README.txt">Text version</a>)
-</div>
-<table border="0" cellpadding="3" cellspacing="0" align="center" summary="">
-<tr>
-<td>
-<img src="pics/logo-50.jpg" border="0" hspace="0" vspace="0" alt="" width="50" height="61">
-<img src="pics/debian.jpg" border="0" hspace="0" vspace="0" alt="Debian" width="179" height="61">
-</td>
-</tr>
-</table>
-#endif 
-#if OUTPUTtext
-<div align=right>
-(HTML version in README.html)
-</div>
-#endif
-
-
-<table bgcolor="#DF0451" border="0" cellpadding="0" cellspacing="0"
-  width="100%" summary="">
-<tr>
-<td valign="top">
-<img src="pics/red-upperleft.png" align="left" border="0" hspace="0"
-  vspace="0" alt="" width="15" height="16">
-</td>
-<td rowspan="2" align="center">
-
- <table align="center" border="0" cellpadding="2" cellspacing="0">
- <tr><td bgcolor="#000084">
- <div align="center"><font color="#FFFFFF" face="helvetica,arial"><B>&nbsp;&nbsp;
-#if 0
- Debian GNU/Linux 2.2 "Potato" - Official i386 Binary-1 CD
-#endif
- DISKNAME CD
- &nbsp;&nbsp;</B></font></div>
- </td></tr>
- </table>
-
-</td>
-<td valign="top">
-<img src="pics/red-upperright.png" align="right" border="0" hspace="0"
-  vspace="0" alt="" width="16" height="16">
-</td>
-</tr>
-<tr>
-<td valign="bottom">
-<img src="pics/red-lowerleft.png" align="left" border="0" hspace="0"
-  vspace="0" alt="" width="16" height="16">
-</td>
-<td valign="bottom">
-<img src="pics/red-lowerright.png" align="right" border="0" hspace="0"
-vspace="0" alt="" width="15" height="16">
-</td>
-</tr>
-</table>
-
-<table border="0" cellpadding="2" cellspacing="0" width="100%" summary="">
-<tr>
-        <td></td>
-</tr>
-</table>
-
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-<tr>
-        <td colspan="3" valign="top" width="20%" bgcolor="#BBDDFF">
-          <img src="pics/blue-upperleft.png" align="left" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-          <img src="pics/blue-upperright.png" align="right" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-        </td>
-</tr>
-<tr>
-        <td bgcolor="#BBDDFF">&nbsp;&nbsp;</td>
-
-        <td valign="TOP" bgcolor="#BBDDFF">
-
-<font face="Arial,Helvetica">
-
-#if OUTPUThtml
-<P><B><A href="http://www.debian.org/">Debian home&nbsp;page</A></B></P>
-#endif
-
-&nbsp;<br>
-<P>
-
-#if OUTPUTtext
-&nbsp;<br>
-CONTENTS:
-<br>
-&nbsp;<br>
-<UL>
-#endif
-
-#if OUTPUTtext
-<LI>
-#endif
-
-<A href="#intro">Intro</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-<A href="#thiscd">About This CD</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-<A href="#install">Installing</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-#ifndef UNOFFEXTRAS
-<A href="#lastmin">Last-Minute Notes</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-#endif
-
-#if TYPEbinary
- <A href="#apt">Using CDs with apt</A>
- <P>
-
-#if OUTPUTtext
-  </LI><LI>
-#endif
-#endif
-
-#ifndef UNOFFEXTRAS
-<A href="#cdmanuf">CD Manufacturers</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-#endif
-
-<A href="#other">More Information</A>
-
-<P>
-
-#if OUTPUThtml
-&nbsp;<P>
-<A href=".">Browse this CD-ROM</A></P>
-<P>
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt>
-</P>
-#endif
-
-
-</font>
-
-#if OUTPUTtext
-</LI>
-</UL>
-#endif
-
-
-        </td>
-        <td bgcolor="#BBDDFF">&nbsp;&nbsp;</td>
-        <td>&nbsp;&nbsp;</td>
-
-  <td valign="TOP" width="80%">
-
-<div align="center">
-<big><big><B><I>
-Welcome to the exciting world of
-</I></B></big></big>
-<br>
-<big><big><big><B><I>
-Debian GNU/Linux!
-</I></B></big></big></big>
-</div>
-
-<P><H2><A name="intro">
-Intro
-#if OUTPUTtext
-<br>
-=====
-#endif
-</H2>
-</a>
-<p>
-This is one of the CD-ROMs of the
-<a href="http://www.debian.org/">Debian GNU/Linux</a>
-distribution. Debian is a
-very extensive collection of software. But it is more. It is a complete
-Operating System (OS) for your computer. And it is
-<A href="http://www.debian.org/intro/free">free</A>
-(as in &quot;freedom&quot;).
-<P>
-An operating system is the set of basic programs
-and utilities that make your computer run. At the core of an operating
-system is the kernel. The kernel is the most fundamental program on the
-computer, which does all the basic housekeeping and lets you start other
-programs.
-Debian is kernel independent. It currently uses the
-<A href="http://www.linux.org/">Linux</A> kernel but work is
-in progress to provide Debian for other kernels, using
-<A href="http://www.gnu.org/software/hurd/hurd.html">the Hurd</A>.
-Most of the basic operating system tools
-come from the <a href="http://www.gnu.org/">GNU project</A>; hence the name
-GNU/Linux.
-<P>
-
-Debian is available for various kinds of computers
-(&quot;architectures&quot;), like
-&quot;IBM-compatible&quot; PCs (<i>i386</i>),
-Compaq's <i>Alpha</i>,
-Motorola's 680x0 (<i>m68k</i>),
-Sun's <i>Sparc</i>,
-Motorola/IBM's <i>PowerPC</i>, and <i>(Strong)ARM</i> processors.
-Check the <A href="http://www.debian.org/ports">ports</A> page
-#if OUTPUTtext
-(http://www.debian.org/ports)
-#endif
-for more information.
-<P>
-
-#if OUTPUTtext
-Read more at <P>
-&nbsp; http://www.debian.org/intro/about
-#endif
-#if OUTPUThtml
-<A href="http://www.debian.org/intro/about">Read more...</A>
-#endif
-
-#if OUTPUTtext
-<P>&nbsp;<P><H2><A name="thiscd">
-#endif
-#if OUTPUThtml
-<P><HR><P><H2><A name="thiscd">
-#endif
-About This CD
-#if OUTPUTtext
-<br>
-=============
-#endif
-</H2>
-</a>
-<p>
-This CD-ROM is labeled
-<P>
-<tt>&nbsp;
-  DISKNAME
-</tt>
-<P>
-#ifndef UNOFFEXTRAS
-which means that this CD is number DISKNUM of TOTALNUM CDs containing
-#if TYPEbinary
-programs ("binaries") for `ARCH' computers.
-<P>
-The programs on the Binary CDs are ordered by popularity. The Binary-1 CD
-contains the most popular programs and the installation tools; it is possible
-to install and run Debian with only the Binary-1 CD. The other CDs, up to
-Binary-TOTALNUM, contain mostly special-interest programs.
-<p>
-#if OMIT_RELEASE_NOTES
-The Release Notes for "etch" are available on the <A
-href="http://www.debian.org/releases/etch/releasenotes">Debian web
-site</A>.
-#else
-#if DISKNUM == 1
-The Release Notes for Debian GNU/Linux "etch" are included on this CD
-in <A href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in
-several languages. Additional translations and updated versions for
-the Release Notes may be available from the <A
-href="http://www.debian.org/releases/etch/releasenotes">Debian web
-site</A>.
-else
-See the first CD in this set for the "etch" Release Notes.
-#endif
-#endif
-#endif
-#if TYPEsource
-the source code of programs in the Debian OS.
-<P>
-The source packages on the Source CDs are ordered by popularity, like
-the programs on the Binary CDs. This means that the source code of the
-programs on the Binary-DISKNUM CD can most likely be found on this CD
-(though there may be some variation due to size issues).
-#endif
-#else
-#include <unoffextrascd.html.in>
-#endif
-
-
-#if OUTPUTtext
-<P>&nbsp;<P><H2><A name="install">
-#endif
-#if OUTPUThtml
-<P><HR><P><H2><A name="install">
-#endif
-Installing
-#if OUTPUTtext
-<br>
-==========
-#endif
-</H2>
-</a>
-<p>
-#if TYPEbinary
-
- Because Debian is a complete Operating System, the installation procedure
- may seem a bit unusual. You can install Debian GNU/Linux either
- <i>alongside</i> your current OS, or as the <i>only</i> OS on your computer.
-#if OMIT_MANUAL
- <P>
- An <b>Installation Guide</b> for this CD is available from
- <A href="http://www.debian.org/releases/etch/installmanual">the Debian web site</a>.
-#else
- <P>
- An <b>Installation Guide</b> is included on this CD at
- <P>
- <tt>&nbsp;
- <A href="doc/install/manual/en/index.html">doc/install/manual/en/index.html</a> &nbsp;&nbsp;&nbsp; (English version)</tt>
- <P>
- Several translations of the Installation Guide are included on this CD in
- the <tt><A href="doc">doc/</a></tt> directory, along with various other documents.
- <br>
- Note: additional translations, other formats (like PDF and TXT) and updated 
- versions for the Installation Guide are available from
- <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 CD under
- <P>
- <tt>&nbsp;
- <A href=%%""tools/%%"">/tools/</a>
- </tt>
- and
- <tt>&nbsp;
- <A href=%%""install/floppy/%%"">/install/floppy/</a>
- </tt>
-
-#if ARCHi386 || ARCHamd64 || ARCHalpha || ARCHpowerpc || ARCHsparc
-  <P>
-  For the impatient ones:
-#endif
-
-#if ARCHi386 || ARCHalpha || ARCHsparc
-  you can start the installation program easily by booting off this CD-ROM.
-  Note that not all (esp. older) systems support this. 
-  <P>
-#endif
-
-#if ARCHi386 || ARCHamd64 || ARCHpowerpc
-#if ARCHi386
-   You can also
-#else
-   you can
-#endif
-  examine the
-  <P>
-  <tt>&nbsp;
-  <a href="install/">/install</a>
-  </tt>
-  <P>
-  directory; you might be able to start the installation system directly
-  from there. 
-#endif
-
-#else
- The installation tools of the Debian Operating System are located on the
- Binary-1 CD.
- See the README on that CD for more info.
-#endif
-
-#ifndef UNOFFEXTRAS
-#if OUTPUTtext
-<P>&nbsp;<P><H2><A name="lastmin">
-#endif
-#if OUTPUThtml
-<P><HR><P><H2><A name="lastmin">
-#endif
-Last-Minute Notes
-#if OUTPUTtext
-<br>
-=================
-#endif
-</H2>
-</a>
-<p>
-<UL>
-
-<LI>
-You should keep in mind that this is an unofficial CD of the current
-development version of the Debian system. This means that all sorts of
-bugs may be present anywhere in the system.
-
-<br>&nbsp;
-</LI>
-
-#if 0
--------- This can't be an official image, so also no official notes.
-<LI>
-Last-minutes notes for this CD may be available on
-<a href="http://www.debian.org/CD/releases/">http://www.debian.org/CD/releases/</a>
-</LI>
-#endif
-
-</UL>
-#endif
-
-#if TYPEbinary
-#if OUTPUTtext
-  <P>&nbsp;<P><H2><A name="apt">
-#endif
-#if OUTPUThtml
-  <P><HR><P><H2><A name="apt">
-#endif
- Using Apt
-#if OUTPUTtext
-  <br>
-  =============
-#endif
- </H2>
- </a>
- <p>
- After installing or upgrading, Debian's packaging system can use CD-ROMs,
- local collections, or networked servers (FTP, HTTP) to automatically
- install software from (<tt>.deb</tt> <i>packages</i>). This is done
- preferably with the `apt' and `aptitude' programs. 
-
- <P>
-
- You can install packages from the commandline using
- <tt>apt-get</tt>. For example, if you want to install the packages
- `commprog' and `maxgame', you can give the command
- <P>
- <tt>&nbsp;
-   apt-get install commprog maxgame
- </tt>
- <P>
- Note that you don't have to enter the complete path, or the
- `<tt>.deb</tt>' extension. `Apt' will figure this out itself. 
- <P>
- Or use aptitude for a full screen interactive selection of available
- Debian packages.
- 
-#endif
-
-
-#ifndef UNOFFEXTRAS
-#if OUTPUTtext
-<P>&nbsp;<P><H2><A name="cdmanuf">
-#endif
-#if OUTPUThtml
-<P><HR><P><H2><A name="cdmanuf">
-#endif
-CD Manufacturers
-#if OUTPUTtext
-<br>
-================
-#endif
-</H2>
-</a>
-<p>
-You are completely free to manufacture and re-distribute CD-ROMs of the
-Debian GNU/Linux Operating System, like this one. There is no charge from
-us (but of course donations are always welcome). 
-
-<P>
-
-For all needed information and contact addresses, please refer to
-<P>
-<tt>&nbsp;
-  <a href="http://www.debian.org/CD/">http://www.debian.org/CD/</a>
-</tt>
-#endif
-
-#if OUTPUTtext
-<P>&nbsp;<P><H2><A name="other">
-#endif
-#if OUTPUThtml
-<P><HR><P><H2><A name="other">
-#endif
-More Information
-#if OUTPUTtext
-<br>
-================
-#endif
-</H2>
-</a>
-<p>
-#if DISKNUM1 && TYPEbinary
-
-There is much more information present on this CD. Besides the already
-mentioned installation and upgrading procedures, this is the most
-interesting:  <P>
-
-<UL>
-<LI>
-
-#if OUTPUTtext
-/doc/FAQ
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/FAQ/">Debian FAQ</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/constitution.txt
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/constitution.txt">The Debian Constitution</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/debian-manifesto
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/debian-manifesto">The Debian Manifesto</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/social-contract.txt
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/social-contract.txt">Debian's Social Contract</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/bug-reporting.txt
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/bug-reporting.txt">Bug reporting instructions</a>
-
-</LI>
-</UL>
-
-#else
-
-The Binary-1 CD contains much more information about various aspects
-of the Debian Operating System and the Debian organization.
- See the README on that CD for more info.
-
-#endif
-
-<P>
-Also on the Internet are many resources. To name a few:
-<P>
-
-<UL>
-<LI>
-
-#if OUTPUTtext
-http://www.debian.org
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.debian.org/">The Debian homepage</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.debian.org/doc
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.debian.org/doc/">Debian Documentation</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.debian.org/support
- &nbsp;
-#endif
-<A href="http://www.debian.org/support">Debian User Support</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.tldp.org
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.tldp.org/">The Linux Documentation Project</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.linux.org
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.linux.org/">General Linux homepage</a>
-
-</LI>
-</UL>
-
-<P>
-
-<DIV align="center">
-
-#if OUTPUTtext
-&nbsp;<br>
-&nbsp;<br>
-#endif
-#if OUTPUThtml
-<HR>
-#endif
-
-<SMALL>See the Debian
-<A href="http://www.debian.org/contact">contact page</A>
-
-#if OUTPUTtext
-(http://www.debian.org/contact)
-#endif
-
-for information on contacting us.
-	</SMALL><P>
-<SMALL>
-
-Last Modified:  Sat Mar 20 12:30:45 EST 2004
-
-<br></SMALL>
-</DIV>
-
-  </td>
-  </tr>
-  <tr>
-        <td colspan="3" valign="bottom" width="20%" bgcolor="#BBDDFF">
-          <img src="pics/blue-lowerleft.png" align="left" border="0"
-            hspace="0" vspace="0" alt="" width="17" height="16">
-          <img src="pics/blue-lowerright.png" align="right" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-        </td>
-  </tr>
-  </table>
-
-</body>
-</html>
diff --git a/data/etch/README.sbm b/data/etch/README.sbm
 deleted file mode 100644
index 4087670..0000000
--- a/data/etch/README.sbm
+++ /dev/null
@@ -1,43 +0,0 @@
-About the Smart Boot Manager image
-----------------------------------
-
-  The file `sbm.bin' that is available in this directory may be useful
-  to you if you are not able to directly boot the first CD because your
-  BIOS may be too old and may not support ISOLINUX.
-
-  Then, instead of booting on the CD directly, you create a Smart Boot
-  Manager floppy image by using the sbm.bin disk image. You can create this
-  floppy with rawrite (under DOS) or with dd (under Linux). Now you can
-  boot on this floppy disk and it will detect your CDROM and let you boot
-  on it bypassing any BIOS limitation.
-
-What is SBM ?
-
-  Smart Boot Manager or briefly SmartBtmgr (SBM), is an OS independent
-  Boot Manager - a program that is loaded by the bios before any
-  operating system and allows you to choose which operating system to
-  boot.
-
-  SBM is included in Debian in two ways, the package bmconf allows us to
-  install and configure an old version of SBM and sbm wich is the latest
-  version of SBM with an installer.
-
-What's the use of SBM on the CD then ?
-
-  SBM includes an IDE driver that allows us to boot the cds even on
-  machines with a BIOS that wouldn't support booting from CD, provided our
-  CDROM is an IDE one, that is, so you can make a SBM floppy and boot from
-  it and then tell it to boot from your CDROM.
-
-  Also, there are some cases where the BIOS would allow booting from the CD
-  but isolinux fails to boot from there, in this case you can either boot
-  using a CD other than the first, as the others don't use isolinux, or you
-  can make a SBM floppy and boot from this floppy and then tell SBM to boot
-  your CDROM.
-
-How do you make a SBM floppy ?
-
-  If you have SBM installed on a box you can run sbminst. Otherwise you can
-  put the sbm.bin floppy image that we provide with our cds onto a floppy
-  just like you would do with a rescue image.
-
diff --git a/data/etch/alpha_businesscard_udeb_include b/data/etch/alpha_businesscard_udeb_include
 deleted file mode 100644
index eea4461..0000000
--- a/data/etch/alpha_businesscard_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-fdisk-udeb
diff --git a/data/etch/alpha_netinst_udeb_include b/data/etch/alpha_netinst_udeb_include
 deleted file mode 100644
index 70df4f6..0000000
--- a/data/etch/alpha_netinst_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-fdisk-udeb
diff --git a/data/etch/alpha_udeb_include b/data/etch/alpha_udeb_include
 deleted file mode 100644
index 70df4f6..0000000
--- a/data/etch/alpha_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-fdisk-udeb
diff --git a/data/etch/amd64_businesscard_udeb_include b/data/etch/amd64_businesscard_udeb_include
 deleted file mode 100644
index c8849a9..0000000
--- a/data/etch/amd64_businesscard_udeb_include
+++ /dev/null
@@ -1,5 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/etch/amd64_netinst_udeb_include b/data/etch/amd64_netinst_udeb_include
 deleted file mode 100644
index 275197a..0000000
--- a/data/etch/amd64_netinst_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/etch/amd64_udeb_include b/data/etch/amd64_udeb_include
 deleted file mode 100644
index 275197a..0000000
--- a/data/etch/amd64_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/etch/arm_businesscard_udeb_include b/data/etch/arm_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/etch/arm_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/etch/arm_netinst_udeb_include b/data/etch/arm_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/arm_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/arm_udeb_include b/data/etch/arm_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/arm_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/delo.conf b/data/etch/delo.conf
 deleted file mode 100644
index 81d29a9..0000000
--- a/data/etch/delo.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# DECstations with R4000 CPU
-label=linux-kn04
-  append="initrd=/boot/initrd.gz ramdisk_size=8192"
-  image=/boot/vmlinux-r4k-kn04
-
-# DECstations with R4000 CPU, expert mode
-label=expert-kn04
-  append="DEBCONF_PRIORITY=low initrd=/boot/initrd.gz ramdisk_size=8192"
-  image=/boot/vmlinux-r4k-kn04
-
-# DECstations with R3000 CPU
-label=linux-kn02
-  append="initrd=/boot/initrd.gz ramdisk_size=8192"
-  image=/boot/vmlinux-r3k-kn02
-
-# DECstations with R3000 CPU, expert mode
-label=expert-kn02
-  append="DEBCONF_PRIORITY=low initrd=/boot/initrd.gz ramdisk_size=8192"
-  image=/boot/vmlinux-r3k-kn02
diff --git a/data/etch/exclude-udebs b/data/etch/exclude-udebs
 deleted file mode 100644
index 38fd04c..0000000
--- a/data/etch/exclude-udebs
+++ /dev/null
@@ -1,92 +0,0 @@
-# These udebs build the d-i cdrom initrd. As such, there is no reason
-# to keep another copy of them on the CD in udeb form.
-# 
-# This duplicates data found in the file build/pkg-lists/kernel, in d-i cvs
-kernel-image-*
-# build/pkg-lists/base in d-i cvs
-rootskel
-main-menu
-cdebconf-udeb
-udpkg
-anna
-di-utils-shell
-di-utils-reboot
-lowmemcheck
-# build/pkg-lists/cdrom/common, in d-i cvs (also included in the
-# root+cd-drivers floppies)
-busybox-cvs-udeb
-rootskel-locale
-languagechooser
-countrychooser
-iso-3166-udeb
-hw-detect
-cdrom-detect
-cdrom-retriever
-load-cdrom
-cdrom-checker
-bogl-bterm-udeb
-di-utils-terminfo
-cdebconf-priority
-cdebconf-newt-udeb
-usb-discover
-preseed-common
-initrd-preseed
-file-preseed
-nano-udeb
-floppy-retriever
-libfribidi0-udeb
-# Already on the initrd, thanks to library reduction.
-libdebconfclient0-udeb
-# A reduced version is on the initrd. Nothing currently needs the full
-# version.
-slang1a-utf8-udeb
-# These udebs are only useful in building the boot floppy image.
-busybox-cvs-floppy-udeb
-di-utils-bootfloppy
-rootskel-bootfloppy
-# Until someone gets the gtk cdebconf frontend going, all this is not worth
-# including.
-cdebconf-gtk-udeb
-fontconfig-udeb
-libatk1.0-udeb
-libdirectfb-0.9-19-udeb
-libexpat1-udeb
-libfreetype6-udeb
-libglib2.0-udeb
-libgtk+2.0-directfb0-udeb
-libpango1.0-udeb
-libpng12-0-udeb
-ttf-freefont-udeb
-# This udeb is not in good shape and is largely supersceded by
-# cdebconf-newt-udeb
-cdebconf-slang-udeb
-# We're currently using busybox's own shell, and do not need this one.
-dash-udeb
-# These dhcp clients are not the currently preferred one.
-dhcp3-client-udeb
-pump-udeb
-# This package is only useful in the d-i-demo.
-di-utils-exit-installer
-# No need for these loaders.
-load-installer
-download-installer
-load-floppy
-# Only useful in the hd-media initrd.
-iso-scan
-load-iso
-# We're using busybox's modutils these days.
-modutils-basic
-modutils-full
-# Nothing currently depends on this, and it seems not useful on its own.
-reiserfsprogs-udeb
-# These are not really needed, the regular netcfg subsumes them.
-netcfg-static
-netcfg-dhcp
-# skolelinux stuff, not for the stock CDs
-debian-edu-install-udeb
-debian-edu-profile-udeb
-# If needed, will be on the initrd already.
-module-init-tools-udeb
-rescue-check
-# Not used yet. When it is, will go in the initrd.
-localechooser
diff --git a/data/etch/exclude-udebs-amd64 b/data/etch/exclude-udebs-amd64
 deleted file mode 100644
index 6312cc3..0000000
--- a/data/etch/exclude-udebs-amd64
+++ /dev/null
@@ -1,35 +0,0 @@
-# These udebs are in the d-i cdrom initrd and the hd-media initrd. 
-# As such, there is no reason to keep another copy of them on the CD
-# in udeb form.
-isa-pnp-modules-*
-socket-modules-*
-console-keymaps-at
-console-keymaps-usb
-discover-data-udeb
-discover-udeb
-discover1-data-udeb
-discover1-udeb
-fat-modules-*
-cdrom-core-modules-*
-cdrom-modules-*
-ide-modules-*
-ide-core-modules-*
-input-modules-*
-fb-modules-*
-kbd-chooser
-usb-modules-*
-usb-storage-modules-*
-scsi-core-modules-*
-# Not needed with the 2.6 kernel on amd64.
-userdevfs
-# The speakup kernel modules are not useful unless the access images are
-# provided.
-*-speakup-di
-# These packages are for the old partitioning system, and should not be
-# included as they confuse users.
-# Note that partconf-find-partitions is used by lvmcfg-utils, so is not
-# excluded likewise, partconf-mkfstab is used by autopartkit.
-partconf
-partitioner
-# This is obsolete.
-discover2-data-udeb
diff --git a/data/etch/exclude-udebs-i386 b/data/etch/exclude-udebs-i386
 deleted file mode 100644
index 8afbd18..0000000
--- a/data/etch/exclude-udebs-i386
+++ /dev/null
@@ -1,29 +0,0 @@
-# These udebs are in the d-i cdrom initrd and the cd-drivers+root floppies. 
-# As such, there is no reason to keep another copy of them on the CD
-# in udeb form.
-isa-pnp-modules-*
-socket-modules-*
-console-keymaps-at
-console-keymaps-usb
-floppy-modules-*
-discover-data-udeb
-discover-udeb
-discover1-data-udeb
-discover1-udeb
-cdrom-core-modules-*
-cdrom-modules-*
-ide-modules-*
-ide-core-modules-*
-input-modules-*
-fb-modules-*
-kbd-chooser
-usb-modules-*
-usb-storage-modules-*
-scsi-core-modules-*
-# Not needed with the 2.4 kernel on i386.
-userdevfs
-# The speakup kernel modules are not useful unless the access images are
-# provided.
-*-speakup-di
-# These udebs are not used yet.
-mouse-modules-*
diff --git a/data/etch/exclude-udebs-powerpc b/data/etch/exclude-udebs-powerpc
 deleted file mode 100644
index 606eac2..0000000
--- a/data/etch/exclude-udebs-powerpc
+++ /dev/null
@@ -1,30 +0,0 @@
-# These udebs build the d-i cdrom initrd. As such, there is no reason
-# to keep another copy of them on the CD in udeb form.
-#
-# This duplicates data found in the file build/pkg-lists/cdrom/powerpc,
-# in d-i Subversion.
-
-cdrom-core-modules-*
-console-keymaps-at
-console-keymaps-usb
-discover-data-udeb
-discover-udeb
-discover1-data-udeb
-discover1-udeb
-eject-udeb
-firewire-core-modules-*
-fs-common-modules-*
-ide-modules-*
-input-modules-*
-kbd-chooser
-pcmcia-cs-udeb
-pcmcia-modules-*
-pcmcia-storage-modules-*
-scsi-common-modules-*
-scsi-core-modules-*
-scsi-modules-*
-socket-modules-*
-usb-modules-*
-usb-storage-modules-*
-# Not needed with the 2.4 kernel on powerpc.
-userdevfs
diff --git a/data/etch/hppa_businesscard_udeb_include b/data/etch/hppa_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/etch/hppa_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/etch/hppa_netinst_udeb_include b/data/etch/hppa_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/hppa_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/hppa_udeb_include b/data/etch/hppa_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/hppa_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/i386_businesscard_udeb_include b/data/etch/i386_businesscard_udeb_include
 deleted file mode 100644
index c8849a9..0000000
--- a/data/etch/i386_businesscard_udeb_include
+++ /dev/null
@@ -1,5 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/etch/i386_netinst_udeb_include b/data/etch/i386_netinst_udeb_include
 deleted file mode 100644
index 275197a..0000000
--- a/data/etch/i386_netinst_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/etch/i386_udeb_include b/data/etch/i386_udeb_include
 deleted file mode 100644
index 275197a..0000000
--- a/data/etch/i386_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/etch/ia64_businesscard_udeb_include b/data/etch/ia64_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/etch/ia64_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/etch/ia64_netinst_udeb_include b/data/etch/ia64_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/ia64_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/ia64_udeb_include b/data/etch/ia64_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/ia64_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/isolinux.bin b/data/etch/isolinux.bin
 deleted file mode 100644
index d7c6d4d..0000000
 Binary files a/data/etch/isolinux.bin and /dev/null differ
diff --git a/data/etch/m68k_businesscard_udeb_include b/data/etch/m68k_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/etch/m68k_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/etch/m68k_netinst_udeb_include b/data/etch/m68k_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/m68k_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/m68k_udeb_include b/data/etch/m68k_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/m68k_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/mips_businesscard_udeb_include b/data/etch/mips_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/etch/mips_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/etch/mips_netinst_udeb_include b/data/etch/mips_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/mips_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/mips_udeb_include b/data/etch/mips_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/mips_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/mipsel_businesscard_udeb_include b/data/etch/mipsel_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/etch/mipsel_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/etch/mipsel_netinst_udeb_include b/data/etch/mipsel_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/mipsel_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/mipsel_udeb_include b/data/etch/mipsel_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/mipsel_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/pegasos/pegasos b/data/etch/pegasos/pegasos
 deleted file mode 100644
index 7ea9fed..0000000
--- a/data/etch/pegasos/pegasos
+++ /dev/null
@@ -1,87 +0,0 @@
-\ FORTH is identifed by a forth comment at first line
-\
-\ terminal control stuff
-\
-: TTY.CSI d# 27 EMIT ASCII [ EMIT ;
-: TTY.HOME    TTY.CSI ASCII H EMIT ;
-: TTY.CLR_EOS TTY.CSI ASCII J EMIT ;
-: TTY.HOME_CLR TTY.HOME TTY.CLR_EOS ;
-\
-\ boot menu stuff
-\
-: my-max-boot-num 3 ;
-: my-boot-default 1 ;
-: my-boot-delay d# 300 ; \ unit = 100 ms
-: my-print-menu ( -- )
-  TTY.HOME_CLR
-  ."  "                                    			cr
-  ." Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!"		cr
-  ." "								cr
-  ." This is a Debian installation ${MEDIA_TYPE},"		cr
-  ." built on ${BUILD_DATE}."					cr
-  ." "								cr
-  ." The default option is (1) 'install'. For maximum"		cr
-  ." control, you can use the (2) 'expert' option."		cr
-  ." "								cr
-  ." ************************************"			cr
-  ." If in doubt, just choose (1) 'install'"			cr
-  ." ************************************"			cr
-  ."  "								cr
-  ." 1: install"   						cr
-  ." 2: expert"   						cr
-  ." 3: return to OF prompt"					cr
-  ."  "								cr
-;
-: my-boot-case ( num -- )
-  ."  " cr
-  case
-    1 of " cd install/powerpc/vmlinuz-chrp.initrd devfs=mount,dall init=/linuxrc --" endof
-    2 of " cd install/powerpc/vmlinuz-chrp.initrd DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" endof
-    3 of " none" endof
-  endcase
-  $boot
-;
-: my-input-num ( wait-period max-boot-num default-num -- boot-num )
-  1 \ loop-inc = 1
-  3 pick 0 do
-    0d emit
-    ." press 1-"
-    ( wait-period max-boot-num default-num loop-inc )
-    2 pick ascii 0 + emit
-    dup 1 = if
-      ."  within "
-      3 pick i - d# 10 / .d
-      ."  seconds"
-    then
-    ."  (default: "
-    over ascii 0 + emit
-    ." ) :                   "
-    d# 100 ms
-    key? if
-       key
-       ( wait-period max-boot-num default-num loop-inc key )
-       dup 0d = if \ return pressed
-         drop leave
-       then
-
-       ascii 0 -
-       ( wait-period max-boot-num default-num loop-inc num )
-       dup 1 5 pick
-       ( wait-period max-boot-num default-num loop-inc num num 1 max-boot-num )
-       between if
-         rot drop swap leave
-       then
-
-       ( wait-period max-boot-num default-num loop-inc num )
-       2drop 0  \ loop-inc = 0
-    then
-  dup +loop
-  drop
-  ( wait-period max-boot-num boot-num )
-  nip nip
-;
-
-
-my-print-menu
-my-boot-delay my-max-boot-num my-boot-default my-input-num
-my-boot-case
diff --git a/data/etch/powerpc_businesscard_udeb_include b/data/etch/powerpc_businesscard_udeb_include
 deleted file mode 100644
index b5c5e7e..0000000
--- a/data/etch/powerpc_businesscard_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-wireless-tools-udeb
diff --git a/data/etch/powerpc_netinst_udeb_include b/data/etch/powerpc_netinst_udeb_include
 deleted file mode 100644
index 4a83dd2..0000000
--- a/data/etch/powerpc_netinst_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-wireless-tools-udeb
diff --git a/data/etch/powerpc_udeb_include b/data/etch/powerpc_udeb_include
 deleted file mode 100644
index 275197a..0000000
--- a/data/etch/powerpc_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/etch/s390_businesscard_udeb_include b/data/etch/s390_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/etch/s390_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/etch/s390_netinst_udeb_include b/data/etch/s390_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/s390_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/s390_udeb_include b/data/etch/s390_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/s390_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/sbm.bin.gz b/data/etch/sbm.bin.gz
 deleted file mode 100644
index 20e4aa4..0000000
 Binary files a/data/etch/sbm.bin.gz and /dev/null differ
diff --git a/data/etch/sparc/debian.txt b/data/etch/sparc/debian.txt
 deleted file mode 100644
index ffa03a7..0000000
--- a/data/etch/sparc/debian.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
 
-                  Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
-
-This is a Debian installation ${MEDIA_TYPE}, built on ${BUILD_DATE}.
-Keep it once you have installed your system, as you can boot from it
-to repair the system on your hard disk if that ever becomes necessary.
-
-WARNING: You should completely back up all of your hard disks before
-  proceeding. The installation procedure can completely and irreversibly
-  erase them! If you haven't made backups yet, remove the rescue CD from
-  the drive and press L1-A to get back to the OpenBoot prompt.
-
-Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted
-by applicable law.
-
-[ ENTER - Boot install ]   [ Type "rescue" - Boot into rescue mode ]
diff --git a/data/etch/sparc/silo.conf b/data/etch/sparc/silo.conf
 deleted file mode 100644
index 9280ac2..0000000
--- a/data/etch/sparc/silo.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-partition=1
-timeout=600
-message=/boot/debian.txt
-default=linux
-append="cdrom ramdisk_size=16384 devfs=mount rw"
-initrd=/boot/initrd.gz
-root=/dev/rd/0
-
-# Standard boot images
-image[sun4c,sun4d,sun4m]=/boot/sparc32
-   label=linux
-image[sun4u]=/boot/sparc64
-   label=linux
-
-# Rescue boots
-image[sun4c,sun4d,sun4m]=/boot/sparc32
-  label=rescue
-  append="init=/bin/sh"
-image[sun4u]=/boot/sparc64
-  label=rescue
-  append="init=/bin/sh"
diff --git a/data/etch/sparc_businesscard_udeb_include b/data/etch/sparc_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/etch/sparc_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/etch/sparc_netinst_udeb_include b/data/etch/sparc_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/sparc_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/sparc_udeb_include b/data/etch/sparc_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/etch/sparc_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/etch/yaboot/boot.msg b/data/etch/yaboot/boot.msg
 deleted file mode 100644
index 292e525..0000000
--- a/data/etch/yaboot/boot.msg
+++ /dev/null
@@ -1,22 +0,0 @@
-Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
-
-This is a Debian installation ${MEDIA_TYPE},
-built on ${BUILD_DATE}.
-
-The default option is 'install'. For maximum
-control, you can use the 'expert' option.
-
-If the system fails to boot at all (the typical
-symptom is a white screen which doesn't go away),
-use 'install video=ofonly' or 'expert video=ofonly'.
-
-The plain options are for the powerpc family of
-processors (from 601 to G4). The *-power3 options
-are for IBM Power3 boxes, and the *-power4 options
-are for IBM Power4 and Apple G5 boxes. Press the tab
-key for a list of options, or type 'help' for help.
-
-************************************
-If in doubt, just choose 'install', and if that 
-doesn't work, try 'install video=ofonly'.
-************************************
diff --git a/data/etch/yaboot/ofboot.b b/data/etch/yaboot/ofboot.b
 deleted file mode 100644
index 179602d..0000000
--- a/data/etch/yaboot/ofboot.b
+++ /dev/null
@@ -1,64 +0,0 @@
-<CHRP-BOOT>
-<COMPATIBLE>
-MacRISC MacRISC3 MacRISC4
-</COMPATIBLE>
-<DESCRIPTION>
-GNU/Linux PPC bootloader
-</DESCRIPTION>
-<BOOT-SCRIPT>
-" screen" output
-load-base release-load-area
-boot cd:,\install\yaboot
-</BOOT-SCRIPT>
-<OS-BADGE-ICONS>
-1010
-000000000000F8FEACF6000000000000
-0000000000F5FFFFFEFEF50000000000
-00000000002BFAFEFAFCF70000000000
-0000000000F65D5857812B0000000000
-0000000000F5350B2F88560000000000
-0000000000F6335708F8FE0000000000
-00000000005600F600F5FD8100000000
-00000000F9F8000000F5FAFFF8000000
-000000008100F5F50000F6FEFE000000
-000000F8F700F500F50000FCFFF70000
-00000088F70000F50000F5FCFF2B0000
-0000002F582A00F5000008ADE02C0000
-00090B0A35A62B0000002D3B350A0000
-000A0A0B0B3BF60000505E0B0A0B0A00
-002E350B0B2F87FAFCF45F0B2E090000
-00000007335FF82BF72B575907000000
-000000000000ACFFFF81000000000000
-000000000081FFFFFFFF810000000000
-0000000000FBFFFFFFFFAC0000000000
-000000000081DFDFDFFFFB0000000000
-000000000081DD5F83FFFD0000000000
-000000000081DDDF5EACFF0000000000
-0000000000FDF981F981FFFF00000000
-00000000FFACF9F9F981FFFFAC000000
-00000000FFF98181F9F981FFFF000000
-000000ACACF981F981F9F9FFFFAC0000
-000000FFACF9F981F9F981FFFFFB0000
-00000083DFFBF981F9F95EFFFFFC0000
-005F5F5FDDFFFBF9F9F983DDDD5F0000
-005F5F5F5FDD81F9F9E7DF5F5F5F5F00
-0083DD5F5F83FFFFFFFFDF5F835F0000
-000000FBDDDFACFBACFBDFDFFB000000
-000000000000FFFFFFFF000000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFFFF00000000
-00000000FFFFFFFFFFFFFFFFFF000000
-00000000FFFFFFFFFFFFFFFFFF000000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
-00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00
-00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFF000000
-</OS-BADGE-ICONS>
-</CHRP-BOOT>
diff --git a/data/etch/yaboot/yaboot.conf b/data/etch/yaboot/yaboot.conf
 deleted file mode 100644
index ac0024a..0000000
--- a/data/etch/yaboot/yaboot.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-## This yaboot.conf is for CD booting only, do not use as reference.
-## Debian GNU/Linux PowerPC (CODENAME)
-
-# It is important not to have a comma after cd:
-device=cd:
-default=install
-
-# FIXME: will this be the correct path?
-message=/install/boot.msg
-
-# Powerpc subarch 
-image=/install/powerpc/vmlinux
-	label=install-powerpc
-	alias=install
-	initrd=/install/powerpc/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-image=/install/powerpc/vmlinux
-	label=expert-powerpc
-	alias=expert
-	initrd=/install/powerpc/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-# Power3 subarch
-image=/install/power3/vmlinux
-	label=install-power3
-	initrd=/install/power3/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-image=/install/power3/vmlinux
-	label=expert-power3
-	initrd=/install/power3/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-# Power 4 subarch
-image=/install/power4/vmlinux
-	label=install-power4
-	initrd=/install/power4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-image=/install/power4/vmlinux
-	label=expert-power4
-	initrd=/install/power4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-# ... and now massive clone-and-hack for 2.4 ...
-
-# Powerpc subarch 
-image=/install/powerpc/2.4/vmlinux
-	label=install-powerpc-2.4
-	alias=install-2.4
-	initrd=/install/powerpc/2.4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-image=/install/powerpc/2.4/vmlinux
-	label=expert-powerpc-2.4
-	alias=expert-2.4
-	initrd=/install/powerpc/2.4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-# Power3 subarch
-image=/install/power3/2.4/vmlinux
-	label=install-power3-2.4
-	initrd=/install/power3/2.4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-image=/install/power3/2.4/vmlinux
-	label=expert-power3-2.4
-	initrd=/install/power3/2.4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-# Power 4 subarch
-image=/install/power4/2.4/vmlinux
-	label=install-power4-2.4
-	initrd=/install/power4/2.4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-image=/install/power4/2.4/vmlinux
-	label=expert-power4-2.4
-	initrd=/install/power4/2.4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
diff --git a/data/hfs.map b/data/hfs.map
 deleted file mode 100644
index 0d8b4cf..0000000
--- a/data/hfs.map
+++ /dev/null
@@ -1,12 +0,0 @@
-# ext.  xlate  creator  type    comment
-.hqx    Ascii  'BnHx'   'TEXT'  "BinHex file"
-.sit    Raw    'SIT!'   'SITD'  "StuffIT Expander"
-.mov    Raw    'TVOD'   'MooV'  "QuickTime Movie"
-.deb    Raw    'Debn'   'bina'  "Debian package"
-.bin    Raw    'ddsk'   'DDim'  "Floppy or ramdisk image"
-.img    Raw    'ddsk'   'DDim'  "Floppy or ramdisk image"
-.b      Raw    'UNIX'   'tbxi'  "bootstrap"
-yaboot  Raw    'UNIX'   'boot'  "bootstrap"
-vmlinux Raw    'UNIX'   'boot'  "bootstrap"
-.conf   Raw    'UNIX'   'conf'  "bootstrap"
-*       Ascii  '????'   '????'  "Text file"
diff --git a/data/macinstall-cd.tar.gz b/data/macinstall-cd.tar.gz
 deleted file mode 100644
index 268ab81..0000000
 Binary files a/data/macinstall-cd.tar.gz and /dev/null differ
diff --git a/data/potato/README.html.in b/data/potato/README.html.in
 deleted file mode 100644
index 74b874a..0000000
--- a/data/potato/README.html.in
+++ /dev/null
@@ -1,809 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML lang="en">
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<TITLE>Debian GNU/Linux -- The Universal Operating System</TITLE>
-<META NAME="Description" CONTENT="Debian GNU/Linux is a free distribution of the GNU/Linux operating system. It is maintained and updated through the work of many users who volunteer their time and effort.">
-<META NAME="Keywords" CONTENT="debian, GNU, linux, unix, open source, free, DFSG">
-<META NAME="Language" CONTENT="English">
-<meta name="Author" content="J.A. Bezemer, [e-mail]">
-</HEAD>
-<BODY text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#800080" alink="#FF0000">
-
-
-        <!-- The HTML and TEXT file are NOT the actual source code... -->
-        <!-- For that, see http://cdimage.debian.org/ch32.html -->
-#if 0
-        If you read THIS, you're viewing the actual source file ;-)
-#endif
-
-#undef i386
-#undef alpha
-#undef powerpc
-#undef ppc
-#undef sparc
-#undef ultrasparc
-#undef m68k
-#undef arm
-#undef binary
-#undef bin
-#undef source
-#undef src
-
-#if OUTPUTtext
-#define	  href  nothing
-#endif
-
-#include <README.diskdefines>
-
-
-#if OUTPUThtml
-<div align=right>
-(<a href="README.txt">Text version</a>)
-</div>
-<TABLE border="0" cellpadding="3" cellspacing="0" align="center" summary="">
-<TR>
-<TD>
-<IMG src="pics/logo-50.jpg" border="0" hspace="0" vspace="0" alt=""
-  width="50" height="61"></A>
-<IMG src="pics/debian.jpg" border="0" hspace="0" vspace="0"
-  alt="Debian" width="179" height="61">
-</TD>
-</TR>
-</TABLE>
-#endif 
-#if OUTPUTtext
-<div align=right>
-(HTML version in README.html)
-</div>
-#endif
-
-
-<TABLE bgcolor="#DF0451" border="0" cellpadding="0" cellspacing="0"
-  width="100%" summary="">
-<TR>
-<TD valign="top">
-<img src="pics/red-upperleft.png" align="left" border="0" hspace="0"
-  vspace="0" alt="" width="15" height="16">
-</TD>
-<TD rowspan="2" align="center">
-
- <CENTER>
- <TABLE border="0" cellpadding="2" cellspacing="0" align="center">
- <TR><TD bgcolor="#000084">
- <CENTER><FONT COLOR="#FFFFFF" FACE="helvetica,arial"><B>&nbsp;&nbsp;
-#if 0
- Debian GNU/Linux 2.2 "Potato" - Official i386 Binary-1 CD
-#endif
- DISKNAME CD
- &nbsp;&nbsp;</B></FONT></CENTER>
- </TD><TR>
- </TABLE>
- </CENTER>
-
-</TD>
-<TD valign="top">
-<img src="pics/red-upperright.png" align="right" border="0" hspace="0"
-  vspace="0" alt="" width="16" height="16">
-</TD>
-</TR>
-<TR>
-<TD valign="bottom">
-<img src="pics/red-lowerleft.png" align="left" border="0" hspace="0"
-  vspace="0" alt="" width="16" height="16">
-</TD>
-<TD valign="bottom">
-<img src="pics/red-lowerright.png" align="right" border="0" hspace="0"
-vspace="0" alt="" width="15" height="16">
-</TD>
-</TR>
-</TABLE>
-
-<TABLE border="0" cellpadding="2" cellspacing="0" width="100%" summary="">
-<TR>
-        <TD></TD>
-</TR>
-</TABLE>
-
-
-<TABLE border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-<TR>
-        <TD colspan="3" valign="top" width="20%" bgcolor="#BBDDFF">
-          <img src="pics/blue-upperleft.png" align="left" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-          <img src="pics/blue-upperright.png" align="right" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-        </TD>
-</TR>
-<TR>
-        <TD bgcolor="#BBDDFF">&nbsp;&nbsp;</TD>
-
-        <TD valign="TOP" bgcolor="#BBDDFF">
-
-<FONT face="Arial,Helvetica">
-
-#if OUTPUThtml
-<P><B><A href="http://www.debian.org/">Debian homepage</A></B></P>
-#endif
-
-&nbsp;<BR>
-<P>
-
-#if OUTPUTtext
-&nbsp;<BR>
-CONTENTS:
-<BR>
-&nbsp;<BR>
-<UL>
-#endif
-
-#if OUTPUTtext
-<LI>
-#endif
-
-<A href="#intro">Intro</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-<A href="#thiscd">About This CD</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-<A href="#install">Installing</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-#if ARCHi386 || ARCHalpha || ARCHm68k || ARCHsparc
- <A href="#upgrade">Upgrading</A>
- <P>
-
-#if OUTPUTtext
-  </LI><LI>
-#endif
-#endif
-
-#ifndef UNOFFEXTRAS
-<A href="#lastmin">Last-Minute Notes</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-#endif
-
-#if TYPEbinary
- <A href="#apt">Using CDs with Dselect and Apt</A>
- <P>
-
-#if OUTPUTtext
-  </LI><LI>
-#endif
-#endif
-
-#ifndef UNOFFEXTRAS
-<A href="#nonfree">Non-free/Non-US</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-#endif
-
-#ifndef UNOFFEXTRAS
-<A href="#cdmanuf">CD Manufacturers</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-#endif
-
-<A href="#other">More Information</A>
-
-<P>
-
-#if OUTPUThtml
-&nbsp;<P>
-<A href=".">Browse this CD-ROM</A></P>
-<P>
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt>
-</P>
-#endif
-
-
-</FONT>
-
-#if OUTPUTtext
-</LI>
-</UL>
-#endif
-
-
-        </TD>
-        <TD bgcolor="#BBDDFF">&nbsp;&nbsp;</TD>
-        <TD>&nbsp;&nbsp;</TD>
-
-  <TD valign="TOP" width="80%">
-
-<CENTER>
-<FONT SIZE="+2"><B><I>
-Welcome to the exciting world of
-</I></B></FONT>
-<BR>
-<FONT SIZE="+3"><B><I>
-Debian GNU/Linux!
-</I></B></FONT>
-</CENTER>
-
-<A name="intro">
-<P><H2>
-Intro
-#if OUTPUTtext
-<BR>
-=====
-#endif
-</H2>
-</a>
-
-This is one of the CD-ROMs of the
-<a href="http://www.debian.org/">Debian GNU/Linux</a>
-distribution. Debian is a
-very extensive collection of software. But it is more. It is a complete
-Operating System (OS) for your computer. And it is
-<A href="http://www.debian.org/intro/free">free</A>
-(as in &quot;freedom&quot;).
-<P>
-An operating system is the set of basic programs
-and utilities that make your computer run. At the core of an operating
-system is the kernel. The kernel is the most fundamental program on the
-computer, which does all the basic housekeeping and lets you start other
-programs.
-Debian is kernel independent. It currently uses the
-<A href="http://www.linux.org/">Linux</A> kernel but work is
-in progress to provide Debian for other kernels, using
-<A href="http://www.gnu.org/software/hurd/hurd.html">the Hurd</A>.
-Most of the basic operating system tools
-come from the <a href="http://www.gnu.org/">GNU project</A>; hence the name
-GNU/Linux.
-<P>
-
-Debian is available for various kinds of computers
-(&quot;architectures&quot;), like
-&quot;IBM-compatible&quot; PCs (<i>i386</i>),
-Compaq's <i>Alpha</i>,
-Motorola's 680x0 (<i>m68k</i>),
-Sun's <i>Sparc</i>,
-Motorola/IBM's <i>PowerPC</i>, and <i>(Strong)ARM</i> processors.
-Check the <A href="http://www.debian.org/ports">ports</A> page
-#if OUTPUTtext
-(http://www.debian.org/ports)
-#endif
-for more information.
-<P>
-
-#if OUTPUTtext
-Read more at <P>
-&nbsp; http://www.debian.org/intro/about
-#endif
-#if OUTPUThtml
-<A href="http://www.debian.org/intro/about">Read more...</A>
-#endif
-
-<A name="thiscd">
-#if OUTPUTtext
-<P>&nbsp;<P><H2>
-#endif
-#if OUTPUThtml
-<P><HR><P><H2>
-#endif
-About This CD
-#if OUTPUTtext
-<BR>
-=============
-#endif
-</H2>
-</a>
-
-This CD-ROM is labeled
-<P>
-<tt>&nbsp;
-  DISKNAME
-</tt>
-<P>
-#ifndef UNOFFEXTRAS
-which means that this CD is number DISKNUM of totally TOTALNUM CDs containing
-#if TYPEbinary
-programs ("binaries") for `ARCH' computers.
-<P>
-The programs on the Binary CDs are ordered by popularity. The Binary-1 CD
-contains the most popular programs and the installation tools; it is possible
-to install and run Debian with only the Binary-1 CD. The other CDs, up to
-Binary-TOTALNUM, contain mostly special-interest programs.
-#endif
-#if TYPEsource
-the source code of programs in the Debian OS.
-<P>
-The source packages on the Source CDs are ordered by popularity, like
-the programs on the Binary CDs. This means that the source code of the
-programs on the Binary-DISKNUM CD can most likely be found on this CD
-(though there may be some variation due to size issues).
-#endif
-#else
-#include <unoffextrascd.html.in>
-#endif
-
-<A name="install">
-#if OUTPUTtext
-<P>&nbsp;<P><H2>
-#endif
-#if OUTPUThtml
-<P><HR><P><H2>
-#endif
-Installing
-#if OUTPUTtext
-<BR>
-==========
-#endif
-</H2>
-</a>
-
-#if DISKNUM1 && TYPEbinary
-
- Because Debian is a complete Operating System, the installation procedure
- may seem a bit unusual. You can install Debian GNU/Linux either
- <i>next to</i> your current OS, or as <i>only</i> OS on your computer.
-
- <P>
- Read the <i>Installation Manual</i>, on this CD at
- <P>
- <tt>&nbsp;
- <A href="install/doc/install.en.html">/install/doc/install.en.html</a> &nbsp;&nbsp;&nbsp; </tt>
-					(English version).
- <P>
- Translations of the <i>Installation Manual</i>, and plain-text and PDF
- versions, are also available in the 
- <P>
- <tt>&nbsp;
- <A href="install/doc/">/install/doc</a></tt>
- <P>
- directory, along with various other documents.
- <P>
- Programs and other files that are needed for the installation can be found on
- this CD under
- <P>
- <tt>&nbsp;
- <A href=%%""dists/potato/main/disks-ARCH/%%"">/dists/potato/main/disks-ARCH</a>
- </tt>
-
-#if ARCHi386 || ARCHalpha || ARCHpowerpc || ARCHsparc
-  <P>
-  For the impatient ones:
-#endif
-
-#if ARCHi386 || ARCHalpha || ARCHsparc
-  you can start the installation program easily by booting off this CD-ROM.
-  Note that not all (esp. older) systems support this. 
-  <P>
-#endif
-
-#if ARCHi386 || ARCHpowerpc
-#if ARCHi386
-   You can also
-#else
-   you can
-#endif
-  examine the
-  <P>
-  <tt>&nbsp;
-  <a href="install/">/install</a>
-  </tt>
-  <P>
-  directory; you might be able to start the installation system directly
-  from there. 
-#endif
-
-#else
- The installation tools of the Debian Operating System are located on the
- Binary-1 CD.
- See the README on that CD for more info.
-#endif
-
-#if ARCHi386 || ARCHalpha || ARCHm68k || ARCHsparc
- <A name="upgrade">
-#if OUTPUTtext
-  <P>&nbsp;<P><H2>
-#endif
-#if OUTPUThtml
-  <P><HR><P><H2>
-#endif
- Upgrading
-#if OUTPUTtext
-  <BR>
-  =========
-#endif
- </H2>
- </a>
-
-#if DISKNUM1 && TYPEbinary
-
-  If you are already running an older version of the Debian GNU/Linux
-  Operating System, you may want to upgrade to version 2.2.
-  <P>
-  Upgrading procedures, and things needed for the upgrade, can be found on
-  this CD in the
-  <P>
-  <tt>&nbsp;
-  <A href="upgrade/">/upgrade</a>
-  </tt>
-  <P>
-  directory.
-
-#else
-  Procedures describing the upgrade from an older version of the Debian
-  Operating System are also located on the Binary-1 CD.
-  See the README on that CD for more info.
-#endif
-#endif
-
-#ifndef UNOFFEXTRAS
-<A name="lastmin">
-#if OUTPUTtext
-<P>&nbsp;<P><H2>
-#endif
-#if OUTPUThtml
-<P><HR><P><H2>
-#endif
-Last-Minute Notes
-#if OUTPUTtext
-<BR>
-=================
-#endif
-</H2>
-</a>
-
-<UL>
-
-<LI>
-It is possible to run a Debian GNU/Linux 2.2 system with a new Linux kernel 
-version 2.4.x. For that, you may need to upgrade one or more software
-packages to a newer version than available on this CD. Read
-<a href="http://www.fs.tum.de/~bunk/kernel-24.html">http://www.fs.tum.de/~bunk/kernel-24.html</a>
-for more information.
-<BR>
-Note that Debian does not officially recommend running a Linux kernel 2.4.x
-at this moment.
-<BR>&nbsp;
-</LI>
-
-<LI>
-The K Desktop Environment (KDE) version 2 was not finished when Debian 2.2
-was released, and is therefore not included. However, KDE2 packages
-for Debian 2.2 are available for download at
-<a href="http://kde.debian.net/">http://kde.debian.net</a>&nbsp;.
-<BR>&nbsp;
-</LI>
-
-<LI>
-At this moment, there are no Debian 2.2 packages available of the recently
-released version 4.0 of XFree86 (the open-source implementation of the X Window
-System). If you really need to run XFree86&nbsp;4, you have to (partially)
-upgrade your system to the &quot;testing&quot; or &quot;unstable&quot;
-distribution.
-<BR>&nbsp;
-</LI>
-
-#if 0
-<LI>
-The Linux kernel version 2.2.15 on these CDs has been patched 
-to correct the <tt>seteuid</tt> problem with the fix from 2.2.16.
-<!-- http://www.debian.org/Lists-Archives/debian-release-0006/msg00011.html -->
-
-<BR>&nbsp;
-</LI>
-#endif
-
-<LI>
-More last-minutes notes for this CD may be available on
-<a href="http://www.debian.org/CD/releases/">http://www.debian.org/CD/releases/</a>
-</LI>
-
-</UL>
-#endif
-
-#if TYPEbinary
- <A name="apt">
-#if OUTPUTtext
-  <P>&nbsp;<P><H2>
-#endif
-#if OUTPUThtml
-  <P><HR><P><H2>
-#endif
- Using CDs with Dselect and Apt
-#if OUTPUTtext
-  <BR>
-  ==============================
-#endif
- </H2>
- </a>
-
- After installing or upgrading, Debian's packaging system can use CD-ROMs,
- local collections, or networked servers (FTP, HTTP) to automatically
- install software from (<tt>.deb</tt> <i>packages</i>). This is done
- preferably with the `apt' and `dselect' programs. If you do not already
- know how to setup these, here is a brief explanation.
- <P>
-
-#define CDROMreadme	1
-#include "apt-setup.html.in"
-
- <P>
-
- Once this is done, you can install packages from the commandline using
- <tt>apt-get</tt>. For example, if you want to install the packages
- `commprog' and `maxgame', you can give the command
- <P>
- <tt>&nbsp;
-   apt-get install commprog maxgame
- </tt>
- <P>
- Note that you don't have to enter the complete path, or the
- `<tt>.deb</tt>' extension. `Apt' will figure this out itself. 
-
- <P>
-
- `<tt>Dselect</tt>' is also able to use `apt' to fetch the packages. To set
- up `<tt>dselect</tt>', choose [A]ccess in the main menu, and then select
- `apt'. The <tt>sources.list</tt> file should be okay already, so don't let
- the program make a new one. Then, after an [U]pdate, the configuration is
- ready. You can just keep using [S]elect and [I]nstall to install packages. 
- <P>
- See <tt>dselect</tt>'s online help screens for more information (use the
- `<tt>?</tt>' key).
-
-#endif
-
-
-#ifndef UNOFFEXTRAS
-<A name="nonfree">
-#if OUTPUTtext
-<P>&nbsp;<P><H2>
-#endif
-#if OUTPUThtml
-<P><HR><P><H2>
-#endif
-Non-free and Non-US
-#if OUTPUTtext
-<BR>
-===================
-#endif
-</H2>
-</a>
-
-The package sections `non-free' and `non-US' contain packages that either
-have a restrictive license, or can't be exported from the US (like `pgp'
-or `ssh'). It may well be that this CD does not contain (all of) these
-packages. You can get them from our FTP/HTTP mirror sites.
-
-<P>
-`Non-free' packages are on our "regular" mirrors, listed in
-<a href="README.mirrors.html">README.mirrors.html</a> on this CD, or on
-<a href="http://www.debian.org/distrib/ftplist">http://www.debian.org/distrib/ftplist</a> ("Full list of mirrors").
-
-<P>
-`Non-US' packages are on special mirrors outside the US, listed in
-<a href="README.non-US">README.non-US</a> on this CD, or on
-<a href="http://www.debian.org/misc/README.non-US">http://www.debian.org/misc/README.non-US</a>.
-
-<P>
-Note that you <i>are</i> allowed to <i>import</i> non-US packages into the US.
-#endif
-
-#ifndef UNOFFEXTRAS
-<A name="cdmanuf">
-#if OUTPUTtext
-<P>&nbsp;<P><H2>
-#endif
-#if OUTPUThtml
-<P><HR><P><H2>
-#endif
-CD Manufacturers
-#if OUTPUTtext
-<BR>
-================
-#endif
-</H2>
-</a>
-
-You are completely free to manufacture and (re-)distribute CD-ROMs of the
-Debian GNU/Linux Operating System, like this one. There is no charge from
-us (but of course donations are always welcome). 
-
-<P>
-
-For all needed information, and contact addresses, please refer to
-<P>
-<tt>&nbsp;
-  <a href="http://www.debian.org/CD/">http://www.debian.org/CD/</a>
-</tt>
-#endif
-
-<A name="other">
-#if OUTPUTtext
-<P>&nbsp;<P><H2>
-#endif
-#if OUTPUThtml
-<P><HR><P><H2>
-#endif
-More Information
-#if OUTPUTtext
-<BR>
-================
-#endif
-</H2>
-</a>
-
-#if DISKNUM1 && TYPEbinary
-
-There is much more information present on this CD. Besides the already
-mentioned installation and upgrading procedures, this is the most
-interesting:  <P>
-
-<UL>
-<LI>
-
-#if OUTPUTtext
-/doc/FAQ
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/FAQ/">Debian FAQ</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/constitution.txt
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/constitution.txt">The Debian Constitution</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/debian-manifesto
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/debian-manifesto">The Debian Manifesto</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/social-contract.txt
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/social-contract.txt">Debian's Social Contract</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/bug-reporting.txt
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/bug-reporting.txt">Bug reporting instructions</a>
-
-</LI>
-</UL>
-
-#else
-
-The Binary-1 CD contains much more information about various aspects
-of the Debian Operating System and the Debian organization.
- See the README on that CD for more info.
-
-#endif
-
-<P>
-Also on the Internet are many resources. To name a few:
-<P>
-
-<UL>
-<LI>
-
-#if OUTPUTtext
-http://www.debian.org
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.debian.org/">The Debian homepage</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.debian.org/doc
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.debian.org/doc/">Debian Documentation</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.debian.org/support
- &nbsp;
-#endif
-<A href="http://www.debian.org/support">Debian User Support</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.linuxdoc.org
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.linuxdoc.org/">The Linux Documentation Project</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.linux.org
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.linux.org/">General Linux homepage</a>
-
-</LI>
-</UL>
-
-<P>
-
-<DIV align="center">
-
-#if OUTPUTtext
-&nbsp;<br>
-&nbsp;<br>
-#endif
-#if OUTPUThtml
-<HR>
-#endif
-
-<SMALL>See the Debian
-<A href="http://www.debian.org/contact">contact page</A>
-
-#if OUTPUTtext
-(http://www.debian.org/contact)
-#endif
-
-for information on contacting us.
-	</SMALL><P>
-<SMALL>
-
-Last Modified: Wed Apr 18 19:09:34 CEST 2001
-
-<BR></SMALL>
-</DIV>
-
-  </TD>
-  </TR>
-  <TR>
-        <TD colspan="3" valign="bottom" width="20%" bgcolor="#BBDDFF">
-          <img src="pics/blue-lowerleft.png" align="left" border="0"
-            hspace="0" vspace="0" alt="" width="17" height="16">
-          <img src="pics/blue-lowerright.png" align="right" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-        </TD>
-  </TR>
-  </TABLE>
-
-</BODY>
-</HTML>
diff --git a/data/potato/apt-setup.html.in b/data/potato/apt-setup.html.in
 deleted file mode 100644
index 9e4f593..0000000
--- a/data/potato/apt-setup.html.in
+++ /dev/null
@@ -1,256 +0,0 @@
-
-First of all, comment out every line of <tt>/etc/apt/sources.list</tt> by
-placing a hash sign (`<tt>#</tt>') in front of it (if it isn't already
-there). 
-
-<P>
-
-Then you need to add new "<tt>deb</tt>" lines describing the location(s)
-where apt will get the new packages from. You can add "<tt>deb</tt>" lines
-for a packages mirror on a local harddisk, and/or FTP/HTTP mirrors, and/or
-(a set of)  CD-ROMs. `Apt' will consider all packages that can be found
-via any "<tt>deb</tt>" line, and use the one with the highest version
-number, giving priority to the first mentioned lines. (So, in case of
-multiple mirror locations, you'd typically first name a local harddisk,
-then CD-ROMs, and finally FTP/HTTP mirrors.) 
-
-<P>
-<UL>
-<LI>
-For an archive on a local harddisk, that for example has these directories,
-
-#if OUTPUTtext
-<PRE>
-
-         /var/ftp/debian/dists/potato/main/binary-ARCH/...
-         /var/ftp/debian/dists/potato/contrib/binary-ARCH/...
-         ---------------       ------     |\ 
-               \________          \_      | \___
-       add:             \           \     |     \ 
-                  --------------- ------  |      \ 
-         deb file:/var/ftp/debian potato main contrib
-
-</PRE>
-#endif
-#if OUTPUThtml
-<PRE>
-  /var/ftp/debian/dists/potato/main/binary-ARCH/...
-  /var/ftp/debian/dists/potato/contrib/binary-ARCH/...
-  ---------------       ------     |\ 
-        \________          \_      | \___
-add:             \           \     |     \ 
-           --------------- ------  |      \ 
-  deb file:/var/ftp/debian potato main contrib
-</PRE>
-#endif
-
-  As shown, the `<tt>dists</tt>' is added implicitly, and the 3rd
-  and following arguments are used to expand the path into multiple
-  directories.
-
-<BR>&nbsp;<BR>
-
-  If you have a complete mirror that also has non-free and non-US, you
-  typically have to add lines like these:
-
-<BR>&nbsp;<BR>
-
-<tt>&nbsp;
-    deb file:/var/ftp/debian potato main contrib non-free <BR>
-&nbsp;
-    deb file:/var/ftp/debian-non-US potato/non-US main contrib non-free
-</tt>
-
-<BR>&nbsp;<BR>
-
-  If you don't have such a structure, other description lines  are
-  possible, see the <tt>sources.list</tt>
-#if MANPAGEseebelow
-  manpage (see below).
-#else
-  manpage.
-#endif
-
-</LI>
-<BR>&nbsp;<BR>
-<LI>
-
-FTP and HTTP packages mirror addresses can be found on
-
-#if CDROMreadme
-#if OUTPUTtext
-this CD in README.mirrors.txt, or on
-#endif
-#if OUTPUThtml
-this CD in <a href="README.mirrors.html">README.mirrors.html</a>, or on
-#endif
-#endif
-
-#if OUTPUTtext
-  http://www.debian.org/distrib/ftplist,
-#endif
-#if OUTPUThtml
-  <a href="http://www.debian.org/distrib/ftplist">http://www.debian.org/distrib/ftplist</a>,
-#endif
-  look at the "Full list of mirrors".
-
-<BR>&nbsp;<BR>
-
-  If the mirror has these directories:
-
-#if OUTPUTtext
-<PRE>
-
-         ftp://some-server/debian/dists/potato/main/binary-ARCH/...
-         ftp://some-server/debian/dists/potato/contrib/binary-ARCH/...
-         ------------------------       ------ |   |
-                     \___                 /    |   |
-       add:              \               /     |   |
-             ------------------------ ------   |   |
-         deb ftp://some-server/debian potato main contrib
-
-</PRE>
-#endif
-#if OUTPUThtml
-<PRE>
-  ftp://some-server/debian/dists/potato/main/binary-ARCH/...
-  ftp://some-server/debian/dists/potato/contrib/binary-ARCH/...
-  ------------------------       ------ |   |
-              \___                 /    |   |
-add:              \               /     |   |
-      ------------------------ ------   |   |
-  deb ftp://some-server/debian potato main contrib
-</PRE>
-#endif
-
-  As shown, the `<tt>dists</tt>' is added implicitly, and the 3rd
-  and following arguments are used to expand the path into multiple
-  directories.
-
-<BR>&nbsp;<BR>
-
-  If you use a complete mirror that also has non-free and non-US, you
-  typically have to add lines like these:
-
-<BR>&nbsp;<BR>
-
-<tt>&nbsp;
-    deb ftp://some-server/debian potato main contrib non-free <BR>
-&nbsp;
-    deb ftp://some-server/debian-non-US potato/non-US main contrib non-free
-</tt>
-
-<BR>&nbsp;<BR>
-
-  If the mirror doesn't have such a structure, other description lines are
-  possible, see the <tt>sources.list</tt>
-#if MANPAGEseebelow
-  manpage (see below).
-#else
-  manpage.
-#endif
-
-#if UPGRADING
-<BR>&nbsp;<BR>
-
-  NOTE: if you're using the static versions of `apt' and `dpkg' from this
-  directory, the hostname-lookup is "broken" (which is one reason to just
-  use slink's `apt'). The solution is to simply put the mirrors' IP address
-  in the "<tt>deb</tt>" line. (Hint: "<tt>nslookup some-server</tt>")
-#endif
-
-</LI>
-<BR>&nbsp;<BR>
-<LI>
-
-If you use (one or more) CD-ROMs, do _not_ add any lines to sources.list
-  manually.
-
-<BR>&nbsp;<BR>
-
-  Instead, first make sure there is a line in <tt>/etc/fstab</tt> that
-  connects the <tt>/cdrom</tt> mount point with your CD-ROM drive (the
-  exact `<tt>/cdrom</tt>' mount point is "required" for apt). For example,
-  if
-#if ARCHi386
-<tt>/dev/hdc</tt>
-#else
-<tt>/dev/scd0</tt>
-#endif
-  is your CD-ROM drive, <tt>/etc/fstab</tt> should
-  contain a line
-
-#if ARCHi386
-#if OUTPUTtext
-<PRE>
-
-         /dev/hdc      /cdrom     auto    defaults,noauto,ro     0   0
-
-</PRE>
-#endif
-#if OUTPUThtml
-<PRE>
-  /dev/hdc      /cdrom     auto    defaults,noauto,ro     0   0
-</PRE>
-#endif
-#else
-#if OUTPUTtext
-<PRE>
-
-         /dev/scd0     /cdrom     auto    defaults,noauto,ro     0   0
-
-</PRE>
-#endif
-#if OUTPUThtml
-<PRE>
-  /dev/scd0     /cdrom     auto    defaults,noauto,ro     0   0
-</PRE>
-#endif
-#endif
-
-  To test this, insert a CD-ROM and give commands
-
-<BR>&nbsp;<BR>
-
-    <tt>&nbsp; mount /cdrom</tt><BR>
-    <tt>&nbsp; ls -alF /cdrom &nbsp;&nbsp;&nbsp;</tt>
-                            (this should show the CD-ROM's root directory)<BR>
-    <tt>&nbsp; umount /cdrom</tt>
-
-<BR>&nbsp;<BR>
-
-  Then, use the command
-
-<BR>&nbsp;<BR>
-
-<tt>&nbsp;
-    apt-cdrom add
-</tt>
-
-<BR>&nbsp;<BR>
-
-  to add the data of each CD-ROM to apt's internal database.
-  This command will ask for one CD-ROM per run, and mount/unmount the
-  CD-ROM automatically. You should repeat this command for all 2.2 `Binary'
-  CD-ROMs you have.
-
-#if UPGRADING
-(`Source' CD-ROMs can be added as well, but only with the
-  latest version of `apt' from this directory, and they are not needed for
-  the upgrade anyway.)
-#endif
-
-</LI>
-</UL>
-<P>
-
-When the <tt>sources.list</tt> is correct,
-the final step of the preparation is to update apt's internal database
-with the command
-
-<P>
-
-<tt>&nbsp;
-  apt-get update
-</tt>
-
diff --git a/data/potato/yaboot/yaboot.conf b/data/potato/yaboot/yaboot.conf
 deleted file mode 100644
index 8e15b9f..0000000
--- a/data/potato/yaboot/yaboot.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-## This yaboot.conf is for CD booting only, do not use as reference.
-## Debian GNU/Linux PowerPC (CODENAME)
-
-init-message="Debian GNU/Linux PowerPC (CODENAME)"
-
-# It is important not to have a comma after cd:
-device=cd:
-timeout=100
-
-# potato needs \\ kludge because potato's yaboot is anchient broken crap
-image=\\install\\powermac\\vmlinux
-	label=debian
-	initrd=\\install\\powermac\\root.bin
-	initrd-size=8192
-	read-only
-
-# some machines have wonky framebuffer support
-image=\\install\\powermac\\vmlinux
-	label=debian-novideo
-	initrd=\\install\\powermac\\root.bin
-	initrd-size=8192
-	append="video=ofonly"
-	read-only
diff --git a/data/sarge/README.html.in b/data/sarge/README.html.in
 deleted file mode 100644
index 09de5d1..0000000
--- a/data/sarge/README.html.in
+++ /dev/null
@@ -1,693 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  <title>Debian GNU/Linux -- The Universal Operating System</title>
-  <meta name="Description" content="Debian GNU/Linux is a free distribution of the GNU/Linux operating system. It is maintained and updated through the work of many users who volunteer their time and effort.">
-  <meta name="Keywords" content="debian, GNU, linux, unix, open source, free, DFSG">
-  <meta name="Language" content="English">
-  <meta name="Author" content="J.A. Bezemer, [e-mail]">
-  <link rev="made" href="mailto:[e-mail]">
-</head>
-<body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#800080" alink="#FF0000">
-
-  <!-- The HTML and TEXT file are NOT the actual source code. -->
-  <!-- For that, see http://cvs.debian.org/debian-cd/data/woody/README.html.in?cvsroot=debian-boot -->
-#if 0
-        If you read THIS, you're viewing the actual source file ;-)
-#endif
-
-#undef i386
-#undef amd64
-#undef alpha
-#undef powerpc
-#undef ppc
-#undef sparc
-#undef ultrasparc
-#undef m68k
-#undef arm
-#undef binary
-#undef bin
-#undef source
-#undef src
-
-#if OUTPUTtext
-#define	  href  nothing
-#endif
-
-#include <README.diskdefines>
-
-
-#if OUTPUThtml
-<div align=right>
-(<a href="README.txt">Text version</a>)
-</div>
-<table border="0" cellpadding="3" cellspacing="0" align="center" summary="">
-<tr>
-<td>
-<img src="pics/logo-50.jpg" border="0" hspace="0" vspace="0" alt="" width="50" height="61">
-<img src="pics/debian.jpg" border="0" hspace="0" vspace="0" alt="Debian" width="179" height="61">
-</td>
-</tr>
-</table>
-#endif 
-#if OUTPUTtext
-<div align=right>
-(HTML version in README.html)
-</div>
-#endif
-
-
-<table bgcolor="#DF0451" border="0" cellpadding="0" cellspacing="0"
-  width="100%" summary="">
-<tr>
-<td valign="top">
-<img src="pics/red-upperleft.png" align="left" border="0" hspace="0"
-  vspace="0" alt="" width="15" height="16">
-</td>
-<td rowspan="2" align="center">
-
- <table align="center" border="0" cellpadding="2" cellspacing="0">
- <tr><td bgcolor="#000084">
- <div align="center"><font color="#FFFFFF" face="helvetica,arial"><B>&nbsp;&nbsp;
-#if 0
- Debian GNU/Linux 2.2 "Potato" - Official i386 Binary-1 CD
-#endif
- DISKNAME CD
- &nbsp;&nbsp;</B></font></div>
- </td></tr>
- </table>
-
-</td>
-<td valign="top">
-<img src="pics/red-upperright.png" align="right" border="0" hspace="0"
-  vspace="0" alt="" width="16" height="16">
-</td>
-</tr>
-<tr>
-<td valign="bottom">
-<img src="pics/red-lowerleft.png" align="left" border="0" hspace="0"
-  vspace="0" alt="" width="16" height="16">
-</td>
-<td valign="bottom">
-<img src="pics/red-lowerright.png" align="right" border="0" hspace="0"
-vspace="0" alt="" width="15" height="16">
-</td>
-</tr>
-</table>
-
-<table border="0" cellpadding="2" cellspacing="0" width="100%" summary="">
-<tr>
-        <td></td>
-</tr>
-</table>
-
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-<tr>
-        <td colspan="3" valign="top" width="20%" bgcolor="#BBDDFF">
-          <img src="pics/blue-upperleft.png" align="left" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-          <img src="pics/blue-upperright.png" align="right" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-        </td>
-</tr>
-<tr>
-        <td bgcolor="#BBDDFF">&nbsp;&nbsp;</td>
-
-        <td valign="TOP" bgcolor="#BBDDFF">
-
-<font face="Arial,Helvetica">
-
-#if OUTPUThtml
-<P><B><A href="http://www.debian.org/">Debian home&nbsp;page</A></B></P>
-#endif
-
-&nbsp;<br>
-<P>
-
-#if OUTPUTtext
-&nbsp;<br>
-CONTENTS:
-<br>
-&nbsp;<br>
-<UL>
-#endif
-
-#if OUTPUTtext
-<LI>
-#endif
-
-<A href="#intro">Intro</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-<A href="#thiscd">About This CD</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-<A href="#install">Installing</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-#ifndef UNOFFEXTRAS
-<A href="#lastmin">Last-Minute Notes</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-#endif
-
-#if TYPEbinary
- <A href="#apt">Using CDs with apt</A>
- <P>
-
-#if OUTPUTtext
-  </LI><LI>
-#endif
-#endif
-
-#ifndef UNOFFEXTRAS
-<A href="#cdmanuf">CD Manufacturers</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-#endif
-
-<A href="#other">More Information</A>
-
-<P>
-
-#if OUTPUThtml
-&nbsp;<P>
-<A href=".">Browse this CD-ROM</A></P>
-<P>
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt>
-</P>
-#endif
-
-
-</font>
-
-#if OUTPUTtext
-</LI>
-</UL>
-#endif
-
-
-        </td>
-        <td bgcolor="#BBDDFF">&nbsp;&nbsp;</td>
-        <td>&nbsp;&nbsp;</td>
-
-  <td valign="TOP" width="80%">
-
-<div align="center">
-<big><big><B><I>
-Welcome to the exciting world of
-</I></B></big></big>
-<br>
-<big><big><big><B><I>
-Debian GNU/Linux!
-</I></B></big></big></big>
-</div>
-
-<P><H2><A name="intro">
-Intro
-#if OUTPUTtext
-<br>
-=====
-#endif
-</H2>
-</a>
-<p>
-This is one of the CD-ROMs of the
-<a href="http://www.debian.org/">Debian GNU/Linux</a>
-distribution. Debian is a
-very extensive collection of software. But it is more. It is a complete
-Operating System (OS) for your computer. And it is
-<A href="http://www.debian.org/intro/free">free</A>
-(as in &quot;freedom&quot;).
-<P>
-An operating system is the set of basic programs
-and utilities that make your computer run. At the core of an operating
-system is the kernel. The kernel is the most fundamental program on the
-computer, which does all the basic housekeeping and lets you start other
-programs.
-Debian is kernel independent. It currently uses the
-<A href="http://www.linux.org/">Linux</A> kernel but work is
-in progress to provide Debian for other kernels, using
-<A href="http://www.gnu.org/software/hurd/hurd.html">the Hurd</A>.
-Most of the basic operating system tools
-come from the <a href="http://www.gnu.org/">GNU project</A>; hence the name
-GNU/Linux.
-<P>
-
-Debian is available for various kinds of computers
-(&quot;architectures&quot;), like
-&quot;IBM-compatible&quot; PCs (<i>i386</i>),
-Compaq's <i>Alpha</i>,
-Motorola's 680x0 (<i>m68k</i>),
-Sun's <i>Sparc</i>,
-Motorola/IBM's <i>PowerPC</i>, and <i>(Strong)ARM</i> processors.
-Check the <A href="http://www.debian.org/ports">ports</A> page
-#if OUTPUTtext
-(http://www.debian.org/ports)
-#endif
-for more information.
-<P>
-
-#if OUTPUTtext
-Read more at <P>
-&nbsp; http://www.debian.org/intro/about
-#endif
-#if OUTPUThtml
-<A href="http://www.debian.org/intro/about">Read more...</A>
-#endif
-
-#if OUTPUTtext
-<P>&nbsp;<P><H2><A name="thiscd">
-#endif
-#if OUTPUThtml
-<P><HR><P><H2><A name="thiscd">
-#endif
-About This CD
-#if OUTPUTtext
-<br>
-=============
-#endif
-</H2>
-</a>
-<p>
-This CD-ROM is labeled
-<P>
-<tt>&nbsp;
-  DISKNAME
-</tt>
-<P>
-#ifndef UNOFFEXTRAS
-which means that this CD is number DISKNUM of TOTALNUM CDs containing
-#if TYPEbinary
-programs ("binaries") for `ARCH' computers.
-<P>
-The programs on the Binary CDs are ordered by popularity. The Binary-1 CD
-contains the most popular programs and the installation tools; it is possible
-to install and run Debian with only the Binary-1 CD. The other CDs, up to
-Binary-TOTALNUM, contain mostly special-interest programs.
-<p>
-#if OMIT_RELEASE_NOTES
-The Release Notes for "sarge" are available on the <A
-href="http://www.debian.org/releases/sarge/releasenotes">Debian web
-site</A>.
-#else
-#if DISKNUM == 1
-The Release Notes for Debian GNU/Linux "sarge" are included on this CD
-in <A href=%%""doc/release-notes/%%"">/doc/release-notes/</a>, in
-several languages. Additional translations and updated versions for
-the Release Notes may be available from the <A
-href="http://www.debian.org/releases/sarge/releasenotes">Debian web
-site</A>.
-#else
-See the first CD in this set for the "sarge" Release Notes.
-#endif
-#endif
-#endif
-#if TYPEsource
-the source code of programs in the Debian OS.
-<P>
-The source packages on the Source CDs are ordered by popularity, like
-the programs on the Binary CDs. This means that the source code of the
-programs on the Binary-DISKNUM CD can most likely be found on this CD
-(though there may be some variation due to size issues).
-#endif
-#else
-#include <unoffextrascd.html.in>
-#endif
-
-
-#if OUTPUTtext
-<P>&nbsp;<P><H2><A name="install">
-#endif
-#if OUTPUThtml
-<P><HR><P><H2><A name="install">
-#endif
-Installing
-#if OUTPUTtext
-<br>
-==========
-#endif
-</H2>
-</a>
-<p>
-#if TYPEbinary
-
- Because Debian is a complete Operating System, the installation procedure
- may seem a bit unusual. You can install Debian GNU/Linux either
- <i>alongside</i> your current OS, or as the <i>only</i> OS on your computer.
-#if OMIT_MANUAL
- <P>
- An <b>Installation Guide</b> for this CD is available from
- <A href="http://www.debian.org/releases/sarge/installmanual">the Debian web site</a>.
-#else
- <P>
- An <b>Installation Guide</b> is included on this CD at
- <P>
- <tt>&nbsp;
- <A href="doc/install/manual/en/index.html">doc/install/manual/en/index.html</a> &nbsp;&nbsp;&nbsp; (English version)</tt>
- <P>
- Several translations of the Installation Guide are included on this CD in
- the <tt><A href="doc">doc/</a></tt> directory, along with various other documents.
- <br>
- Note: additional translations, other formats (like PDF and TXT) and updated 
- versions for the Installation Guide are available from
- <A href="http://www.debian.org/releases/sarge/installmanual">the Debian web site</a>.
-#endif
- <P>
- Programs and other files that are needed for the installation can be found on
- this CD under
- <P>
- <tt>&nbsp;
- <A href=%%""tools/%%"">/tools/</a>
- </tt>
- and
- <tt>&nbsp;
- <A href=%%""install/floppy/%%"">/install/floppy/</a>
- </tt>
-
-#if ARCHi386 || ARCHamd64 || ARCHalpha || ARCHpowerpc || ARCHsparc
-  <P>
-  For the impatient ones:
-#endif
-
-#if ARCHi386 || ARCHalpha || ARCHsparc
-  you can start the installation program easily by booting off this CD-ROM.
-  Note that not all (esp. older) systems support this. 
-  <P>
-#endif
-
-#if ARCHi386 || ARCHamd64 || ARCHpowerpc
-#if ARCHi386
-   You can also
-#else
-   you can
-#endif
-  examine the
-  <P>
-  <tt>&nbsp;
-  <a href="install/">/install</a>
-  </tt>
-  <P>
-  directory; you might be able to start the installation system directly
-  from there. 
-#endif
-
-#else
- The installation tools of the Debian Operating System are located on the
- Binary-1 CD.
- See the README on that CD for more info.
-#endif
-
-#ifndef UNOFFEXTRAS
-#if OUTPUTtext
-<P>&nbsp;<P><H2><A name="lastmin">
-#endif
-#if OUTPUThtml
-<P><HR><P><H2><A name="lastmin">
-#endif
-Last-Minute Notes
-#if OUTPUTtext
-<br>
-=================
-#endif
-</H2>
-</a>
-<p>
-<UL>
-
-<LI>
-You should keep in mind that this is an unofficial CD of the current
-development version of the Debian system. This means that all sorts of
-bugs may be present anywhere in the system.
-
-<br>&nbsp;
-</LI>
-
-#if 0
--------- This can't be an official image, so also no official notes.
-<LI>
-Last-minutes notes for this CD may be available on
-<a href="http://www.debian.org/CD/releases/">http://www.debian.org/CD/releases/</a>
-</LI>
-#endif
-
-</UL>
-#endif
-
-#if TYPEbinary
-#if OUTPUTtext
-  <P>&nbsp;<P><H2><A name="apt">
-#endif
-#if OUTPUThtml
-  <P><HR><P><H2><A name="apt">
-#endif
- Using Apt
-#if OUTPUTtext
-  <br>
-  =============
-#endif
- </H2>
- </a>
- <p>
- After installing or upgrading, Debian's packaging system can use CD-ROMs,
- local collections, or networked servers (FTP, HTTP) to automatically
- install software from (<tt>.deb</tt> <i>packages</i>). This is done
- preferably with the `apt' and `aptitude' programs. 
-
- <P>
-
- You can install packages from the commandline using
- <tt>apt-get</tt>. For example, if you want to install the packages
- `commprog' and `maxgame', you can give the command
- <P>
- <tt>&nbsp;
-   apt-get install commprog maxgame
- </tt>
- <P>
- Note that you don't have to enter the complete path, or the
- `<tt>.deb</tt>' extension. `Apt' will figure this out itself. 
- <P>
- Or use aptitude for a full screen interactive selection of available
- Debian packages.
- 
-#endif
-
-
-#ifndef UNOFFEXTRAS
-#if OUTPUTtext
-<P>&nbsp;<P><H2><A name="cdmanuf">
-#endif
-#if OUTPUThtml
-<P><HR><P><H2><A name="cdmanuf">
-#endif
-CD Manufacturers
-#if OUTPUTtext
-<br>
-================
-#endif
-</H2>
-</a>
-<p>
-You are completely free to manufacture and re-distribute CD-ROMs of the
-Debian GNU/Linux Operating System, like this one. There is no charge from
-us (but of course donations are always welcome). 
-
-<P>
-
-For all needed information and contact addresses, please refer to
-<P>
-<tt>&nbsp;
-  <a href="http://www.debian.org/CD/">http://www.debian.org/CD/</a>
-</tt>
-#endif
-
-#if OUTPUTtext
-<P>&nbsp;<P><H2><A name="other">
-#endif
-#if OUTPUThtml
-<P><HR><P><H2><A name="other">
-#endif
-More Information
-#if OUTPUTtext
-<br>
-================
-#endif
-</H2>
-</a>
-<p>
-#if DISKNUM1 && TYPEbinary
-
-There is much more information present on this CD. Besides the already
-mentioned installation and upgrading procedures, this is the most
-interesting:  <P>
-
-<UL>
-<LI>
-
-#if OUTPUTtext
-/doc/FAQ
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/FAQ/">Debian FAQ</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/constitution.txt
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/constitution.txt">The Debian Constitution</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/debian-manifesto
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/debian-manifesto">The Debian Manifesto</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/social-contract.txt
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/social-contract.txt">Debian's Social Contract</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-/doc/bug-reporting.txt
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="doc/bug-reporting.txt">Bug reporting instructions</a>
-
-</LI>
-</UL>
-
-#else
-
-The Binary-1 CD contains much more information about various aspects
-of the Debian Operating System and the Debian organization.
- See the README on that CD for more info.
-
-#endif
-
-<P>
-Also on the Internet are many resources. To name a few:
-<P>
-
-<UL>
-<LI>
-
-#if OUTPUTtext
-http://www.debian.org
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.debian.org/">The Debian homepage</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.debian.org/doc
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.debian.org/doc/">Debian Documentation</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.debian.org/support
- &nbsp;
-#endif
-<A href="http://www.debian.org/support">Debian User Support</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.tldp.org
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.tldp.org/">The Linux Documentation Project</a>
-
-</LI>
-<LI>
-
-#if OUTPUTtext
-http://www.linux.org
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-#endif
-<A href="http://www.linux.org/">General Linux homepage</a>
-
-</LI>
-</UL>
-
-<P>
-
-<DIV align="center">
-
-#if OUTPUTtext
-&nbsp;<br>
-&nbsp;<br>
-#endif
-#if OUTPUThtml
-<HR>
-#endif
-
-<SMALL>See the Debian
-<A href="http://www.debian.org/contact">contact page</A>
-
-#if OUTPUTtext
-(http://www.debian.org/contact)
-#endif
-
-for information on contacting us.
-	</SMALL><P>
-<SMALL>
-
-Last Modified:  Sat Mar 20 12:30:45 EST 2004
-
-<br></SMALL>
-</DIV>
-
-  </td>
-  </tr>
-  <tr>
-        <td colspan="3" valign="bottom" width="20%" bgcolor="#BBDDFF">
-          <img src="pics/blue-lowerleft.png" align="left" border="0"
-            hspace="0" vspace="0" alt="" width="17" height="16">
-          <img src="pics/blue-lowerright.png" align="right" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-        </td>
-  </tr>
-  </table>
-
-</body>
-</html>
diff --git a/data/sarge/README.sbm b/data/sarge/README.sbm
 deleted file mode 100644
index 4087670..0000000
--- a/data/sarge/README.sbm
+++ /dev/null
@@ -1,43 +0,0 @@
-About the Smart Boot Manager image
-----------------------------------
-
-  The file `sbm.bin' that is available in this directory may be useful
-  to you if you are not able to directly boot the first CD because your
-  BIOS may be too old and may not support ISOLINUX.
-
-  Then, instead of booting on the CD directly, you create a Smart Boot
-  Manager floppy image by using the sbm.bin disk image. You can create this
-  floppy with rawrite (under DOS) or with dd (under Linux). Now you can
-  boot on this floppy disk and it will detect your CDROM and let you boot
-  on it bypassing any BIOS limitation.
-
-What is SBM ?
-
-  Smart Boot Manager or briefly SmartBtmgr (SBM), is an OS independent
-  Boot Manager - a program that is loaded by the bios before any
-  operating system and allows you to choose which operating system to
-  boot.
-
-  SBM is included in Debian in two ways, the package bmconf allows us to
-  install and configure an old version of SBM and sbm wich is the latest
-  version of SBM with an installer.
-
-What's the use of SBM on the CD then ?
-
-  SBM includes an IDE driver that allows us to boot the cds even on
-  machines with a BIOS that wouldn't support booting from CD, provided our
-  CDROM is an IDE one, that is, so you can make a SBM floppy and boot from
-  it and then tell it to boot from your CDROM.
-
-  Also, there are some cases where the BIOS would allow booting from the CD
-  but isolinux fails to boot from there, in this case you can either boot
-  using a CD other than the first, as the others don't use isolinux, or you
-  can make a SBM floppy and boot from this floppy and then tell SBM to boot
-  your CDROM.
-
-How do you make a SBM floppy ?
-
-  If you have SBM installed on a box you can run sbminst. Otherwise you can
-  put the sbm.bin floppy image that we provide with our cds onto a floppy
-  just like you would do with a rescue image.
-
diff --git a/data/sarge/alpha_businesscard_udeb_include b/data/sarge/alpha_businesscard_udeb_include
 deleted file mode 100644
index eea4461..0000000
--- a/data/sarge/alpha_businesscard_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-fdisk-udeb
diff --git a/data/sarge/alpha_netinst_udeb_include b/data/sarge/alpha_netinst_udeb_include
 deleted file mode 100644
index 70df4f6..0000000
--- a/data/sarge/alpha_netinst_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-fdisk-udeb
diff --git a/data/sarge/alpha_udeb_include b/data/sarge/alpha_udeb_include
 deleted file mode 100644
index 70df4f6..0000000
--- a/data/sarge/alpha_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-fdisk-udeb
diff --git a/data/sarge/amd64/extra-sources b/data/sarge/amd64/extra-sources
 deleted file mode 100644
index 995d8fa..0000000
--- a/data/sarge/amd64/extra-sources
+++ /dev/null
@@ -1,16 +0,0 @@
-# AMD64 needed some updated/newer/patched source files compared to the
-# rest of the sarge release. Source packages listed here are grabbed from the
-# list at http://amd64.debian.net/docs/package_changes.txt
-#
-syslinux
-linux86
-gnupg
-base-config
-choose-mirror
-libtool1.4
-# fdisk-udeb
-util-linux
-# hdparm-udeb
-hdparm
-# libc6-udeb
-glibc
diff --git a/data/sarge/amd64_businesscard_udeb_include b/data/sarge/amd64_businesscard_udeb_include
 deleted file mode 100644
index c8849a9..0000000
--- a/data/sarge/amd64_businesscard_udeb_include
+++ /dev/null
@@ -1,5 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/sarge/amd64_netinst_udeb_include b/data/sarge/amd64_netinst_udeb_include
 deleted file mode 100644
index 275197a..0000000
--- a/data/sarge/amd64_netinst_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/sarge/amd64_udeb_include b/data/sarge/amd64_udeb_include
 deleted file mode 100644
index 275197a..0000000
--- a/data/sarge/amd64_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/sarge/arm_businesscard_udeb_include b/data/sarge/arm_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/sarge/arm_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/sarge/arm_netinst_udeb_include b/data/sarge/arm_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/arm_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/arm_udeb_include b/data/sarge/arm_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/arm_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/delo.conf b/data/sarge/delo.conf
 deleted file mode 100644
index 81d29a9..0000000
--- a/data/sarge/delo.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# DECstations with R4000 CPU
-label=linux-kn04
-  append="initrd=/boot/initrd.gz ramdisk_size=8192"
-  image=/boot/vmlinux-r4k-kn04
-
-# DECstations with R4000 CPU, expert mode
-label=expert-kn04
-  append="DEBCONF_PRIORITY=low initrd=/boot/initrd.gz ramdisk_size=8192"
-  image=/boot/vmlinux-r4k-kn04
-
-# DECstations with R3000 CPU
-label=linux-kn02
-  append="initrd=/boot/initrd.gz ramdisk_size=8192"
-  image=/boot/vmlinux-r3k-kn02
-
-# DECstations with R3000 CPU, expert mode
-label=expert-kn02
-  append="DEBCONF_PRIORITY=low initrd=/boot/initrd.gz ramdisk_size=8192"
-  image=/boot/vmlinux-r3k-kn02
diff --git a/data/sarge/exclude-udebs b/data/sarge/exclude-udebs
 deleted file mode 100644
index 38fd04c..0000000
--- a/data/sarge/exclude-udebs
+++ /dev/null
@@ -1,92 +0,0 @@
-# These udebs build the d-i cdrom initrd. As such, there is no reason
-# to keep another copy of them on the CD in udeb form.
-# 
-# This duplicates data found in the file build/pkg-lists/kernel, in d-i cvs
-kernel-image-*
-# build/pkg-lists/base in d-i cvs
-rootskel
-main-menu
-cdebconf-udeb
-udpkg
-anna
-di-utils-shell
-di-utils-reboot
-lowmemcheck
-# build/pkg-lists/cdrom/common, in d-i cvs (also included in the
-# root+cd-drivers floppies)
-busybox-cvs-udeb
-rootskel-locale
-languagechooser
-countrychooser
-iso-3166-udeb
-hw-detect
-cdrom-detect
-cdrom-retriever
-load-cdrom
-cdrom-checker
-bogl-bterm-udeb
-di-utils-terminfo
-cdebconf-priority
-cdebconf-newt-udeb
-usb-discover
-preseed-common
-initrd-preseed
-file-preseed
-nano-udeb
-floppy-retriever
-libfribidi0-udeb
-# Already on the initrd, thanks to library reduction.
-libdebconfclient0-udeb
-# A reduced version is on the initrd. Nothing currently needs the full
-# version.
-slang1a-utf8-udeb
-# These udebs are only useful in building the boot floppy image.
-busybox-cvs-floppy-udeb
-di-utils-bootfloppy
-rootskel-bootfloppy
-# Until someone gets the gtk cdebconf frontend going, all this is not worth
-# including.
-cdebconf-gtk-udeb
-fontconfig-udeb
-libatk1.0-udeb
-libdirectfb-0.9-19-udeb
-libexpat1-udeb
-libfreetype6-udeb
-libglib2.0-udeb
-libgtk+2.0-directfb0-udeb
-libpango1.0-udeb
-libpng12-0-udeb
-ttf-freefont-udeb
-# This udeb is not in good shape and is largely supersceded by
-# cdebconf-newt-udeb
-cdebconf-slang-udeb
-# We're currently using busybox's own shell, and do not need this one.
-dash-udeb
-# These dhcp clients are not the currently preferred one.
-dhcp3-client-udeb
-pump-udeb
-# This package is only useful in the d-i-demo.
-di-utils-exit-installer
-# No need for these loaders.
-load-installer
-download-installer
-load-floppy
-# Only useful in the hd-media initrd.
-iso-scan
-load-iso
-# We're using busybox's modutils these days.
-modutils-basic
-modutils-full
-# Nothing currently depends on this, and it seems not useful on its own.
-reiserfsprogs-udeb
-# These are not really needed, the regular netcfg subsumes them.
-netcfg-static
-netcfg-dhcp
-# skolelinux stuff, not for the stock CDs
-debian-edu-install-udeb
-debian-edu-profile-udeb
-# If needed, will be on the initrd already.
-module-init-tools-udeb
-rescue-check
-# Not used yet. When it is, will go in the initrd.
-localechooser
diff --git a/data/sarge/exclude-udebs-amd64 b/data/sarge/exclude-udebs-amd64
 deleted file mode 100644
index 6312cc3..0000000
--- a/data/sarge/exclude-udebs-amd64
+++ /dev/null
@@ -1,35 +0,0 @@
-# These udebs are in the d-i cdrom initrd and the hd-media initrd. 
-# As such, there is no reason to keep another copy of them on the CD
-# in udeb form.
-isa-pnp-modules-*
-socket-modules-*
-console-keymaps-at
-console-keymaps-usb
-discover-data-udeb
-discover-udeb
-discover1-data-udeb
-discover1-udeb
-fat-modules-*
-cdrom-core-modules-*
-cdrom-modules-*
-ide-modules-*
-ide-core-modules-*
-input-modules-*
-fb-modules-*
-kbd-chooser
-usb-modules-*
-usb-storage-modules-*
-scsi-core-modules-*
-# Not needed with the 2.6 kernel on amd64.
-userdevfs
-# The speakup kernel modules are not useful unless the access images are
-# provided.
-*-speakup-di
-# These packages are for the old partitioning system, and should not be
-# included as they confuse users.
-# Note that partconf-find-partitions is used by lvmcfg-utils, so is not
-# excluded likewise, partconf-mkfstab is used by autopartkit.
-partconf
-partitioner
-# This is obsolete.
-discover2-data-udeb
diff --git a/data/sarge/exclude-udebs-i386 b/data/sarge/exclude-udebs-i386
 deleted file mode 100644
index 8d5b85d..0000000
--- a/data/sarge/exclude-udebs-i386
+++ /dev/null
@@ -1,27 +0,0 @@
-# These udebs are in the d-i cdrom initrd and the cd-drivers+root floppies. 
-# As such, there is no reason to keep another copy of them on the CD
-# in udeb form.
-isa-pnp-modules-*
-socket-modules-*
-console-keymaps-at
-console-keymaps-usb
-floppy-modules-*
-discover-data-udeb
-discover-udeb
-discover1-data-udeb
-discover1-udeb
-cdrom-core-modules-*
-cdrom-modules-*
-ide-modules-*
-ide-core-modules-*
-input-modules-*
-fb-modules-*
-kbd-chooser
-usb-modules-*
-usb-storage-modules-*
-scsi-core-modules-*
-# Not needed with the 2.4 kernel on i386.
-userdevfs
-# The speakup kernel modules are not useful unless the access images are
-# provided.
-*-speakup-di
diff --git a/data/sarge/exclude-udebs-powerpc b/data/sarge/exclude-udebs-powerpc
 deleted file mode 100644
index 606eac2..0000000
--- a/data/sarge/exclude-udebs-powerpc
+++ /dev/null
@@ -1,30 +0,0 @@
-# These udebs build the d-i cdrom initrd. As such, there is no reason
-# to keep another copy of them on the CD in udeb form.
-#
-# This duplicates data found in the file build/pkg-lists/cdrom/powerpc,
-# in d-i Subversion.
-
-cdrom-core-modules-*
-console-keymaps-at
-console-keymaps-usb
-discover-data-udeb
-discover-udeb
-discover1-data-udeb
-discover1-udeb
-eject-udeb
-firewire-core-modules-*
-fs-common-modules-*
-ide-modules-*
-input-modules-*
-kbd-chooser
-pcmcia-cs-udeb
-pcmcia-modules-*
-pcmcia-storage-modules-*
-scsi-common-modules-*
-scsi-core-modules-*
-scsi-modules-*
-socket-modules-*
-usb-modules-*
-usb-storage-modules-*
-# Not needed with the 2.4 kernel on powerpc.
-userdevfs
diff --git a/data/sarge/hppa_businesscard_udeb_include b/data/sarge/hppa_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/sarge/hppa_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/sarge/hppa_netinst_udeb_include b/data/sarge/hppa_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/hppa_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/hppa_udeb_include b/data/sarge/hppa_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/hppa_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/i386_businesscard_udeb_include b/data/sarge/i386_businesscard_udeb_include
 deleted file mode 100644
index c8849a9..0000000
--- a/data/sarge/i386_businesscard_udeb_include
+++ /dev/null
@@ -1,5 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/sarge/i386_netinst_udeb_include b/data/sarge/i386_netinst_udeb_include
 deleted file mode 100644
index 275197a..0000000
--- a/data/sarge/i386_netinst_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/sarge/i386_udeb_include b/data/sarge/i386_udeb_include
 deleted file mode 100644
index 275197a..0000000
--- a/data/sarge/i386_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/sarge/ia64_businesscard_udeb_include b/data/sarge/ia64_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/sarge/ia64_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/sarge/ia64_netinst_udeb_include b/data/sarge/ia64_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/ia64_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/ia64_udeb_include b/data/sarge/ia64_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/ia64_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/isolinux.bin b/data/sarge/isolinux.bin
 deleted file mode 100644
index d7c6d4d..0000000
 Binary files a/data/sarge/isolinux.bin and /dev/null differ
diff --git a/data/sarge/m68k_businesscard_udeb_include b/data/sarge/m68k_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/sarge/m68k_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/sarge/m68k_netinst_udeb_include b/data/sarge/m68k_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/m68k_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/m68k_udeb_include b/data/sarge/m68k_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/m68k_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/mips_businesscard_udeb_include b/data/sarge/mips_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/sarge/mips_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/sarge/mips_netinst_udeb_include b/data/sarge/mips_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/mips_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/mips_udeb_include b/data/sarge/mips_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/mips_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/mipsel_businesscard_udeb_include b/data/sarge/mipsel_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/sarge/mipsel_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/sarge/mipsel_netinst_udeb_include b/data/sarge/mipsel_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/mipsel_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/mipsel_udeb_include b/data/sarge/mipsel_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/mipsel_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/pegasos/pegasos b/data/sarge/pegasos/pegasos
 deleted file mode 100644
index 7ea9fed..0000000
--- a/data/sarge/pegasos/pegasos
+++ /dev/null
@@ -1,87 +0,0 @@
-\ FORTH is identifed by a forth comment at first line
-\
-\ terminal control stuff
-\
-: TTY.CSI d# 27 EMIT ASCII [ EMIT ;
-: TTY.HOME    TTY.CSI ASCII H EMIT ;
-: TTY.CLR_EOS TTY.CSI ASCII J EMIT ;
-: TTY.HOME_CLR TTY.HOME TTY.CLR_EOS ;
-\
-\ boot menu stuff
-\
-: my-max-boot-num 3 ;
-: my-boot-default 1 ;
-: my-boot-delay d# 300 ; \ unit = 100 ms
-: my-print-menu ( -- )
-  TTY.HOME_CLR
-  ."  "                                    			cr
-  ." Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!"		cr
-  ." "								cr
-  ." This is a Debian installation ${MEDIA_TYPE},"		cr
-  ." built on ${BUILD_DATE}."					cr
-  ." "								cr
-  ." The default option is (1) 'install'. For maximum"		cr
-  ." control, you can use the (2) 'expert' option."		cr
-  ." "								cr
-  ." ************************************"			cr
-  ." If in doubt, just choose (1) 'install'"			cr
-  ." ************************************"			cr
-  ."  "								cr
-  ." 1: install"   						cr
-  ." 2: expert"   						cr
-  ." 3: return to OF prompt"					cr
-  ."  "								cr
-;
-: my-boot-case ( num -- )
-  ."  " cr
-  case
-    1 of " cd install/powerpc/vmlinuz-chrp.initrd devfs=mount,dall init=/linuxrc --" endof
-    2 of " cd install/powerpc/vmlinuz-chrp.initrd DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --" endof
-    3 of " none" endof
-  endcase
-  $boot
-;
-: my-input-num ( wait-period max-boot-num default-num -- boot-num )
-  1 \ loop-inc = 1
-  3 pick 0 do
-    0d emit
-    ." press 1-"
-    ( wait-period max-boot-num default-num loop-inc )
-    2 pick ascii 0 + emit
-    dup 1 = if
-      ."  within "
-      3 pick i - d# 10 / .d
-      ."  seconds"
-    then
-    ."  (default: "
-    over ascii 0 + emit
-    ." ) :                   "
-    d# 100 ms
-    key? if
-       key
-       ( wait-period max-boot-num default-num loop-inc key )
-       dup 0d = if \ return pressed
-         drop leave
-       then
-
-       ascii 0 -
-       ( wait-period max-boot-num default-num loop-inc num )
-       dup 1 5 pick
-       ( wait-period max-boot-num default-num loop-inc num num 1 max-boot-num )
-       between if
-         rot drop swap leave
-       then
-
-       ( wait-period max-boot-num default-num loop-inc num )
-       2drop 0  \ loop-inc = 0
-    then
-  dup +loop
-  drop
-  ( wait-period max-boot-num boot-num )
-  nip nip
-;
-
-
-my-print-menu
-my-boot-delay my-max-boot-num my-boot-default my-input-num
-my-boot-case
diff --git a/data/sarge/powerpc_businesscard_udeb_include b/data/sarge/powerpc_businesscard_udeb_include
 deleted file mode 100644
index b5c5e7e..0000000
--- a/data/sarge/powerpc_businesscard_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-wireless-tools-udeb
diff --git a/data/sarge/powerpc_netinst_udeb_include b/data/sarge/powerpc_netinst_udeb_include
 deleted file mode 100644
index 4a83dd2..0000000
--- a/data/sarge/powerpc_netinst_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-wireless-tools-udeb
diff --git a/data/sarge/powerpc_udeb_include b/data/sarge/powerpc_udeb_include
 deleted file mode 100644
index 275197a..0000000
--- a/data/sarge/powerpc_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-netcfg
-ethdetect
-pcmcia-cs-udeb
-wireless-tools-udeb
diff --git a/data/sarge/s390_businesscard_udeb_include b/data/sarge/s390_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/sarge/s390_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/sarge/s390_netinst_udeb_include b/data/sarge/s390_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/s390_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/s390_udeb_include b/data/sarge/s390_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/s390_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/sbm.bin.gz b/data/sarge/sbm.bin.gz
 deleted file mode 100644
index 20e4aa4..0000000
 Binary files a/data/sarge/sbm.bin.gz and /dev/null differ
diff --git a/data/sarge/sparc/debian.txt b/data/sarge/sparc/debian.txt
 deleted file mode 100644
index ffa03a7..0000000
--- a/data/sarge/sparc/debian.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
 
-                  Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
-
-This is a Debian installation ${MEDIA_TYPE}, built on ${BUILD_DATE}.
-Keep it once you have installed your system, as you can boot from it
-to repair the system on your hard disk if that ever becomes necessary.
-
-WARNING: You should completely back up all of your hard disks before
-  proceeding. The installation procedure can completely and irreversibly
-  erase them! If you haven't made backups yet, remove the rescue CD from
-  the drive and press L1-A to get back to the OpenBoot prompt.
-
-Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted
-by applicable law.
-
-[ ENTER - Boot install ]   [ Type "rescue" - Boot into rescue mode ]
diff --git a/data/sarge/sparc/silo.conf b/data/sarge/sparc/silo.conf
 deleted file mode 100644
index 9280ac2..0000000
--- a/data/sarge/sparc/silo.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-partition=1
-timeout=600
-message=/boot/debian.txt
-default=linux
-append="cdrom ramdisk_size=16384 devfs=mount rw"
-initrd=/boot/initrd.gz
-root=/dev/rd/0
-
-# Standard boot images
-image[sun4c,sun4d,sun4m]=/boot/sparc32
-   label=linux
-image[sun4u]=/boot/sparc64
-   label=linux
-
-# Rescue boots
-image[sun4c,sun4d,sun4m]=/boot/sparc32
-  label=rescue
-  append="init=/bin/sh"
-image[sun4u]=/boot/sparc64
-  label=rescue
-  append="init=/bin/sh"
diff --git a/data/sarge/sparc_businesscard_udeb_include b/data/sarge/sparc_businesscard_udeb_include
 deleted file mode 100644
index 6326d6c..0000000
--- a/data/sarge/sparc_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/sarge/sparc_netinst_udeb_include b/data/sarge/sparc_netinst_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/sparc_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/sparc_udeb_include b/data/sarge/sparc_udeb_include
 deleted file mode 100644
index 6f1c801..0000000
--- a/data/sarge/sparc_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/sarge/yaboot/boot.msg b/data/sarge/yaboot/boot.msg
 deleted file mode 100644
index 292e525..0000000
--- a/data/sarge/yaboot/boot.msg
+++ /dev/null
@@ -1,22 +0,0 @@
-Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
-
-This is a Debian installation ${MEDIA_TYPE},
-built on ${BUILD_DATE}.
-
-The default option is 'install'. For maximum
-control, you can use the 'expert' option.
-
-If the system fails to boot at all (the typical
-symptom is a white screen which doesn't go away),
-use 'install video=ofonly' or 'expert video=ofonly'.
-
-The plain options are for the powerpc family of
-processors (from 601 to G4). The *-power3 options
-are for IBM Power3 boxes, and the *-power4 options
-are for IBM Power4 and Apple G5 boxes. Press the tab
-key for a list of options, or type 'help' for help.
-
-************************************
-If in doubt, just choose 'install', and if that 
-doesn't work, try 'install video=ofonly'.
-************************************
diff --git a/data/sarge/yaboot/ofboot.b b/data/sarge/yaboot/ofboot.b
 deleted file mode 100644
index 179602d..0000000
--- a/data/sarge/yaboot/ofboot.b
+++ /dev/null
@@ -1,64 +0,0 @@
-<CHRP-BOOT>
-<COMPATIBLE>
-MacRISC MacRISC3 MacRISC4
-</COMPATIBLE>
-<DESCRIPTION>
-GNU/Linux PPC bootloader
-</DESCRIPTION>
-<BOOT-SCRIPT>
-" screen" output
-load-base release-load-area
-boot cd:,\install\yaboot
-</BOOT-SCRIPT>
-<OS-BADGE-ICONS>
-1010
-000000000000F8FEACF6000000000000
-0000000000F5FFFFFEFEF50000000000
-00000000002BFAFEFAFCF70000000000
-0000000000F65D5857812B0000000000
-0000000000F5350B2F88560000000000
-0000000000F6335708F8FE0000000000
-00000000005600F600F5FD8100000000
-00000000F9F8000000F5FAFFF8000000
-000000008100F5F50000F6FEFE000000
-000000F8F700F500F50000FCFFF70000
-00000088F70000F50000F5FCFF2B0000
-0000002F582A00F5000008ADE02C0000
-00090B0A35A62B0000002D3B350A0000
-000A0A0B0B3BF60000505E0B0A0B0A00
-002E350B0B2F87FAFCF45F0B2E090000
-00000007335FF82BF72B575907000000
-000000000000ACFFFF81000000000000
-000000000081FFFFFFFF810000000000
-0000000000FBFFFFFFFFAC0000000000
-000000000081DFDFDFFFFB0000000000
-000000000081DD5F83FFFD0000000000
-000000000081DDDF5EACFF0000000000
-0000000000FDF981F981FFFF00000000
-00000000FFACF9F9F981FFFFAC000000
-00000000FFF98181F9F981FFFF000000
-000000ACACF981F981F9F9FFFFAC0000
-000000FFACF9F981F9F981FFFFFB0000
-00000083DFFBF981F9F95EFFFFFC0000
-005F5F5FDDFFFBF9F9F983DDDD5F0000
-005F5F5F5FDD81F9F9E7DF5F5F5F5F00
-0083DD5F5F83FFFFFFFFDF5F835F0000
-000000FBDDDFACFBACFBDFDFFB000000
-000000000000FFFFFFFF000000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFFFF00000000
-00000000FFFFFFFFFFFFFFFFFF000000
-00000000FFFFFFFFFFFFFFFFFF000000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
-00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00
-00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFF000000
-</OS-BADGE-ICONS>
-</CHRP-BOOT>
diff --git a/data/sarge/yaboot/yaboot.conf b/data/sarge/yaboot/yaboot.conf
 deleted file mode 100644
index ac0024a..0000000
--- a/data/sarge/yaboot/yaboot.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-## This yaboot.conf is for CD booting only, do not use as reference.
-## Debian GNU/Linux PowerPC (CODENAME)
-
-# It is important not to have a comma after cd:
-device=cd:
-default=install
-
-# FIXME: will this be the correct path?
-message=/install/boot.msg
-
-# Powerpc subarch 
-image=/install/powerpc/vmlinux
-	label=install-powerpc
-	alias=install
-	initrd=/install/powerpc/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-image=/install/powerpc/vmlinux
-	label=expert-powerpc
-	alias=expert
-	initrd=/install/powerpc/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-# Power3 subarch
-image=/install/power3/vmlinux
-	label=install-power3
-	initrd=/install/power3/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-image=/install/power3/vmlinux
-	label=expert-power3
-	initrd=/install/power3/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-# Power 4 subarch
-image=/install/power4/vmlinux
-	label=install-power4
-	initrd=/install/power4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-image=/install/power4/vmlinux
-	label=expert-power4
-	initrd=/install/power4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-# ... and now massive clone-and-hack for 2.4 ...
-
-# Powerpc subarch 
-image=/install/powerpc/2.4/vmlinux
-	label=install-powerpc-2.4
-	alias=install-2.4
-	initrd=/install/powerpc/2.4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-image=/install/powerpc/2.4/vmlinux
-	label=expert-powerpc-2.4
-	alias=expert-2.4
-	initrd=/install/powerpc/2.4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-# Power3 subarch
-image=/install/power3/2.4/vmlinux
-	label=install-power3-2.4
-	initrd=/install/power3/2.4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-image=/install/power3/2.4/vmlinux
-	label=expert-power3-2.4
-	initrd=/install/power3/2.4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-# Power 4 subarch
-image=/install/power4/2.4/vmlinux
-	label=install-power4-2.4
-	initrd=/install/power4/2.4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-image=/install/power4/2.4/vmlinux
-	label=expert-power4-2.4
-	initrd=/install/power4/2.4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
diff --git a/data/sparc/etc/debian.txt b/data/sparc/etc/debian.txt
 deleted file mode 100644
index 704aa79..0000000
--- a/data/sparc/etc/debian.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
 
-                  Welcome to Debian GNU/Linux 3.0!
-
-This is the Debian Install CD. Keep it once you have installed your
-system, as you can boot from it to repair the system on your hard disk if
-that ever becomes necessary.
-
-WARNING: You should completely back up all of your hard disks before
-  proceeding. The installation procedure can completely and irreversibly
-  erase them! If you haven't made backups yet, remove the rescue CD from
-  the drive and press L1-A to get back to the OpenBoot prompt.
-
-Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted
-by applicable law.
-
-[ ENTER - Boot install ]   [ Type "rescue" - Boot into rescue mode ]
diff --git a/data/sparc/etc/silo.conf b/data/sparc/etc/silo.conf
 deleted file mode 100644
index cb9e0d7..0000000
--- a/data/sparc/etc/silo.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-partition=1
-timeout=600
-read-only
-message=/boot/debian.txt
-default=linux
-append="cdrom"
-initrd=/dists/stable/main/disks-sparc/current/images-1.44/root.bin
-
-# Standard boot images
-image[sun4c,sun4d,sun4m]=/boot/sparc32.gz
-   label=linux
-image[sun4u]=/boot/sparc64
-   label=linux
-
-# Rescue boots
-image[sun4c,sun4d,sun4m]=/boot/sparc32.gz
-  label=rescue
-  append="init=/bin/sh"
-image[sun4u]=/boot/sparc64
-  label=rescue
-  append="init=/bin/sh"
diff --git a/data/woody/README.html.in b/data/woody/README.html.in
 deleted file mode 100644
index 10431ce..0000000
--- a/data/woody/README.html.in
+++ /dev/null
@@ -1,790 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML lang="en">
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<TITLE>Debian GNU/Linux -- The Universal Operating System</TITLE>
-<META NAME="Description" CONTENT="Debian GNU/Linux is a free distribution of the GNU/Linux operating system. It is maintained and updated through the work of many users who volunteer their time and effort.">
-<META NAME="Keywords" CONTENT="debian, GNU, linux, unix, open source, free, DFSG">
-<META NAME="Language" CONTENT="English">
-<meta name="Author" content="J.A. Bezemer, [e-mail]">
-</HEAD>
-<BODY text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#800080" alink="#FF0000">
-
-
-        <!-- The HTML and TEXT file are NOT the actual source code... -->
-        <!-- For that, see the debian-cd CVS. -->
-#if 0
-        If you read THIS, you're viewing the actual source file ;-)
-#endif
-
-#undef i386
-#undef alpha
-#undef powerpc
-#undef ppc
-#undef sparc
-#undef ultrasparc
-#undef m68k
-#undef arm
-#undef hppa
-#undef ia64
-#undef mips
-#undef mipsel
-#undef s390
-#undef binary
-#undef bin
-#undef source
-#undef src
-
-#if OUTPUTtext
-#define	  href  nothing
-#endif
-
-#include <README.diskdefines>
-
-
-#if OUTPUThtml
-<div align=right>
-(<a href="README.txt">Text version</a>)
-</div>
-<TABLE border="0" cellpadding="3" cellspacing="0" align="center" summary="">
-<TR>
-<TD>
-<IMG src="pics/logo-50.jpg" border="0" hspace="0" vspace="0" alt=""
-  width="50" height="61"></A>
-<IMG src="pics/debian.jpg" border="0" hspace="0" vspace="0"
-  alt="Debian" width="179" height="61">
-</TD>
-</TR>
-</TABLE>
-#endif 
-#if OUTPUTtext
-<div align=right>
-(HTML version in README.html)
-</div>
-#endif
-
-
-<TABLE bgcolor="#DF0451" border="0" cellpadding="0" cellspacing="0"
-  width="100%" summary="">
-<TR>
-<TD valign="top">
-<img src="pics/red-upperleft.png" align="left" border="0" hspace="0"
-  vspace="0" alt="" width="15" height="16">
-</TD>
-<TD rowspan="2" align="center">
-
- <CENTER>
- <TABLE border="0" cellpadding="2" cellspacing="0" align="center">
- <TR><TD bgcolor="#000084">
- <CENTER><FONT COLOR="#FFFFFF" FACE="helvetica,arial"><B>&nbsp;&nbsp;
-#if 0
- Debian GNU/Linux 3.0 "Woody" - Official i386 Binary-1 CD
-#endif
- DISKNAME CD
- &nbsp;&nbsp;</B></FONT></CENTER>
- </TD><TR>
- </TABLE>
- </CENTER>
-
-</TD>
-<TD valign="top">
-<img src="pics/red-upperright.png" align="right" border="0" hspace="0"
-  vspace="0" alt="" width="16" height="16">
-</TD>
-</TR>
-<TR>
-<TD valign="bottom">
-<img src="pics/red-lowerleft.png" align="left" border="0" hspace="0"
-  vspace="0" alt="" width="16" height="16">
-</TD>
-<TD valign="bottom">
-<img src="pics/red-lowerright.png" align="right" border="0" hspace="0"
-vspace="0" alt="" width="15" height="16">
-</TD>
-</TR>
-</TABLE>
-
-<TABLE border="0" cellpadding="2" cellspacing="0" width="100%" summary="">
-<TR>
-        <TD></TD>
-</TR>
-</TABLE>
-
-
-<TABLE border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-<TR>
-        <TD colspan="3" valign="top" width="20%" bgcolor="#BBDDFF">
-          <img src="pics/blue-upperleft.png" align="left" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-          <img src="pics/blue-upperright.png" align="right" border="0"
-            hspace="0" vspace="0" alt="" width="16" height="16">
-        </TD>
-</TR>
-<TR>
-        <TD bgcolor="#BBDDFF">&nbsp;&nbsp;</TD>
-
-        <TD valign="TOP" bgcolor="#BBDDFF">
-
-<FONT face="Arial,Helvetica">
-
-#if OUTPUThtml
-<P><B><A href="http://www.debian.org/">Debian homepage</A></B></P>
-#endif
-
-&nbsp;<BR>
-<P>
-
-#if OUTPUTtext
-&nbsp;<BR>
-CONTENTS:
-<BR>
-&nbsp;<BR>
-<UL>
-#endif
-
-#if OUTPUTtext
-<LI>
-#endif
-
-<A href="#intro">Intro</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-<A href="#thiscd">About This CD</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-<A href="#install">Installing</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-
-#if ARCHi386 || ARCHalpha || ARCHm68k || ARCHsparc || ARCHarm || ARCHpowerpc
- <A href="#upgrade">Upgrading</A>
- <P>
-
-#if OUTPUTtext
-  </LI><LI>
-#endif
-#endif
-
-#ifndef UNOFFEXTRAS
-<A href="#lastmin">Last-Minute Notes</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-#endif
-
-#if TYPEbinary
- <A href="#apt">Using CDs with Dselect and Apt</A>
- <P>
-
-#if OUTPUTtext
-  </LI><LI>
-#endif
-#endif
-
-#ifndef UNOFFEXTRAS
-<A href="#nonfree">Non-free/Non-US</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-#endif
-
-#ifndef UNOFFEXTRAS
-<A href="#cdmanuf">CD Manufacturers</A>
-<P>
-
-#if OUTPUTtext
-</LI><LI>
-#endif
-#endif
-
-<A href="#other">More Information</A>
-
-<P>
-
-#if OUTPUThtml
-&nbsp;<P>
-<A href=".">Browse this CD-ROM</A></P>
-<P>
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt>
-</P>
-#endif
-
-
-</FONT>
-
-#if OUTPUTtext
-</LI>
-</UL>
-#endif
-
-
-        </TD>
-        <TD bgcolor="#BBDDFF">&nbsp;&nbsp;</TD>
-        <TD>&nbsp;&nbsp;</TD>
-
-  <TD valign="TOP" width="80%">
-
-<CENTER>
-<FONT SIZE="+2"><B><I>
-Welcome to the exciting world of
-</I></B></FONT>
-<BR>
-<FONT SIZE="+3"><B><I>
-Debian GNU/Linux!
-</I></B></FONT>
-</CENTER>
-
-<A name="intro">
-<P><H2>
-Intro
-#if OUTPUTtext
-<BR>
-=====
-#endif
-</H2>
-</a>
-#if OUTPUTtext
-<P>
-#endif
-
-This is one of the CD-ROMs of the
-<a href="http://www.debian.org/">Debian GNU/Linux</a>
-distribution. Debian is a
-very extensive collection of software. But it is more. It is a complete
-Operating System (OS) for your computer. And it is
-<A href="http://www.debian.org/intro/free">free</A>
-(as in &quot;freedom&quot;).
-<P>
-An operating system is the set of basic programs
-and utilities that make your computer run. At the core of an operating
-system is the kernel. The kernel is the most fundamental program on the
-computer, which does all the basic housekeeping and lets you start other
-programs.
-Debian is kernel independent. It currently uses the
-<A href="http://www.linux.org/">Linux</A> kernel but work is
-in progress to provide Debian for other kernels, using
-<A href="http://www.gnu.org/software/hurd/hurd.html">the Hurd</A>.
-Most of the basic operating system tools
-come from the <a href="http://www.gnu.org/">GNU project</A>; hence the name
-GNU/Linux.
-<P>
-
-Debian is available for various kinds of computers
-(&quot;architectures&quot;), like
-&quot;IBM-compatible&quot; PCs (<i>i386</i>),
-Compaq's <i>Alpha</i>,
-Motorola's 680x0 (<i>m68k</i>),
-Sun's <i>Sparc</i>,
-Motorola/IBM's <i>PowerPC</i>, and <i>(Strong)ARM</i> processors.
-Check the <A href="http://www.debian.org/ports">ports</A> page
-#if OUTPUTtext
-(http://www.debian.org/ports)
-#endif
-for more information.
-<P>
-
-#if OUTPUTtext
-Read more at <P>
-&nbsp; http://www.debian.org/intro/about
-#endif
-#if OUTPUThtml
-<A href="http://www.debian.org/intro/about">Read more...</A>
-#endif
-
-<A name="thiscd">
-#if OUTPUTtext
-<P>&nbsp;<P><H2>
-#endif
-#if OUTPUThtml
-<P><HR><P><H2>
-#endif
-About This CD
-#if OUTPUTtext
-<BR>
-=============
-#endif
-</H2>
-</a>
-#if OUTPUTtext
-<P>
-#endif
-
-This CD-ROM is labeled
-<P>
-<tt>&nbsp;
-  DISKNAME
-</tt>
-<P>
-#ifndef UNOFFEXTRAS
-which means that this CD is number DISKNUM of totally TOTALNUM CDs containing
-#if TYPEbinary
-programs ("binaries") for `ARCH' computers.
-<P>
-The programs on the Binary CDs are ordered by popularity. The Binary-1 CD
-contains the most popular programs and the installation tools; it is possible
-to install and run Debian with only the Binary-1 CD. The other CDs, up to
-Binary-TOTALNUM, contain mostly special-interest programs.
-#endif
-#if TYPEsource
-the source code of programs in the Debian OS.
-<P>
-The source packages on the Source CDs are ordered by popularity, like
-the programs on the Binary CDs. This means that the source code of the
-programs on the Binary-DISKNUM CD can most likely be found on this CD
-(though there may be some variation due to size issues).
-#endif
-#else
-#include <unoffextrascd.html.in>
-#endif
-
-<A name="install">
-#if OUTPUTtext