Drop atl2* packages; rework cups selection

[grml-live.git] / etc / grml / fai / config / package_config / GRML_FULL

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 1c1316e..e2c9b0c 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -436,10 +436,9 @@ ctorrent
 ctrlproxy
 cu
 cuetools
+cups-bsd
+cups-client
 cups-pdf
-cupsys
-cupsys-bsd
-cupsys-client
 curl
 curlftpfs
 cvs
@@ -1059,7 +1058,6 @@ m4
 macchanger
 macutils
 madison-lite
-madwifi-tools
 magicrescue
 mailcheck
 maildirsync
@@ -1608,6 +1606,7 @@ snownews
 socat
 sox
 sp
+speakup-tools
 speechd-el
 speech-dispatcher
 speedometer
@@ -2087,7 +2086,6 @@ grml
 ## current kernel version 2.6.28-grml:
 acx100-2.6.28-grml
 at76-usb-modules-2.6.28-grml
-atl2-modules-2.6.28-grml
 aufs-modules-2.6.28-grml
 drbd8-2.6.28-grml
 exmap-modules-2.6.28-grml
@@ -2103,7 +2101,6 @@ linux-image-2.6.28-grml
 linux-uvc-modules-2.6.28-grml
 linux-wlan-ng-modules-2.6.28-grml
 loop-aes-modules-2.6.28-grml
-madwifi-modules-2.6.28-grml
 ndiswrapper-modules-2.6.28-grml
 #nvidia-kernel-2.6.28-grml
 openafs-modules-2.6.28-grml
@@ -2116,9 +2113,11 @@ sl-modem-modules-2.6.28-grml
 speakup-modules-2.6.28-grml
 sysprof-module-2.6.28-grml
 tp-smapi-modules-2.6.28-grml
-virtualbox-ose-guest-modules-2.6.28-grml virtualbox-ose-guest-utils
+virtualbox-ose-guest-modules-2.6.28-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 #virtualbox-ose-modules-2.6.28-grml
 #zaptel-modules-2.6.28-grml
+# madwifi is replaced by ath5k and ath9k - see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519446
+#madwifi-modules-2.6.28-grml madwifi-tools
 ## }}}
 
 ## amd64 specific packages {{{
@@ -2130,7 +2129,6 @@ grml64
 ## current kernel version 2.6.28-grml64:
 acx100-2.6.28-grml64
 at76-usb-modules-2.6.28-grml64
-atl2-modules-2.6.28-grml64
 aufs-modules-2.6.28-grml64
 drbd8-2.6.28-grml64
 exmap-modules-2.6.28-grml64
@@ -2142,7 +2140,7 @@ linux-headers-2.6.28-grml64
 linux-image-2.6.28-grml64
 #linux-source-2.6.28-grml
 loop-aes-modules-2.6.28-grml64
-madwifi-modules-2.6.28-grml64
+#madwifi-modules-2.6.28-grml64 madwifi-tools
 ndiswrapper-modules-2.6.28-grml64
 openafs-modules-2.6.28-grml64
 qc-usb-modules-2.6.28-grml64