Remove madwifi* from GRML_FULL and GRML_MEDIUM

diff --git a/debian/changelog b/debian/changelog
index 624cb9c..e0f1eb8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ grml-live (0.9.12) UNRELEASED; urgency=low
     bootoption and use maxcpus=0 instead of maxcpus=1.
   * Add nfs-kernel-server to GRML_MEDIUM [Closes: issue471]
   * Add dvtm to GRML_FULL (thanks to plh).
+  * Remove madwifi* from GRML_FULL and GRML_MEDIUM (being replaced
+    by ath5k and ath9k of linux kernel 2.6.28, see #519446).
 
- -- Michael Prokop <mika@grml.org>  Mon, 16 Mar 2009 13:40:17 +0100
+ -- Michael Prokop <mika@grml.org>  Tue, 17 Mar 2009 00:43:39 +0100
 
 grml-live (0.9.11) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 1c1316e..8d388bb 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -1059,7 +1059,6 @@ m4
 macchanger
 macutils
 madison-lite
-madwifi-tools
 magicrescue
 mailcheck
 maildirsync
@@ -2103,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
@@ -2119,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 {{{
@@ -2142,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

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index a438a0a..afe4eee 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -299,7 +299,7 @@ atl2-modules-2.6.28-grml
 aufs-modules-2.6.28-grml
 #grml-kerneladdons-2.6.28
 linux-image-2.6.28-grml
-madwifi-modules-2.6.28-grml madwifi-tools
+#madwifi-modules-2.6.28-grml madwifi-tools
 powernowd
 rt2400-modules-2.6.28-grml rt2500-modules-2.6.28-grml rt73-modules-2.6.28-grml firmware-ralink
 #truecrypt-2.6.28-grml
@@ -309,5 +309,5 @@ PACKAGES aptitude AMD64
 atl2-modules-2.6.28-grml64
 aufs-modules-2.6.28-grml64
 linux-image-2.6.28-grml64
-madwifi-modules-2.6.28-grml64 madwifi-tools
+#madwifi-modules-2.6.28-grml64 madwifi-tools
 #truecrypt-2.6.28-grml64