X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=d2af90eb947e343770bce5522f01c06aac58f635;hb=3225bdd786f082d99113e3bfc58afde8d843db5d;hp=c516ed5b564e355c135b6b4fc3fae92da6d327ce;hpb=e5bc053219a216f7738645c5be0120477a95200e;p=grml-live.git

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index c516ed5..d2af90e 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -24,7 +24,6 @@ afflib
 amap
 asleap
 bar
-base64
 bfa
 bkp
 btsco
@@ -99,7 +98,6 @@ lcdtest
 libacme-bleach-perl
 libacme-eyedrops-perl
 libacme-smirch-perl
-libewf
 libpam-thinkfinger
 libstdc++2.10-glibc2.2
 md5deep
@@ -576,6 +574,7 @@ dvd+rw-tools
 dvi2tty
 dvipng
 dviutils
+dvtm
 dwdiff
 dwm
 dwm-tools
@@ -995,6 +994,7 @@ lft
 lftp
 libaa-bin
 libcap2-bin
+libewf1
 libpam-chroot
 libpam-devperm
 libpam-dotfile
@@ -1059,7 +1059,6 @@ m4
 macchanger
 macutils
 madison-lite
-madwifi-tools
 magicrescue
 mailcheck
 maildirsync
@@ -1608,6 +1607,7 @@ snownews
 socat
 sox
 sp
+speakup-tools
 speechd-el
 speech-dispatcher
 speedometer
@@ -2081,8 +2081,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
@@ -2103,7 +2103,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 +2115,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 {{{
@@ -2142,7 +2143,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