diff --git a/debian/changelog b/debian/changelog index 34b67150..13beaaa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,9 +43,6 @@ debian-cd (2.2.24) UNRELEASED; urgency=low situations with a non-official Debian mirror. Neccessary since the new version of debootstrap has dependency resolution enabled by default. * Don't chmod amiboot if it doesn't exist. - * Try forcing debconf onto CDs to attempt to get debian-cd not to include - both it and cdebconf for | dependencies. cdebconf isn't usable right now - and has a large dependency chain. [ Sven Luther ] * Fixed powerpc cd builds, added powerpc64 kernels to etch/sid, dropped @@ -57,6 +54,9 @@ debian-cd (2.2.24) UNRELEASED; urgency=low 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. + * Exclude cdebconf from CD1s to prevent both it and debconf being pulled in + by | dependencies. cdebconf isn't usable right now and has a large + dependency chain. [ Colin Watson ] * generate_di+k_list: Add hfsutils for powerpc; it's no longer in base but diff --git a/tasks/exclude-etch b/tasks/exclude-etch index 8d5bbb0b..a683a356 100644 --- a/tasks/exclude-etch +++ b/tasks/exclude-etch @@ -18,3 +18,4 @@ exim xserver-xfree86-dbg zmailer xmail +cdebconf diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list index aa20a85d..b4f0c8fa 100755 --- a/tools/generate_di+k_list +++ b/tools/generate_di+k_list @@ -42,7 +42,6 @@ reiserfsprogs libfribidi0 localization-config acpid -debconf #ifdef ARCH_i386 discover