X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=3c02d6c76ecc5d056571bdef8d814565887cfc92;hb=957ffa519a5829ab3492a67dc51b5e72ea091f3a;hp=06661464ffc727003087e9b1ee5d5c6a3ebfafda;hpb=388802f14d4905d4270e1d671775c66a5e1832fc;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 0666146..3c02d6c 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
@@ -438,10 +436,9 @@ ctorrent
 ctrlproxy
 cu
 cuetools
+cups-bsd
+cups-client
 cups-pdf
-cupsys
-cupsys-bsd
-cupsys-client
 curl
 curlftpfs
 cvs
@@ -558,7 +555,6 @@ dput
 drbd8-utils
 drbdlinks
 driftnet
-dropbear
 dsbltesters
 dselect
 dsh
@@ -577,6 +573,7 @@ dvd+rw-tools
 dvi2tty
 dvipng
 dviutils
+dvtm
 dwdiff
 dwm
 dwm-tools
@@ -726,21 +723,18 @@ gamin
 gawk
 gcal
 gcc
-gcc-4.1
-gcc-4.1-base
-gcc-4.2-base
 gcolor2
 gcom
 gdb
 gddrescue
 gdk-imlib11
+geeqie
 gems
 genders
 genext2fs
 geresh
 getmail4
 gettext
-gettext-base
 gettext-el
 gfs2-tools
 gfs-tools
@@ -782,13 +776,11 @@ gphoto2
 gpm
 gq
 gqcam
-gqview
 grabc
 graphviz
 grep
 grepmail
 groff
-groff-base
 grub
 gscanbus
 gsfonts
@@ -872,8 +864,6 @@ imagemagick
 imapcopy
 imapfilter
 imediff2
-imlib11
-imlib-base
 imsniff
 im-switch
 imwheel
@@ -996,6 +986,7 @@ lft
 lftp
 libaa-bin
 libcap2-bin
+libewf1
 libpam-chroot
 libpam-devperm
 libpam-dotfile
@@ -1060,7 +1051,6 @@ m4
 macchanger
 macutils
 madison-lite
-madwifi-tools
 magicrescue
 mailcheck
 maildirsync
@@ -1318,7 +1308,6 @@ pdumpfs
 pekwm
 perforate
 perl
-perl-base
 perl-doc
 perlmagick
 perl-modules
@@ -1609,6 +1598,7 @@ snownews
 socat
 sox
 sp
+speakup-tools
 speechd-el
 speech-dispatcher
 speedometer
@@ -1975,14 +1965,12 @@ xserver-xorg-video-ark
 xserver-xorg-video-ati
 xserver-xorg-video-chips
 xserver-xorg-video-cirrus
-xserver-xorg-video-cyrix
 xserver-xorg-video-dummy
 xserver-xorg-video-fbdev
 xserver-xorg-video-glint
 xserver-xorg-video-i128
 xserver-xorg-video-i740
 xserver-xorg-video-i810
-xserver-xorg-video-imstt
 xserver-xorg-video-intel
 xserver-xorg-video-ivtv
 xserver-xorg-video-mga
@@ -2082,13 +2070,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
@@ -2104,7 +2091,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
@@ -2117,9 +2103,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 {{{
@@ -2131,7 +2119,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
@@ -2143,7 +2130,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