X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=8d388bbde4b28bec72f0ce7c33e359d4a0bb07d1;hp=c2ab04ade1924c6d29e3f6d2e2817b72dd36fc69;hb=ed479669bb2a2c5fb0974718aaaf7bcc1d3c1320;hpb=82f9695335f16259ceb18fa54a3cb81cd1a42ce3

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index c2ab04a..8d388bb 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -98,7 +98,6 @@ lcdtest
 libacme-bleach-perl
 libacme-eyedrops-perl
 libacme-smirch-perl
-libewf
 libpam-thinkfinger
 libstdc++2.10-glibc2.2
 md5deep
@@ -575,6 +574,7 @@ dvd+rw-tools
 dvi2tty
 dvipng
 dviutils
+dvtm
 dwdiff
 dwm
 dwm-tools
@@ -994,6 +994,7 @@ lft
 lftp
 libaa-bin
 libcap2-bin
+libewf1
 libpam-chroot
 libpam-devperm
 libpam-dotfile
@@ -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
@@ -2118,6 +2117,8 @@ tp-smapi-modules-2.6.28-grml
 virtualbox-ose-guest-modules-2.6.28-grml virtualbox-ose-guest-utils
 #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