- Exclude xmail from CD1 (new MTA), and exim (old MTA)

- Exclude some kernel-headers with no matching kernel-images from CD1.
    - Update task lists to reflect tasksel changes.

debian/changelog

@@ -5,6 +5,9 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
     - Forgot to exclude old kernel-image-2.6.7-1-686-smp from cd #1.
     - Add network-console-config to forcd1 since it's needed by the
       network-console udeb. Closes: #279238
+    - Exclude xmail from CD1 (new MTA), and exim (old MTA)
+    - Exclude some kernel-headers with no matching kernel-images from CD1.
+    - Update task lists to reflect tasksel changes.
   * Steve McIntyre
     - Substantially updated update-cd:
        - Cope with Woody r3 updates taking more than 1 CD per

tasks/exclude-sarge

@@ -131,9 +131,15 @@ kernel-pcmcia-modules-2.4.28-1-586tsc
 kernel-pcmcia-modules-2.4.28-1-k6
 kernel-pcmcia-modules-2.4.28-1-k7
 kernel-pcmcia-modules-2.4.28-1-k7-smp
+kernel-headers-2.4.27-1-k7
+kernel-headers-2.4.27-1-k6
+kernel-headers-2.4.27-1-586tsc
+kernel-headers-2.4.27-1-k7-smp
 python2.1
 smail
 tcl8.0
 tk8.0
+exim
 xserver-xfree86-dbg
 zmailer
+xmail

tasks/task-essential-sarge

@@ -22,7 +22,6 @@ cupsys-client
 exim4
 gnome-desktop-environment
 jfbterm
-kde
 language-env
 locales
 manpages-de
@@ -46,3 +45,11 @@ xfonts-thai
 xiterm+thai
 zhcon
 t1-cyrillic
+kde-core
+kdeadmin
+kdeartwork
+kdegraphics
+kdemultimedia
+kdenetwork
+kdeutils
+kdepim

tasks/task-full-sarge

@@ -27,6 +27,14 @@ gnome-desktop-environment
 hspell-gui
 imhangul
 imhangul-status-applet
+kde-core
+kdeadmin
+kdeartwork
+kdegraphics
+kdemultimedia
+kdenetwork
+kdeutils
+kdepim
 kde
 kde-i18n-ca
 kde-i18n-da
@@ -175,7 +183,6 @@ samba-doc
 smbclient
 smbfs
 swat
-libecpg4
 pgaccess
 postgresql
 postgresql-client
@@ -210,6 +217,7 @@ kde-i18n-ca
 koffice-i18n-ca
 language-env
 mozilla-locale-ca
+mozilla-xft
 myspell-ca
 openoffice.org-l10n-ca
 util-linux-locales

tasks/unexclude-CD2-sarge

@@ -55,12 +55,12 @@ kernel-image-2.6-386
 kernel-image-2.6-686
 kernel-image-2.6-686-smp
 kernel-image-2.6-k7
+kernel-image-2.6-k7-smp
 kernel-image-2.6-amd64-generic
 kernel-image-2.6-amd64-k8
 kernel-image-2.6-amd64-k8-smp
 kernel-image-2.6-em64t-p4
 kernel-image-2.6-em64t-p4-smp
-kernel-image-2.6-k7-smp
 kernel-image-2.6.3-1-386
 kernel-image-2.6.3-1-686
 kernel-image-2.6.3-1-686-smp
@@ -131,9 +131,15 @@ kernel-pcmcia-modules-2.4.28-1-586tsc
 kernel-pcmcia-modules-2.4.28-1-k6
 kernel-pcmcia-modules-2.4.28-1-k7
 kernel-pcmcia-modules-2.4.28-1-k7-smp
+kernel-headers-2.4.27-1-k7
+kernel-headers-2.4.27-1-k6
+kernel-headers-2.4.27-1-586tsc
+kernel-headers-2.4.27-1-k7-smp
 python2.1
 smail
 tcl8.0
 tk8.0
+exim
 xserver-xfree86-dbg
 zmailer
+xmail