X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=c5bff220ba33793719c178e191a07ac0be4ec68b;hp=2c010855c7f4fcc7528007b0c1189c133e5a410a;hb=ef959606acf71972690b75197801a0354444c160;hpb=0eb0ca5b67506ab38fd1cef90150e1edc59cdfbb

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 2c01085..c5bff22 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -574,6 +574,7 @@ dvd+rw-tools
 dvi2tty
 dvipng
 dviutils
+dvtm
 dwdiff
 dwm
 dwm-tools
@@ -1058,7 +1059,6 @@ m4
 macchanger
 macutils
 madison-lite
-madwifi-tools
 magicrescue
 mailcheck
 maildirsync
@@ -2080,8 +2080,8 @@ PACKAGES aptitude I386
 
 ## general:
 grml
-# we want to use linux-kernel-headers-grml instead of linux-libc-dev:
-linux-kernel-headers-grml
+# use linux-kernel-headers-grml instead of linux-libc-dev?
+# linux-kernel-headers-grml
 
 ## current kernel version 2.6.28-grml:
 acx100-2.6.28-grml
@@ -2102,7 +2102,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
@@ -2115,9 +2114,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 {{{
@@ -2141,7 +2142,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