Renaming categories to archive areas (Closes: #519690).

88 files changed, 656 insertions, 0 deletions

diff --git a/data/debian-cd/etch/alpha_businesscard_udeb_include b/data/debian-cd/etch/alpha_businesscard_udeb_include
new file mode 100644
index 000000000..eea4461a8
--- /dev/null
+++ b/data/debian-cd/etch/alpha_businesscard_udeb_include
@@ -0,0 +1,4 @@
+choose-mirror
+netcfg
+ethdetect
+fdisk-udeb
diff --git a/data/debian-cd/etch/alpha_netinst_udeb_include b/data/debian-cd/etch/alpha_netinst_udeb_include
new file mode 100644
index 000000000..70df4f616
--- /dev/null
+++ b/data/debian-cd/etch/alpha_netinst_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+fdisk-udeb
diff --git a/data/debian-cd/etch/alpha_udeb_include b/data/debian-cd/etch/alpha_udeb_include
new file mode 100644
index 000000000..70df4f616
--- /dev/null
+++ b/data/debian-cd/etch/alpha_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+fdisk-udeb
diff --git a/data/debian-cd/etch/amd64_businesscard_udeb_include b/data/debian-cd/etch/amd64_businesscard_udeb_include
new file mode 100644
index 000000000..bfc81f030
--- /dev/null
+++ b/data/debian-cd/etch/amd64_businesscard_udeb_include
@@ -0,0 +1,5 @@
+choose-mirror
+netcfg
+ethdetect
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/amd64_netinst_udeb_include b/data/debian-cd/etch/amd64_netinst_udeb_include
new file mode 100644
index 000000000..e5ed87395
--- /dev/null
+++ b/data/debian-cd/etch/amd64_netinst_udeb_include
@@ -0,0 +1,4 @@
+netcfg
+ethdetect
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/amd64_udeb_include b/data/debian-cd/etch/amd64_udeb_include
new file mode 100644
index 000000000..e5ed87395
--- /dev/null
+++ b/data/debian-cd/etch/amd64_udeb_include
@@ -0,0 +1,4 @@
+netcfg
+ethdetect
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/arm_businesscard_udeb_include b/data/debian-cd/etch/arm_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/etch/arm_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/arm_netinst_udeb_include b/data/debian-cd/etch/arm_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/arm_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/arm_udeb_include b/data/debian-cd/etch/arm_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/arm_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/exclude-udebs b/data/debian-cd/etch/exclude-udebs
new file mode 100644
index 000000000..3cb4923fc
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs
@@ -0,0 +1,118 @@
+# 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 svn
+kernel-image-*
+# build/pkg-lists/base in d-i svn
+rootskel
+main-menu
+cdebconf-udeb
+udpkg
+anna
+di-utils-shell
+di-utils-reboot
+lowmemcheck
+# build/pkg-lists/cdrom/common, in d-i svn (also included in the
+# root+cd-drivers floppies)
+busybox-udeb
+installation-locale
+localechooser
+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
+libdebian-installer-extra4-udeb
+# These udebs are only useful in building the boot floppy image.
+busybox-floppy-udeb
+rootskel-bootfloppy
+# gtk stuff
+cdebconf-gtk-udeb
+fontconfig-udeb
+libatk1.0-udeb
+libcairo-directfb2-udeb
+libdirectfb-0.9-22-udeb
+libdirectfb-0.9-25-udeb
+libexpat1-udeb
+libfreetype6-udeb
+libglib2.0-udeb
+libgtk-directfb-2.0-0-udeb
+libgtk2-engines-udeb
+libpango1.0-udeb
+libpng12-0-udeb
+libsdl1.2debian-udeb
+mouse-modules-*
+ttf-*
+fbset-udeb
+# We're currently using busybox's own shell, and do not need this one.
+dash-udeb
+# Not currently used
+cdebootstrap-udeb
+hdparm-udeb
+laptop-detect-udeb
+# These dhcp clients are not the currently preferred one.
+dhcp3-client-udeb
+# This package is only useful in the d-i-demo.
+di-utils-exit-installer
+# No need for these loaders.
+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
+# reiser4 is not in the Debian kernel.
+mkreiser4-udeb
+reiser4progs-udeb
+# No longer used by parted.
+libreiserfs0.3-udeb
+# These are not really needed, the regular netcfg subsumes them.
+netcfg-static
+# skolelinux stuff, not for the stock CDs
+debian-edu-install-udeb
+debian-edu-profile-udeb
+debian-edu-archive-keyring-udeb
+ltsp-client-builder
+autopartkit
+lvm10-udeb
+# If needed, will be on the initrd already.
+modutils-full
+module-init-tools-udeb
+env-preseed
+rescue-check
+rootskel-gtk
+cdebconf-text-udeb
+brltty-udeb
+klibc-utils-udeb
+libklibc-udeb
+udev-udeb
+ai-choosers
+auto-install
+# Obsolete
+libslang1-utf8-udeb
+discover-udeb
+discover-data-udeb
+discover1-udeb
+discover1-data-udeb
+libdiscover1-udeb
+# Eh?
+gnumach-udeb
+# Exclude apt-setup components; they will be included 
diff --git a/data/debian-cd/etch/exclude-udebs-amd64 b/data/debian-cd/etch/exclude-udebs-amd64
new file mode 100644
index 000000000..c3d32fe89
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs-amd64
@@ -0,0 +1,28 @@
+# 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
+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
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/etch/exclude-udebs-i386 b/data/debian-cd/etch/exclude-udebs-i386
new file mode 100644
index 000000000..05a376bb3
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs-i386
@@ -0,0 +1,28 @@
+# 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-*
+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
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/etch/exclude-udebs-powerpc b/data/debian-cd/etch/exclude-udebs-powerpc
new file mode 100644
index 000000000..5a7df81a5
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs-powerpc
@@ -0,0 +1,28 @@
+# 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
+eject-udeb
+firewire-core-modules-*
+fs-common-modules-*
+ide-modules-*
+input-modules-*
+kbd-chooser
+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
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/etch/exclude-udebs-s390 b/data/debian-cd/etch/exclude-udebs-s390
new file mode 100644
index 000000000..e075e4bcf
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs-s390
@@ -0,0 +1,3 @@
+# S/390 does not support loading udebs off the CD image,
+# so we can exclude all udebs from it
+*
diff --git a/data/debian-cd/etch/exclude-udebs-sparc b/data/debian-cd/etch/exclude-udebs-sparc
new file mode 100644
index 000000000..d11a81bc8
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs-sparc
@@ -0,0 +1,5 @@
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/etch/hppa_businesscard_udeb_include b/data/debian-cd/etch/hppa_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/etch/hppa_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/hppa_netinst_udeb_include b/data/debian-cd/etch/hppa_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/hppa_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/hppa_udeb_include b/data/debian-cd/etch/hppa_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/hppa_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/i386_businesscard_udeb_include b/data/debian-cd/etch/i386_businesscard_udeb_include
new file mode 100644
index 000000000..ecce0bd59
--- /dev/null
+++ b/data/debian-cd/etch/i386_businesscard_udeb_include
@@ -0,0 +1,6 @@
+choose-mirror
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/i386_netinst_udeb_include b/data/debian-cd/etch/i386_netinst_udeb_include
new file mode 100644
index 000000000..081a74355
--- /dev/null
+++ b/data/debian-cd/etch/i386_netinst_udeb_include
@@ -0,0 +1,5 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/i386_udeb_include b/data/debian-cd/etch/i386_udeb_include
new file mode 100644
index 000000000..081a74355
--- /dev/null
+++ b/data/debian-cd/etch/i386_udeb_include
@@ -0,0 +1,5 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/ia64_businesscard_udeb_include b/data/debian-cd/etch/ia64_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/etch/ia64_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/ia64_netinst_udeb_include b/data/debian-cd/etch/ia64_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/ia64_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/ia64_udeb_include b/data/debian-cd/etch/ia64_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/ia64_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/m68k_businesscard_udeb_include b/data/debian-cd/etch/m68k_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/etch/m68k_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/m68k_netinst_udeb_include b/data/debian-cd/etch/m68k_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/m68k_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/m68k_udeb_include b/data/debian-cd/etch/m68k_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/m68k_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mips_businesscard_udeb_include b/data/debian-cd/etch/mips_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/etch/mips_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mips_netinst_udeb_include b/data/debian-cd/etch/mips_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/mips_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mips_udeb_include b/data/debian-cd/etch/mips_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/mips_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mipsel_businesscard_udeb_include b/data/debian-cd/etch/mipsel_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/etch/mipsel_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mipsel_netinst_udeb_include b/data/debian-cd/etch/mipsel_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/mipsel_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mipsel_udeb_include b/data/debian-cd/etch/mipsel_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/mipsel_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/powerpc_businesscard_udeb_include b/data/debian-cd/etch/powerpc_businesscard_udeb_include
new file mode 100644
index 000000000..b5c5e7ea2
--- /dev/null
+++ b/data/debian-cd/etch/powerpc_businesscard_udeb_include
@@ -0,0 +1,4 @@
+choose-mirror
+netcfg
+ethdetect
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/powerpc_netinst_udeb_include b/data/debian-cd/etch/powerpc_netinst_udeb_include
new file mode 100644
index 000000000..4a83dd2ab
--- /dev/null
+++ b/data/debian-cd/etch/powerpc_netinst_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/powerpc_udeb_include b/data/debian-cd/etch/powerpc_udeb_include
new file mode 100644
index 000000000..081a74355
--- /dev/null
+++ b/data/debian-cd/etch/powerpc_udeb_include
@@ -0,0 +1,5 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/s390_businesscard_udeb_include b/data/debian-cd/etch/s390_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/etch/s390_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/s390_netinst_udeb_include b/data/debian-cd/etch/s390_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/s390_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/s390_udeb_include b/data/debian-cd/etch/s390_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/s390_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/sparc_businesscard_udeb_include b/data/debian-cd/etch/sparc_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/etch/sparc_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/sparc_netinst_udeb_include b/data/debian-cd/etch/sparc_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/sparc_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/sparc_udeb_include b/data/debian-cd/etch/sparc_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/etch/sparc_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/udeb_exclude b/data/debian-cd/etch/udeb_exclude
new file mode 100644
index 000000000..2e372f611
--- /dev/null
+++ b/data/debian-cd/etch/udeb_exclude
@@ -0,0 +1 @@
+apt-mirror-setup
diff --git a/data/debian-cd/lenny/alpha_businesscard_udeb_include b/data/debian-cd/lenny/alpha_businesscard_udeb_include
new file mode 100644
index 000000000..eea4461a8
--- /dev/null
+++ b/data/debian-cd/lenny/alpha_businesscard_udeb_include
@@ -0,0 +1,4 @@
+choose-mirror
+netcfg
+ethdetect
+fdisk-udeb
diff --git a/data/debian-cd/lenny/alpha_netinst_udeb_include b/data/debian-cd/lenny/alpha_netinst_udeb_include
new file mode 100644
index 000000000..70df4f616
--- /dev/null
+++ b/data/debian-cd/lenny/alpha_netinst_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+fdisk-udeb
diff --git a/data/debian-cd/lenny/alpha_udeb_include b/data/debian-cd/lenny/alpha_udeb_include
new file mode 100644
index 000000000..70df4f616
--- /dev/null
+++ b/data/debian-cd/lenny/alpha_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+fdisk-udeb
diff --git a/data/debian-cd/lenny/amd64_businesscard_udeb_include b/data/debian-cd/lenny/amd64_businesscard_udeb_include
new file mode 100644
index 000000000..0089df09a
--- /dev/null
+++ b/data/debian-cd/lenny/amd64_businesscard_udeb_include
@@ -0,0 +1,4 @@
+choose-mirror
+netcfg
+ethdetect
+pcmciautils-udeb
diff --git a/data/debian-cd/lenny/amd64_netinst_udeb_include b/data/debian-cd/lenny/amd64_netinst_udeb_include
new file mode 100644
index 000000000..155327762
--- /dev/null
+++ b/data/debian-cd/lenny/amd64_netinst_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+pcmciautils-udeb
diff --git a/data/debian-cd/lenny/amd64_udeb_include b/data/debian-cd/lenny/amd64_udeb_include
new file mode 100644
index 000000000..155327762
--- /dev/null
+++ b/data/debian-cd/lenny/amd64_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+pcmciautils-udeb
diff --git a/data/debian-cd/lenny/arm_businesscard_udeb_include b/data/debian-cd/lenny/arm_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/lenny/arm_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/arm_netinst_udeb_include b/data/debian-cd/lenny/arm_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/arm_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/arm_udeb_include b/data/debian-cd/lenny/arm_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/arm_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/exclude-udebs b/data/debian-cd/lenny/exclude-udebs
new file mode 100644
index 000000000..db2096762
--- /dev/null
+++ b/data/debian-cd/lenny/exclude-udebs
@@ -0,0 +1,117 @@
+# 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 svn
+kernel-image-*
+# build/pkg-lists/base in d-i svn
+archdetect
+rootskel
+main-menu
+cdebconf-udeb
+udpkg
+anna
+di-utils
+di-utils-shell
+di-utils-reboot
+lowmemcheck
+# build/pkg-lists/cdrom/common, in d-i svn (also included in the
+# root+cd-drivers floppies)
+busybox-udeb
+installation-locale
+localechooser
+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 as dependencies
+libdebconfclient0-udeb
+libdebian-installer4-udeb
+libdebian-installer-extra4-udeb
+# These udebs are only useful in building the boot floppy image.
+busybox-floppy-udeb
+rootskel-bootfloppy
+# gtk stuff included in initrd if needed
+rootskel-gtk
+cdebconf-gtk-udeb
+fontconfig-udeb
+gtk2-engines-udeb
+libatk1.0-udeb
+libcairo-directfb2-udeb
+libdirectfb-*-udeb
+libexpat1-udeb
+libfreetype6-udeb
+libglib2.0-udeb
+libgtk-directfb-2.0-0-udeb
+libgtk2-engines-udeb
+libpango1.0-udeb
+libpcre3-udeb
+libpixman-1-0-udeb
+libpng12-0-udeb
+libsdl1.2debian-udeb
+mouse-modules-*
+ttf-*
+fbset-udeb
+# terminal for gtk frontend is also included in initrd
+cdebconf-gtk-terminal
+libvte9-udeb
+# Not currently used
+cdebootstrap-udeb
+hdparm-udeb
+dhcp-client-udeb
+# This package is only useful in the d-i-demo.
+di-utils-exit-installer
+# No need for these loaders.
+download-installer
+load-floppy
+# Only useful in the hd-media initrd.
+iso-scan
+load-iso
+# Nothing currently depends on this, and it seems not useful on its own.
+reiserfsprogs-udeb
+# reiser4 is not in the Debian kernel.
+mkreiser4-udeb
+reiser4progs-udeb
+# These are not really needed, the regular netcfg subsumes them.
+netcfg-static
+# skolelinux stuff, not for the stock CDs
+debian-edu-install-udeb
+debian-edu-profile-udeb
+debian-edu-archive-keyring-udeb
+ltsp-client-builder
+autopartkit
+# live CD stuff
+live-installer
+simple-cdd-profiles
+# If needed, will be on the initrd already.
+module-init-tools-udeb
+env-preseed
+rescue-check
+cdebconf-text-udeb
+brltty-udeb
+klibc-utils-udeb
+libklibc-udeb
+udev-udeb
+ai-choosers
+auto-install
+libslang2-udeb
+# Currently unused
+nbd-client-udeb
+pwgen-udeb
+# Eh?
+gnumach-udeb
+# Exclude kbd and console-setup udebs, they're not currently used
+kbd-udeb
+console-setup-*
diff --git a/data/debian-cd/lenny/exclude-udebs-amd64 b/data/debian-cd/lenny/exclude-udebs-amd64
new file mode 100644
index 000000000..8f81f6e5c
--- /dev/null
+++ b/data/debian-cd/lenny/exclude-udebs-amd64
@@ -0,0 +1,43 @@
+# 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.
+console-keymaps-at
+console-keymaps-usb
+kbd-chooser
+acpi-modules-*
+ata-modules-*
+cdrom-core-modules-*
+core-modules-*
+fat-modules-*
+fb-modules-*
+ide-core-modules-*
+ide-modules-*
+input-modules-*
+isofs-modules-*
+mmc-modules-*
+nls-core-modules-*
+parport-modules-*
+pcmcia-modules-*
+sata-modules-*
+scsi-common-modules-*
+scsi-core-modules-*
+scsi-modules-*
+serial-modules-*
+speakup-modules-*
+usb-modules-*
+usb-serial-modules-*
+usb-storage-modules-*
+zlib-modules-*
+# Not used on amd64
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-sun
+# Not needed with the 2.6 kernel on amd64.
+userdevfs
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/lenny/exclude-udebs-i386 b/data/debian-cd/lenny/exclude-udebs-i386
new file mode 100644
index 000000000..eeed4700c
--- /dev/null
+++ b/data/debian-cd/lenny/exclude-udebs-i386
@@ -0,0 +1,45 @@
+# 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.
+console-keymaps-at
+console-keymaps-usb
+kbd-chooser
+acpi-modules-*
+ata-modules-*
+cdrom-core-modules-*
+core-modules-*
+fat-modules-*
+fb-modules-*
+ide-core-modules-*
+ide-modules-*
+input-modules-*
+isofs-modules-*
+mmc-modules-*
+nls-core-modules-*
+parport-modules-*
+pcmcia-modules-*
+sata-modules-*
+scsi-common-modules-*
+scsi-core-modules-*
+scsi-modules-*
+serial-modules-*
+speakup-modules-*
+usb-modules-*
+usb-serial-modules-*
+usb-storage-modules-*
+zlib-modules-*
+# 686-bigmem kernel udebs are only used for the Xen netboot image
+*-686-bigmem-di
+# Not used on i386
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-sun
+# Not needed with the 2.4 kernel on i386.
+userdevfs
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/lenny/exclude-udebs-powerpc b/data/debian-cd/lenny/exclude-udebs-powerpc
new file mode 100644
index 000000000..5a7df81a5
--- /dev/null
+++ b/data/debian-cd/lenny/exclude-udebs-powerpc
@@ -0,0 +1,28 @@
+# 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
+eject-udeb
+firewire-core-modules-*
+fs-common-modules-*
+ide-modules-*
+input-modules-*
+kbd-chooser
+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
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/lenny/exclude-udebs-s390 b/data/debian-cd/lenny/exclude-udebs-s390
new file mode 100644
index 000000000..e075e4bcf
--- /dev/null
+++ b/data/debian-cd/lenny/exclude-udebs-s390
@@ -0,0 +1,3 @@
+# S/390 does not support loading udebs off the CD image,
+# so we can exclude all udebs from it
+*
diff --git a/data/debian-cd/lenny/exclude-udebs-sparc b/data/debian-cd/lenny/exclude-udebs-sparc
new file mode 100644
index 000000000..d11a81bc8
--- /dev/null
+++ b/data/debian-cd/lenny/exclude-udebs-sparc
@@ -0,0 +1,5 @@
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/lenny/hppa_businesscard_udeb_include b/data/debian-cd/lenny/hppa_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/lenny/hppa_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/hppa_netinst_udeb_include b/data/debian-cd/lenny/hppa_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/hppa_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/hppa_udeb_include b/data/debian-cd/lenny/hppa_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/hppa_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/i386_businesscard_udeb_include b/data/debian-cd/lenny/i386_businesscard_udeb_include
new file mode 100644
index 000000000..0089df09a
--- /dev/null
+++ b/data/debian-cd/lenny/i386_businesscard_udeb_include
@@ -0,0 +1,4 @@
+choose-mirror
+netcfg
+ethdetect
+pcmciautils-udeb
diff --git a/data/debian-cd/lenny/i386_netinst_udeb_include b/data/debian-cd/lenny/i386_netinst_udeb_include
new file mode 100644
index 000000000..155327762
--- /dev/null
+++ b/data/debian-cd/lenny/i386_netinst_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+pcmciautils-udeb
diff --git a/data/debian-cd/lenny/i386_udeb_include b/data/debian-cd/lenny/i386_udeb_include
new file mode 100644
index 000000000..155327762
--- /dev/null
+++ b/data/debian-cd/lenny/i386_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+pcmciautils-udeb
diff --git a/data/debian-cd/lenny/ia64_businesscard_udeb_include b/data/debian-cd/lenny/ia64_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/lenny/ia64_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/ia64_netinst_udeb_include b/data/debian-cd/lenny/ia64_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/ia64_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/ia64_udeb_include b/data/debian-cd/lenny/ia64_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/ia64_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/m68k_businesscard_udeb_include b/data/debian-cd/lenny/m68k_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/lenny/m68k_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/m68k_netinst_udeb_include b/data/debian-cd/lenny/m68k_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/m68k_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/m68k_udeb_include b/data/debian-cd/lenny/m68k_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/m68k_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/mips_businesscard_udeb_include b/data/debian-cd/lenny/mips_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/lenny/mips_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/mips_netinst_udeb_include b/data/debian-cd/lenny/mips_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/mips_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/mips_udeb_include b/data/debian-cd/lenny/mips_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/mips_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/mipsel_businesscard_udeb_include b/data/debian-cd/lenny/mipsel_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/lenny/mipsel_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/mipsel_netinst_udeb_include b/data/debian-cd/lenny/mipsel_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/mipsel_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/mipsel_udeb_include b/data/debian-cd/lenny/mipsel_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/mipsel_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/powerpc_businesscard_udeb_include b/data/debian-cd/lenny/powerpc_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/lenny/powerpc_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/powerpc_netinst_udeb_include b/data/debian-cd/lenny/powerpc_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/powerpc_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/powerpc_udeb_include b/data/debian-cd/lenny/powerpc_udeb_include
new file mode 100644
index 000000000..155327762
--- /dev/null
+++ b/data/debian-cd/lenny/powerpc_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+pcmciautils-udeb
diff --git a/data/debian-cd/lenny/s390_businesscard_udeb_include b/data/debian-cd/lenny/s390_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/lenny/s390_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/s390_netinst_udeb_include b/data/debian-cd/lenny/s390_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/s390_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/s390_udeb_include b/data/debian-cd/lenny/s390_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/s390_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/sparc_businesscard_udeb_include b/data/debian-cd/lenny/sparc_businesscard_udeb_include
new file mode 100644
index 000000000..6326d6c5b
--- /dev/null
+++ b/data/debian-cd/lenny/sparc_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/sparc_netinst_udeb_include b/data/debian-cd/lenny/sparc_netinst_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/sparc_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/sparc_udeb_include b/data/debian-cd/lenny/sparc_udeb_include
new file mode 100644
index 000000000..6f1c801c0
--- /dev/null
+++ b/data/debian-cd/lenny/sparc_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/lenny/udeb_exclude b/data/debian-cd/lenny/udeb_exclude
new file mode 100644
index 000000000..2e372f611
--- /dev/null
+++ b/data/debian-cd/lenny/udeb_exclude
@@ -0,0 +1 @@
+apt-mirror-setup
diff --git a/data/debian-cd/sid b/data/debian-cd/sid
new file mode 120000
index 000000000..fb5b6534f
--- /dev/null
+++ b/data/debian-cd/sid
@@ -0,0 +1 @@
+lenny
\ No newline at end of file
diff --git a/data/debian-cd/squeeze b/data/debian-cd/squeeze
new file mode 120000
index 000000000..fb5b6534f
--- /dev/null
+++ b/data/debian-cd/squeeze
@@ -0,0 +1 @@
+lenny
\ No newline at end of file