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

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 2c01085..ba767ad 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -384,7 +384,6 @@ clamav-daemon
 clamav-freshclam
 clamav-testfiles
 clex
-clive
 cloop-utils
 cmatrix
 cmus
@@ -436,10 +435,9 @@ ctorrent
 ctrlproxy
 cu
 cuetools
+cups-bsd
+cups-client
 cups-pdf
-cupsys
-cupsys-bsd
-cupsys-client
 curl
 curlftpfs
 cvs
@@ -574,6 +572,7 @@ dvd+rw-tools
 dvi2tty
 dvipng
 dviutils
+dvtm
 dwdiff
 dwm
 dwm-tools
@@ -723,9 +722,6 @@ gamin
 gawk
 gcal
 gcc
-gcc-4.1
-gcc-4.1-base
-gcc-4.2-base
 gcolor2
 gcom
 gdb
@@ -738,7 +734,6 @@ genext2fs
 geresh
 getmail4
 gettext
-gettext-base
 gettext-el
 gfs2-tools
 gfs-tools
@@ -785,7 +780,6 @@ graphviz
 grep
 grepmail
 groff
-groff-base
 grub
 gscanbus
 gsfonts
@@ -869,8 +863,6 @@ imagemagick
 imapcopy
 imapfilter
 imediff2
-imlib11
-imlib-base
 imsniff
 im-switch
 imwheel
@@ -1058,7 +1050,6 @@ m4
 macchanger
 macutils
 madison-lite
-madwifi-tools
 magicrescue
 mailcheck
 maildirsync
@@ -1316,7 +1307,6 @@ pdumpfs
 pekwm
 perforate
 perl
-perl-base
 perl-doc
 perlmagick
 perl-modules
@@ -1607,6 +1597,7 @@ snownews
 socat
 sox
 sp
+speakup-tools
 speechd-el
 speech-dispatcher
 speedometer
@@ -2080,13 +2071,12 @@ 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
 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
@@ -2102,7 +2092,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 +2104,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 {{{
@@ -2129,7 +2120,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
@@ -2141,7 +2131,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