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

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index ba767ad..1c70f64 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -16,14 +16,11 @@ PACKAGES aptitude
 ## }}}
 
 ## grml specific packages {{{
-3ware-cli-binary
 aamath
 advchk
 aesutil
 afflib
 amap
-asleap
-bar
 bfa
 bkp
 btsco
@@ -32,68 +29,40 @@ cpuburn-in-binary
 ctapi-cyberjack
 ctris
 dd-rhelp
-ded
 deletemail
 dired
 dupmerge
 dupseek
-dynamic-disk
 elizatalk
 ex
 ext3rminator
-firescope
 ftpbackup
 fvwm-crystal-minimal
 gateguardian
 gatling
 gifshuffle
 glipper-nognome
-grml2hd
-grml2hd-utils
-grml2usb
-grml-autoconfig
-grml-crypt
-grml-ddcxinfo
-grml-debian-keyring
-grml-debootstrap
 grml-debugtools
 grml-desktop
 grml-docs
-grml-etc
-grml-etc-core
 grml-files
 grml-firefox
-grml-hwinfo
 grml-laptop
 grml-live
-grml-mercurial-utils
-grml-network
 grml-paste
-grml-policyrcd
 grml-pylib
-grml-rebuildfstab
-grml-saveconfig
-grml-scanpartitions
-grml-scripts
+grml-quickconfig-standard
 grml-sectools
-grml-shlib
 grml-templates
 grml-terminalserver
-grml-terminalserver-data
-grml-tips
-grml-usleep
-grml-vpn
 grml-x
 heirloom-sh
 histring
-hydra
 i855crt
 icmp-mtu
 icmp-quench
 icmp-reset
 ipw-firmware
-lame
-latextug
 lcdtest
 libacme-bleach-perl
 libacme-eyedrops-perl
@@ -112,7 +81,6 @@ pspax
 ptfinder
 rainbowcrack
 rootsh
-salvage-ntfs
 shadowfs
 shish
 shmux
@@ -125,32 +93,15 @@ tal
 texttools-doc
 thc-ipv6
 thinkfinger-tools
-tlswrap
-tpm-tools
-trousers
-udev
 upgrade-oldest
 zfs-fuse
 zsh-lovers
 ## }}}
 
-## Notice: this packages are known to be x86-only currently [2007-11-04] {{{
-# aesutil afflib asleap bar bfa btsco classpath classpath-qtpeer cmospwd
-# cpuburn-in-binary ctapi-cyberjack ctris ddrescue dd-rhelp ded deletemail
-# devscripts dired dupseek dynamic-disk ex ext3rminator firescope ftpbackup
-# fvwm-crystal-minimal gateguardian gatling gcjwebplugin gifshuffle
-# glipper-nognome grml-ddcxinfo grml-reportbug grml-robocup-files grml-samsung-x20
-# histring hydra i855crt icmp-mtu icmp-quench icmp-reset lame lame-extras libewf
-# magicrescue multiseat ncp prosilla pspax ptfinder quadkonsole rootsh
-# salvage-ntfs shadowfs shish shmux speechd-up squashfs
-# sudosh tal thc-pptp-bruter tlswrap tpm-tools trapdoor2 trousers yersinia
-## }}}
-
 ## Official Debian packages {{{
 2vcard
 3270-common
 4g8
-915resolution
 9base
 9menu
 abcde
@@ -172,7 +123,6 @@ afio
 aggregate
 aiccu
 aircrack-ng
-airsnort
 ajaxterm
 alien
 alsa-base
@@ -224,11 +174,9 @@ arptables
 arpwatch
 array-info
 arrayprobe
-array-util
 ascii
 ascii2binary
 asciidoc
-ash
 asn1c
 asql
 asr-manpages
@@ -244,15 +192,12 @@ atop
 atsar
 attr
 aub
-auctex
-aufs-tools
 aumix
 auto-apt
 autoconf
 automake
 automake1.4
 automake1.7
-automake1.8
 automake1.9
 autopsy
 autossh
@@ -279,7 +224,6 @@ bash-doc
 bash-minimal
 bash-static
 bastille
-bazaar
 bb
 bbe
 bc
@@ -290,7 +234,6 @@ beep
 bfbtester
 biabam
 bibcursed
-biew
 bin86
 binclock
 bind9
@@ -324,15 +267,13 @@ bsdmainutils
 bsdtar
 bsdutils
 bsign
+btrfs-tools
 btscanner
 buffer
 build-essential
 burn
-busybox
 bvi
 bwm-ng
-bzip2
-bzr
 c3270
 cabber
 cabextract
@@ -344,7 +285,6 @@ calife
 camserv
 capiutils
 catdoc
-catdvi
 cbm
 cbrowser
 ccache
@@ -375,8 +315,8 @@ cfengine2
 cfv
 cgdb
 check
-cheops
 chkrootkit
+chntpw
 chrootuid
 clamav
 clamav-base
@@ -384,18 +324,20 @@ clamav-daemon
 clamav-freshclam
 clamav-testfiles
 clex
+clive
 cloop-utils
 cmatrix
 cmus
 codeville
 colorgcc
+comgt
 compartment
 concalc
 configure-debian
+conkeror
 conky
 connect-proxy
 conntrack
-console-common
 console-data
 console-terminus
 console-tools
@@ -409,8 +351,6 @@ cpio
 cpipe
 cplay
 cpp
-cpp-2.95
-cpp-4.1
 cproto
 cpu
 cpuburn
@@ -418,11 +358,8 @@ cpufrequtils
 cpuid
 cpulimit
 crack
-crack-common
-cracklib2
 cracklib-runtime
 cramfsprogs
-cron
 crosshurd
 cryptcat
 cryptsetup
@@ -430,7 +367,6 @@ cscope
 csh
 csstidy
 csync2
-ctioga
 ctorrent
 ctrlproxy
 cu
@@ -455,8 +391,6 @@ dares
 dares-qt
 dash
 davfs2
-db4.3-util
-dbishell
 dbs
 dbus
 dbus-x11
@@ -466,7 +400,6 @@ dconf
 dcraw
 dctrl-tools
 ddccontrol
-ddccontrol-db
 ddclient
 ddrescue
 dds2tar
@@ -481,22 +414,18 @@ debian-goodies
 debian-reference-common
 debian-reference-en
 debianutils
-debmake
 debmirror
 debootstrap
-deborphan
 debsecan
 debsigs
 debsums
 defoma
-defrag
 detachtty
 detox
 devio
 devscripts
 devtodo
 dhcp3-client
-dhcp3-common
 dhcp3-server
 dhcpdump
 dhcping
@@ -511,9 +440,8 @@ diction
 dictionaries-common
 dietlibc
 dietlibc-dev
-diff
 diffstat
-dillo
+diffutils
 ding
 dir2ogg
 dirdiff
@@ -524,7 +452,6 @@ disktype
 distcc
 distmp3
 dlint
-dmidecode
 dmraid
 dmsetup
 dns2tcp
@@ -565,35 +492,26 @@ dumputils
 duplicity
 dupload
 durep
-dvb-utils
+dvb-apps
 dvdbackup
 dvdisaster
 dvd+rw-tools
-dvi2tty
-dvipng
-dviutils
 dvtm
 dwdiff
 dwm
 dwm-tools
-dynafont
 dzen2
-e2fslibs
 e2fsprogs
 e2tools
 e2undel
 e3
 ebtables
-eciadsl
 ecryptfs-utils
 ed
-edac-utils
 edbrowse
 eflite
 eieio
-eject
 electric-fence
-elfkickers
 elfsh
 elinks
 elmo
@@ -601,10 +519,6 @@ elscreen
 elvis
 elvis-common
 emacs
-emacs22
-emacs22-bin-common
-emacs22-common
-emacsen-common
 emcast
 emuga
 encfs
@@ -615,9 +529,7 @@ epdfview
 equivs
 erc
 es
-esound-common
 espeak
-espeak-data
 espeakup
 etckeeper
 eterm
@@ -625,7 +537,6 @@ etherwake
 ethstatus
 ethtool
 etpan-ng
-ettercap-common
 ettercap-gtk
 euro-support
 evilwm
@@ -633,11 +544,11 @@ evms
 evms-bootdebug
 evms-cli
 evms-ncurses
+ewf-tools
 exifprobe
 exiftran
 exiv2
 expect
-ext2resize
 ext3grep
 exuberant-ctags
 faad
@@ -647,30 +558,29 @@ fai-doc
 fail2ban
 fai-server
 fake
-fakechroot
 fakeroot
 faketime
 farpd
+fatattr
 fatresize
 fatsort
 fbgrab
 fbi
 fbset
-fcoretools
+fbterm
 fcrackzip
 fdflush
 fdupes
 fdutils
+febootstrap
 feh
 fetchmail
 fgetty
-file
 filepp
-file-rc
 filetraq
-fileutils
 findutils
 finger
+fio
 firehol
 fish
 flashrom
@@ -695,17 +605,15 @@ fortunes-min
 fping
 fprobe
 fprobe-ulog
-fragroute
 freeglut3
 freeradius
 freeradius-ldap
 freesweep
+fsarchiver
 ftp
 ftpcopy
 ftp-upload
 ftpwatch
-fttools
-funionfs
 funny-manpages
 fusedav
 fuseiso
@@ -716,17 +624,14 @@ fvwm
 fwlogwatch
 fxload
 g++
-g++-4.1
 gaffitter
 gamin
-gawk
 gcal
 gcc
 gcolor2
-gcom
 gdb
 gddrescue
-gdk-imlib11
+gdisk
 geeqie
 gems
 genders
@@ -744,6 +649,7 @@ giblib1
 gif2png
 giftcurs
 git-core
+git-email
 gitpkg
 git-svn
 gitweb
@@ -758,11 +664,10 @@ gkrellm-x86info
 gkrellshoot
 gkrellweather
 glark
-gmailfs
 gmrun
-gnuhtml2latex
 gnuit
 gnupg
+gnupg2
 gnupg-agent
 gnupg-pkcs11-scd
 gnutls-bin
@@ -773,34 +678,29 @@ gpgsm
 gpgv
 gphoto2
 gpm
+gptsync
 gq
-gqcam
 grabc
 graphviz
 grep
 grepmail
 groff
-grub
-gscanbus
 gsfonts
 gsfonts-x11
 gsm-utils
 gtkam
 guessnet
+guymager
 gv
-gzip
 gzrt
 habak
 hal
 hal-info
 haproxy
-harden-remoteaudit
 harden-tools
 hasciicam
 hdapsd
-hdaps-utils
 hddtemp
-hdparm
 hexedit
 hfsplus
 hfsprogs
@@ -812,13 +712,10 @@ hnb
 honeyd
 hostapd
 hostap-utils
-hostname
 hotkeys
 hotkey-setup
 hotswap-text
 hoz
-hpijs
-hping2
 hping3
 ht
 htcheck
@@ -829,16 +726,13 @@ httping
 httptunnel
 hunt
 hwdata
-hwinfo
 i2c-tools
 i810switch
 i8kutils
 ibod
 ibritish
 icecast2
-icedax
 iceweasel
-iceweasel-webdeveloper
 icheck
 icmpush
 id3
@@ -853,8 +747,6 @@ ifstat
 iftop
 ifupdown
 ifupdown-extra
-ifupdown-scripts-zg2
-igal
 ihu
 ii
 iisemulator
@@ -868,11 +760,10 @@ im-switch
 imwheel
 inadyn
 indent
+infiniband-diags
 info
 info2www
 ingerman
-initramfs-tools
-initscripts
 ink
 inotail
 inoticoming
@@ -890,7 +781,6 @@ ipppd
 iprelay
 iproute
 ipsec-tools
-ipset
 iptables
 iptraf
 iptstate
@@ -899,10 +789,8 @@ iputils-tracepath
 ipv6calc
 ipvsadm
 ipx
-ipxripd
 ipython
 irb
-irb1.8
 ircii
 irda-utils
 irqbalance
@@ -914,11 +802,11 @@ iscsitarget
 isdnactivecards
 isdnutils-base
 isdnvboxclient
-isic
 ispell
 isync
 itop
 ivtv-utils
+iw
 iwatch
 jack
 jackd
@@ -933,7 +821,6 @@ jhead
 jigit
 jigl
 jikes
-jmon
 joe
 john
 joystick
@@ -950,11 +837,9 @@ keychain
 keynav
 keyutils
 kismet
-klibc-utils
 knockd
 knocker
 konwert
-konwert-filters
 kpartx
 kqemu-common
 krb5-config
@@ -962,17 +847,9 @@ krb5-user
 ksh
 kvm
 labrea
-lacheck
-lanmap
-laptop-detect
 laptop-mode-tools
 latencytop
-latex-beamer
-latexmk
-latex-mk
-latex-xcolor
 lbdb
-lcap
 ldapscripts
 ldap-utils
 ldapvi
@@ -980,36 +857,32 @@ lde
 ldnsutils
 ld.so.preload-manager
 leave
-less
 lft
 lftp
 libaa-bin
 libcap2-bin
 libewf1
+libnss-mdns
 libpam-chroot
 libpam-devperm
 libpam-dotfile
-libpam-krb5
 libpam-modules
 libpam-mount
-libpam-pwgen
 libpam-smbpass
 libpam-ssh
 libpam-tmpdir
+libsmbios-bin
 libtool
 lighttpd
 lilo
 linda
 links
 links2
-linneighborhood
 lintian
 linuxdoc-tools
 linuxlogo
 linux-sound-base
-linux-wlan-ng
 listadmin
-live-initramfs
 lkl
 lltag
 lm-sensors
@@ -1024,7 +897,6 @@ login
 logrotate
 logtools
 logwatch
-lomoco
 loop-aes-utils
 loop-aes-testsuite
 lrzsz
@@ -1034,13 +906,11 @@ lsdvd
 lshw
 lslk
 lsof
-lspowertweak
 lsscsi
 ltrace
 lua50
 luasocket
 luvcview
-lvm2
 lwatch
 lynx
 lzma
@@ -1071,10 +941,10 @@ mbmon
 mboxcheck
 mboxgrep
 mbr
+mbuffer
 mc
 mcabber
 mcelog
-mdadm
 mdetect
 medusa
 memstat
@@ -1086,7 +956,6 @@ mercurial
 mesa-utils
 metamail
 mg
-mgetty
 mgp
 migrationtools
 mii-diag
@@ -1101,14 +970,12 @@ mkisofs
 mklibs-copy
 mknbi
 mksh
-mktemp
 mlocate
 mmv
-mobilemesh
 moc
 modconf
+modem-cmd
 module-assistant
-module-init-tools
 molly-guard
 monit
 moosic
@@ -1137,7 +1004,6 @@ mrxvt
 mrxvt-common
 msmtp
 msort
-ms-sys
 mtd-tools
 mtools
 mtpaint
@@ -1149,16 +1015,16 @@ multipath-tools
 multitail
 multitee
 muscletools
-mutella
 mutt
 muttprofile
 mysql-client
-mysql-client-5.0
 mysql-common
 naim
 nano
 nasm
 nast
+nbd-client
+nbd-server
 nbtscan
 ncc
 ncdu
@@ -1169,16 +1035,9 @@ ncurses-base
 ncurses-bin
 ncurses-term
 ndisc6
-ndiswrapper-common
-ndiswrapper-utils
-ndiswrapper-utils-1.1
 ndiswrapper-utils-1.9
 ne
 nedit
-nemesis
-nessusclient
-nessusd
-nessus-plugins
 netbase
 netcat
 netcat6
@@ -1194,21 +1053,23 @@ netrik
 netris
 netrw
 netsed
+netsniff-ng
 netstat-nat
 netsurf
 net-tools
 netwag
 netwox
 newsbeuter
-nfs-common
 nfs-kernel-server
+nfswatch
+nginx
 ngrep
 nictools-nopci
 nictools-pci
 nikto
+nilfs2-tools
 nload
 nmap
-nmapfe
 normalize-audio
 noshell
 nsd
@@ -1224,7 +1085,6 @@ nutcpc
 nvi
 nvidia-xconfig
 nvtv
-o3read
 obconf
 obexftp
 obexpushd
@@ -1238,15 +1098,13 @@ opalmod
 openafs-client
 openafs-krb5
 openbox
-openbsd-inetd
 opencryptoki
 openipmi
 open-iscsi
 openjade
 opensc
-openssh-client
-openssh-server
 openssl
+openvas-client
 open-vm-tools
 openvpn
 ophcrack
@@ -1264,7 +1122,6 @@ p7zip
 packeth
 packit
 pads
-paketto
 pal
 pamusb-tools
 paperkey
@@ -1285,7 +1142,6 @@ pax-utils
 pbuilder
 pbzip2
 pcaputils
-pciutils
 pcmciautils
 pconf-detect
 pconsole
@@ -1293,7 +1149,6 @@ pcopy
 pcregrep
 pcscd
 pdfcube
-pdfjam
 pdksh
 pdmenu
 pdns-backend-ldap
@@ -1313,8 +1168,8 @@ perl-modules
 perl-suid
 perl-tk
 pfqueue
-pgf
 pia
+pigz
 pilot-link
 pinentry-curses
 pinfo
@@ -1346,14 +1201,11 @@ poster
 postfix
 postfix-ldap
 postfix-pcre
-postgresql-client-8.2
-postgresql-client-common
-potion
+postgresql-client
+postmark
 powermgmt-base
 powernowd
 powertop
-powertweakd
-powertweak-gtk
 pperl
 ppmd
 ppp
@@ -1364,7 +1216,6 @@ pppstatus
 pptpd
 pptp-linux
 preload
-preview-latex-style
 prismstumbler
 pristine-tar
 privbind
@@ -1395,6 +1246,7 @@ pxe
 pxfw
 pydb
 pymacs
+pyneighborhood
 python
 python2.4
 python2.4-minimal
@@ -1418,7 +1270,6 @@ python-pexpect
 python-pyao
 python-pycallgraph
 python-pymad
-python-pyogg
 python-pysqlite2
 python-pyvorbis
 python-scapy
@@ -1431,6 +1282,7 @@ pytris
 qc-usb-utils
 qiv
 qjackctl
+qla-tools
 qprof
 qpxtool
 quilt
@@ -1471,12 +1323,9 @@ reiserfsprogs
 remind
 renameutils
 reniced
-replicator
 reportbug
 reprepro
-resolvconf
 retty
-rgpsp
 rinetd
 rinse
 rkhunter
@@ -1492,7 +1341,6 @@ rpm
 rrdtool
 rsnapshot
 rssh
-rsync
 rtorrent
 rubilicious
 ruby
@@ -1506,6 +1354,7 @@ rxvt-beta
 rxvt-unicode
 s3cmd
 s3switch
+safecopy
 saidar
 sam
 samba
@@ -1528,8 +1377,6 @@ screen
 screenie
 scrot
 scrounge-ntfs
-scsiadd
-scsi-idle
 scsitools
 sdate
 sdd
@@ -1559,11 +1406,9 @@ shorewall
 shtool
 sic
 sigit
-sing
 sipsak
 sip-tester
 sitecopy
-sjog
 sl
 slapd
 slat
@@ -1591,9 +1436,7 @@ snarf
 sniffit
 snmp
 snoopy
-snort
 snowdrop
-snownews
 socat
 sox
 sp
@@ -1629,12 +1472,11 @@ starttls
 statgrab
 statserial
 stealth
-stegdetect
 steghide
 stow
-strace
 streamripper
 stress
+stressapptest
 stunnel4
 subversion
 subversion-tools
@@ -1658,6 +1500,7 @@ sysstat
 systune
 sysvinit
 sysvinit-utils
+tableau-parm
 tagtool
 tailor
 taktuk
@@ -1688,19 +1531,8 @@ telnet-ssl
 testdisk
 tetradraw
 tetrinet-client
-tex-common
 texi2html
-texify
 texinfo
-texlive-base
-texlive-base-bin
-texlive-common
-texlive-doc-base
-texlive-fonts-recommended
-texlive-lang-german
-texlive-latex-base
-texlive-latex-recommended
-texpower
 textdraw
 tf
 tgt
@@ -1708,7 +1540,6 @@ thttpd
 tidy
 tig
 timelimit
-timeout
 tin
 tinyhoneypot
 tk8.4
@@ -1723,22 +1554,21 @@ tor
 toshset
 toshutils
 tpconfig
+tpm-tools
 tpp
 t-prot
 tra
-traceproto
 traceroute
 transfig
 trayer
 tree
 treil
 trickle
+trousers
 tshark
 tsocks
 tss
-ttf-bitstream-vera
 ttf-dejavu
-tthsum
 ttmkfdir
 ttysnoop
 tweak
@@ -1747,12 +1577,13 @@ twolame
 txt2man
 txt2pdbdoc
 txt2regex
-type1inst
 tzdata
+u3-tool
 ucf
 udftools
 udpcast
 udptunnel
+ufsutils
 ulogd
 uml-utilities
 unace
@@ -1762,9 +1593,7 @@ unhide
 uni2ascii
 unicode
 unifont
-unionfs-tools
 unison
-unison2.9.1
 units
 uniutils
 unixcw
@@ -1774,12 +1603,11 @@ unrtf
 unsort
 unzip
 update-inetd
-upstreamdev
 upx-ucl
 urlscan
 urlview
 uruk
-usbutils
+usb-modeswitch
 usbview
 userinfo
 user-setup
@@ -1802,9 +1630,6 @@ vim-addon-manager
 vim-common
 vim-gtk
 vim-gui-common
-vim-latexsuite
-vim-python
-vim-ruby
 vim-runtime
 vim-scripts
 vim-vimoutliner
@@ -1812,8 +1637,6 @@ vinetto
 vkeybd
 vlan
 vlock
-vnc-common
-vncommand
 vnstat
 vobcopy
 vorbisgain
@@ -1844,7 +1667,6 @@ webcheck
 webcpp
 weblint-perl
 weechat
-weechat-common
 weechat-curses
 weechat-plugins
 weechat-scripts
@@ -1856,9 +1678,7 @@ whowatch
 wiggle
 wikipedia2text
 wikipediafs
-windowlab
 wipe
-wireless-tools
 wireshark
 wireshark-common
 wmaloader
@@ -1866,8 +1686,6 @@ wmctrl
 wmii
 wmmisc
 wondershaper
-workbone
-wpasupplicant
 wprint
 wput
 wvdial
@@ -1893,7 +1711,6 @@ xcursor-themes
 xdelta
 xdelta3
 xdesktopwaves
-xdialog
 xfaces
 xfig
 xfonts-100dpi
@@ -1917,7 +1734,6 @@ xjed
 xkb-data
 xkbset
 xloadimage
-xlockmore
 xml-core
 xmlindent
 xmlstarlet
@@ -1929,7 +1745,7 @@ xmms2-plugin-id3v2
 xmms2-plugin-jack
 xmms2-plugin-mad
 xmms2-plugin-vorbis
-xmove
+xmount
 xnee
 xnest
 xosd-bin
@@ -1944,7 +1760,6 @@ xserver-xorg
 xserver-xorg-core
 xserver-xorg-input-aiptek
 xserver-xorg-input-all
-xserver-xorg-input-elo2300
 xserver-xorg-input-elographics
 xserver-xorg-input-evdev
 xserver-xorg-input-evtouch
@@ -1964,19 +1779,15 @@ 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
 xserver-xorg-video-neomagic
-xserver-xorg-video-nsc
 xserver-xorg-video-nv
 xserver-xorg-video-radeonhd
 xserver-xorg-video-rendition
@@ -1992,12 +1803,10 @@ xserver-xorg-video-trident
 xserver-xorg-video-tseng
 xserver-xorg-video-v4l
 xserver-xorg-video-vesa
-xserver-xorg-video-vga
 xserver-xorg-video-via
 xserver-xorg-video-vmware
 xserver-xorg-video-voodoo
 xsltproc
-xsteg
 xtail
 xterm
 xtermcontrol
@@ -2006,14 +1815,15 @@ xtrace
 xtrlock
 x-ttcidfont-conf
 xtv
+xul-ext-webdeveloper
 xutils
 xutils-dev
 xvfb
 xvkbd
 xvncviewer
-xwatchwin
 xwit
 xzoom
+xz-utils
 yacpi
 yaird
 yasr
@@ -2023,7 +1833,7 @@ yersinia
 youtube-dl
 ysm
 zec
-zeroconf
+zerofree
 zgv
 zile
 zip
@@ -2043,25 +1853,18 @@ abs-guide
 agrep
 atmel-firmware
 bluez-firmware
-chntpw
 dvdrtools
 figlet
-firmware-ipw3945
 firmware-iwlwifi
 firmware-qlogic
 firmware-ralink
 iozone3
-ipw3945d
 irpas
 lha
-lmbench
 manpages-posix
 netperf
-nttcp
 python-profiler
-rar
 sl-modem-daemon
-tth
 unrar
 zd1211-firmware
 ## }}}
@@ -2074,41 +1877,26 @@ 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
-aufs-modules-2.6.28-grml
-drbd8-2.6.28-grml
-exmap-modules-2.6.28-grml
-#fglrx-kernel-2.6.28-grml
-grml-kerneladdons-2.6.28
-gspca-modules-2.6.28-grml
-iscsitarget-module-2.6.28-grml
-kqemu-modules-2.6.28-grml
-linux-doc-2.6.28-grml
-linux-headers-2.6.28-grml
-linux-image-2.6.28-grml
-#linux-source-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
-ndiswrapper-modules-2.6.28-grml
-#nvidia-kernel-2.6.28-grml
-openafs-modules-2.6.28-grml
-#open-vm-modules-2.6.28-grml
-qc-usb-modules-2.6.28-grml
-rt2400-modules-2.6.28-grml
-rt2500-modules-2.6.28-grml
-rt73-modules-2.6.28-grml
-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-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
+## current kernel version 2.6.31-grml:
+aufs-modules-2.6.31-grml
+drbd8-2.6.31-grml
+#fglrx-kernel-2.6.31-grml
+iscsitarget-module-2.6.31-grml
+kqemu-modules-2.6.31-grml
+linux-doc-2.6.31-grml
+linux-headers-2.6.31-grml
+linux-image-2.6.31-grml
+#linux-source-2.6.31-grml
+loop-aes-modules-2.6.31-grml
+ndiswrapper-modules-2.6.31-grml
+#nvidia-kernel-2.6.31-grml
+openafs-modules-2.6.31-grml
+sl-modem-modules-2.6.31-grml
+speakup-modules-2.6.31-grml
+sysprof-module-2.6.31-grml
+tp-smapi-modules-2.6.31-grml
+virtualbox-ose-guest-modules-2.6.31-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+xtables-addons-modules-2.6.31-grml
 ## }}}
 
 ## amd64 specific packages {{{
@@ -2117,28 +1905,24 @@ PACKAGES aptitude AMD64
 ## general:
 grml64
 
-## current kernel version 2.6.28-grml64:
-acx100-2.6.28-grml64
-at76-usb-modules-2.6.28-grml64
-aufs-modules-2.6.28-grml64
-drbd8-2.6.28-grml64
-exmap-modules-2.6.28-grml64
-# grml64-kerneladdons-2.6.28
-gspca-modules-2.6.28-grml64
-kqemu-modules-2.6.28-grml64
-linux-doc-2.6.28-grml64
-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-tools
-ndiswrapper-modules-2.6.28-grml64
-openafs-modules-2.6.28-grml64
-qc-usb-modules-2.6.28-grml64
-rt2400-modules-2.6.28-grml64
-rt2500-modules-2.6.28-grml64
-speakup-modules-2.6.28-grml64
-sysprof-module-2.6.28-grml64
+## current kernel version 2.6.31-grml64:
+aufs-modules-2.6.31-grml64
+drbd8-2.6.31-grml64
+#fglrx-kernel-2.6.31-grml64
+iscsitarget-module-2.6.31-grml64
+kqemu-modules-2.6.31-grml64
+linux-doc-2.6.31-grml64
+linux-headers-2.6.31-grml64
+linux-image-2.6.31-grml64
+#linux-source-2.6.31-grml
+loop-aes-modules-2.6.31-grml64
+ndiswrapper-modules-2.6.31-grml64
+#nvidia-kernel-2.6.31-grml64
+openafs-modules-2.6.31-grml64
+speakup-modules-2.6.31-grml64
+sysprof-module-2.6.31-grml64
+xtables-addons-modules-2.6.31-grml64
+#virtualbox-ose-guest-modules-2.6.31-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 ## }}}
 
 # vim: foldmethod=marker