From 00be9ca47ee443fee068e8772f1bdcd251a59639 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Fri, 11 Nov 2005 19:26:23 +0000
Subject: [PATCH] * Add more udebs to excludes trying to trim the netinst size
 down.

---
 data/etch/exclude-udebs      | 20 +++++++++++++++++---
 data/etch/exclude-udebs-i386 |  2 ++
 debian/changelog             |  3 ++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/data/etch/exclude-udebs b/data/etch/exclude-udebs
index f277c65e..f28dbe89 100644
--- a/data/etch/exclude-udebs
+++ b/data/etch/exclude-udebs
@@ -1,4 +1,4 @@
-# These udebs build the d-i cdrom initrd. As such, there is no reason
+# 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
@@ -40,6 +40,8 @@ floppy-retriever
 libfribidi0-udeb
 # Already on the initrd, thanks to library reduction.
 libdebconfclient0-udeb
+libdebian-installer-extra4-udeb
+libdebian-installer-udeb
 # A reduced version is on the initrd. Nothing currently needs the full
 # version.
 slang1a-utf8-udeb
@@ -48,8 +50,7 @@ busybox-cvs-floppy-udeb
 busybox-floppy-udeb
 di-utils-bootfloppy
 rootskel-bootfloppy
-# Until someone gets the gtk cdebconf frontend going, all this is not worth
-# including.
+# gtk stuff
 cdebconf-gtk-udeb
 fontconfig-udeb
 libatk1.0-udeb
@@ -61,11 +62,17 @@ libgtk+2.0-directfb0-udeb
 libpango1.0-udeb
 libpng12-0-udeb
 ttf-freefont-udeb
+libdirectfb-0.9-22-udeb
+fbset-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
+# Not currently used
+cdebootstrap-udeb
+hdparm-udeb
+laptop-detect-udeb
 # These dhcp clients are not the currently preferred one.
 dhcp3-client-udeb
 pump-udeb
@@ -89,8 +96,15 @@ netcfg-dhcp
 # skolelinux stuff, not for the stock CDs
 debian-edu-install-udeb
 debian-edu-profile-udeb
+ltsp-client-builder
+autopartkit
+lvm10-udeb
 # If needed, will be on the initrd already.
 module-init-tools-udeb
 rescue-check
+rootskel-gtk
+cdebconf-text-udeb
 # Obsolete
 hw-detect-full
+# Eh?
+gnumach-udeb
diff --git a/data/etch/exclude-udebs-i386 b/data/etch/exclude-udebs-i386
index 8afbd185..0189e6b0 100644
--- a/data/etch/exclude-udebs-i386
+++ b/data/etch/exclude-udebs-i386
@@ -27,3 +27,5 @@ userdevfs
 *-speakup-di
 # These udebs are not used yet.
 mouse-modules-*
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
diff --git a/debian/changelog b/debian/changelog
index 7bfa9c2b..69790a4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
   * Order task-essential-etch using task.list, and regen to match current
     tasksel.
   * Add acpid to generate_di+k_list so it's on the netinst.
+  * Add more udebs to excludes trying to trim the netinst size down.
 
   [ Colin Watson ]
   * generate_di+k_list: Add hfsutils for powerpc; it's no longer in base but
@@ -62,7 +63,7 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
   * For full CD/DVD builds, check that we have an "extra" override
     containing task info. If not, use the sid override instead.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 11 Nov 2005 13:25:07 -0500
+ -- Joey Hess <joeyh@debian.org>  Fri, 11 Nov 2005 14:25:43 -0500
 
 debian-cd (2.2.23) unstable; urgency=low