From b68289414f90a81e9f5b1e904c1268fb40e33189 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Tue, 1 Aug 2006 15:26:44 +0000
Subject: [PATCH] Update exclude-udebs lists

---
 data/etch/exclude-udebs         | 20 +++++++++++++++-----
 data/etch/exclude-udebs-amd64   | 13 +++++--------
 data/etch/exclude-udebs-i386    |  5 +++--
 data/etch/exclude-udebs-powerpc |  5 +++++
 data/etch/exclude-udebs-sparc   |  5 +++++
 debian/changelog                |  3 ++-
 6 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/data/etch/exclude-udebs b/data/etch/exclude-udebs
index 74bcdc62..c1662de0 100644
--- a/data/etch/exclude-udebs
+++ b/data/etch/exclude-udebs
@@ -54,16 +54,18 @@ rootskel-bootfloppy
 cdebconf-gtk-udeb
 fontconfig-udeb
 libatk1.0-udeb
-libdirectfb-0.9-19-udeb
+libcairo2-directfb-udeb
+libcairo-directfb2-udeb
+libdirectfb-0.9-22-udeb
+libdirectfb-0.9-24-udeb
+libdirectfb-0.9-25-udeb
 libexpat1-udeb
 libfreetype6-udeb
 libglib2.0-udeb
 libgtk+2.0-directfb0-udeb
 libpango1.0-udeb
 libpng12-0-udeb
-ttf-freefont-udeb
-ttf-cjk-compact-udeb
-libdirectfb-0.9-22-udeb
+ttf-*
 fbset-udeb
 # This udeb is not in good shape and is largely supersceded by
 # cdebconf-newt-udeb
@@ -106,12 +108,20 @@ ltsp-client-builder
 autopartkit
 lvm10-udeb
 # If needed, will be on the initrd already.
+modutils-full
 module-init-tools-udeb
+arch-detect
+env-preseed
 rescue-check
 rootskel-gtk
 cdebconf-text-udeb
+brltty-udeb
+klibc-utils-udeb
+libklibc-udeb
+udev-udeb
+mouse-modules-*
 # Obsolete
-hw-detect-full
+libslang1-utf8-udeb
 # Eh?
 gnumach-udeb
 # Exclude apt-setup components; they will be included 
diff --git a/data/etch/exclude-udebs-amd64 b/data/etch/exclude-udebs-amd64
index 6312cc3a..54606e8b 100644
--- a/data/etch/exclude-udebs-amd64
+++ b/data/etch/exclude-udebs-amd64
@@ -25,11 +25,8 @@ 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
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/etch/exclude-udebs-i386 b/data/etch/exclude-udebs-i386
index 0189e6b0..86c4fb11 100644
--- a/data/etch/exclude-udebs-i386
+++ b/data/etch/exclude-udebs-i386
@@ -25,7 +25,8 @@ userdevfs
 # The speakup kernel modules are not useful unless the access images are
 # provided.
 *-speakup-di
-# These udebs are not used yet.
-mouse-modules-*
 # Only needed on arches that use partconf or autopartkit.
 partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/etch/exclude-udebs-powerpc b/data/etch/exclude-udebs-powerpc
index 0ae1c0cf..7b0cf5f6 100644
--- a/data/etch/exclude-udebs-powerpc
+++ b/data/etch/exclude-udebs-powerpc
@@ -25,3 +25,8 @@ 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/etch/exclude-udebs-sparc b/data/etch/exclude-udebs-sparc
index cc305980..2695af27 100644
--- a/data/etch/exclude-udebs-sparc
+++ b/data/etch/exclude-udebs-sparc
@@ -1,3 +1,8 @@
 # 2.4 kernels no longer supported
 *-2.4.27-2-sparc32-di
 *-2.4.27-2-sparc64-di
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/debian/changelog b/debian/changelog
index 4c22b253..8164c733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,8 +108,9 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
   [ Frans Pop ]
   * There are no "tape" images with 2.6.16 for S/390.
   * Exclude floppy and el-torito images for i386 as they are not being built.
+  * Update exclude-udebs lists.
 
- -- Frans Pop <fjp@debian.org>  Sat, 29 Jul 2006 23:07:48 +0200
+ -- Frans Pop <fjp@debian.org>  Tue,  1 Aug 2006 17:25:44 +0200
 
 debian-cd (2.2.24) unstable; urgency=low