more forcd1 removals

discover, popularity-contest, wpasupplicant, openssh-server
  (in generate_di+k_list),
  gnupg (pulled in by debootstrap)

debian/changelog

@@ -13,7 +13,10 @@ debian-cd (3.1.10) UNRELEASED; urgency=low
     mdetect, read-edid (no longer used by xorg),
     grub (handed by generate_di+k_list),
     deborphan, debfoster, localepurge (expert user stuff),
-    chdrvfont (no such package any more)
+    chdrvfont (no such package any more),
+    discover, popularity-contest, wpasupplicant, openssh-server
+    (in generate_di+k_list),
+    gnupg (pulled in by debootstrap)
   * Updated generate_di+k_list to match more closely the current
     packages d-i apt-installs.
 

tasks/wheezy/forcd1

@@ -1,12 +1,9 @@
 openssh-client
-openssh-server
-gnupg
 build-essential
 kernel-package
 module-assistant
 debsums
 localepurge
-chdrvfont
 fbset
 fdutils
 g++
@@ -18,10 +15,8 @@ whiptail
 dialog
 doc-base
 util-linux-locales
-discover
 brltty
 espeakup
-popularity-contest
 ntpdate
 hdparm
 jfbterm
@@ -29,5 +24,4 @@ unifont
 console-cyrillic
 console-terminus
 iso-codes
-wpasupplicant
 apt-offline