X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=6eef477da7fb56e36f16a5cbd622558530babb28;hp=dc75757af8d8ed0f004314fb132ef568ddf7dff1;hb=df2a7a2c3894b9d39116ad92af9a2e1f1dcb2d7c;hpb=ce2488fd462565431f378e96f4dee01b17c7ba9a

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index dc75757..4f5ab98 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -13,9 +13,6 @@ PACKAGES aptitude
 #dpkg: error processing vifm (--configure):
 # subprocess post-installation script returned error exit status 1
 
-# ivtv-utils (< 1.0.3-1):
-# ships /usr/include/linux/ivtv.h => #443165
-
 ## }}}
 
 ## grml specific packages {{{
@@ -26,8 +23,6 @@ aesutil
 afflib
 amap
 asleap
-bar
-base64
 bfa
 bkp
 btsco
@@ -52,7 +47,6 @@ gateguardian
 gatling
 gifshuffle
 glipper-nognome
-grml
 grml2hd
 grml2hd-utils
 grml2usb
@@ -73,10 +67,10 @@ grml-laptop
 grml-live
 grml-mercurial-utils
 grml-network
+grml-paste
 grml-policyrcd
 grml-pylib
 grml-rebuildfstab
-grml-saveconfig
 grml-scanpartitions
 grml-scripts
 grml-sectools
@@ -90,14 +84,12 @@ 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
@@ -117,14 +109,12 @@ ptfinder
 rainbowcrack
 rootsh
 salvage-ntfs
-scrounge-ntfs
 shadowfs
 shish
 shmux
 sitar
 smap
 speechd-up
-ssdeep
 sudosh
 svn-ssh-wrappers
 tal
@@ -140,18 +130,6 @@ 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 scrounge-ntfs shadowfs shish shmux speechd-up squashfs ssdeep
-# sudosh tal thc-pptp-bruter tlswrap tpm-tools trapdoor2 trousers yersinia
-## }}}
-
 ## Official Debian packages {{{
 2vcard
 3270-common
@@ -176,8 +154,8 @@ aespipe
 aewan
 afio
 aggregate
+aiccu
 aircrack-ng
-airsnort
 ajaxterm
 alien
 alsa-base
@@ -203,7 +181,6 @@ apel
 apf-client
 apf-server
 apg
-apmd
 apt
 apt-dpkg-ref
 apt-file
@@ -230,12 +207,11 @@ arptables
 arpwatch
 array-info
 arrayprobe
-array-util
 ascii
 ascii2binary
 asciidoc
-ash
 asn1c
+asql
 asr-manpages
 astyle
 asused
@@ -256,7 +232,6 @@ autoconf
 automake
 automake1.4
 automake1.7
-automake1.8
 automake1.9
 autopsy
 autossh
@@ -294,7 +269,6 @@ beep
 bfbtester
 biabam
 bibcursed
-biew
 bin86
 binclock
 bind9
@@ -311,7 +285,7 @@ bittorrent
 bittwist
 bkhive
 blktrace
-bluetooth-alsa
+bluez-audio
 bluez-hcidump
 bluez-utils
 bmon
@@ -323,10 +297,12 @@ brltty
 brltty-flite
 bsdgames
 bsdiff
+bsd-mailx
 bsdmainutils
 bsdtar
 bsdutils
 bsign
+btrfs-tools
 btscanner
 buffer
 build-essential
@@ -335,7 +311,6 @@ busybox
 bvi
 bwm-ng
 bzip2
-bzr
 c3270
 cabber
 cabextract
@@ -347,11 +322,11 @@ calife
 camserv
 capiutils
 catdoc
-catdvi
 cbm
 cbrowser
 ccache
 ccal
+cciss-vol-status
 ccontrol
 ccrypt
 ccze
@@ -377,14 +352,12 @@ cfengine2
 cfv
 cgdb
 check
-cheops
 chkrootkit
 chrootuid
 clamav
 clamav-base
 clamav-daemon
 clamav-freshclam
-clamav-getfiles
 clamav-testfiles
 clex
 clive
@@ -393,9 +366,12 @@ cmatrix
 cmus
 codeville
 colorgcc
+comgt
 compartment
 concalc
 configure-debian
+conkeror
+conky
 connect-proxy
 conntrack
 console-common
@@ -412,8 +388,6 @@ cpio
 cpipe
 cplay
 cpp
-cpp-2.95
-cpp-4.1
 cproto
 cpu
 cpuburn
@@ -421,29 +395,24 @@ cpufrequtils
 cpuid
 cpulimit
 crack
-crack-common
 cracklib2
 cracklib-runtime
 cramfsprogs
 cron
 crosshurd
-cryopid
 cryptcat
 cryptsetup
 cscope
 csh
 csstidy
 csync2
-ctioga
 ctorrent
 ctrlproxy
 cu
 cuetools
+cups-bsd
+cups-client
 cups-pdf
-cupsys
-cupsys-bsd
-cupsys-client
-cupsys-common
 curl
 curlftpfs
 cvs
@@ -461,7 +430,6 @@ dares
 dares-qt
 dash
 davfs2
-db4.3-util
 dbishell
 dbs
 dbus
@@ -472,7 +440,6 @@ dconf
 dcraw
 dctrl-tools
 ddccontrol
-ddccontrol-db
 ddclient
 ddrescue
 dds2tar
@@ -487,7 +454,6 @@ debian-goodies
 debian-reference-common
 debian-reference-en
 debianutils
-debmake
 debmirror
 debootstrap
 deborphan
@@ -502,7 +468,6 @@ devio
 devscripts
 devtodo
 dhcp3-client
-dhcp3-common
 dhcp3-server
 dhcpdump
 dhcping
@@ -517,9 +482,7 @@ diction
 dictionaries-common
 dietlibc
 dietlibc-dev
-diff
 diffstat
-dillo
 ding
 dir2ogg
 dirdiff
@@ -530,7 +493,6 @@ disktype
 distcc
 distmp3
 dlint
-dmidecode
 dmraid
 dmsetup
 dns2tcp
@@ -560,7 +522,6 @@ dput
 drbd8-utils
 drbdlinks
 driftnet
-dropbear
 dsbltesters
 dselect
 dsh
@@ -577,27 +538,22 @@ 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
 edbrowse
 eflite
 eieio
-eject
 electric-fence
-elfkickers
 elfsh
 elinks
 elmo
@@ -605,29 +561,24 @@ elscreen
 elvis
 elvis-common
 emacs
-emacs22
-emacs22-bin-common
-emacs22-common
-emacsen-common
 emcast
-emelfm
 emuga
 encfs
 enscribe
 enscript
+ent
+epdfview
 equivs
 erc
 es
-esound-common
 espeak
-espeak-data
+espeakup
 etckeeper
 eterm
 etherwake
 ethstatus
 ethtool
 etpan-ng
-ettercap-common
 ettercap-gtk
 euro-support
 evilwm
@@ -639,7 +590,7 @@ exifprobe
 exiftran
 exiv2
 expect
-ext2resize
+ext3grep
 exuberant-ctags
 faad
 facter
@@ -650,26 +601,25 @@ fai-server
 fake
 fakechroot
 fakeroot
+faketime
 farpd
+fatattr
 fatresize
 fatsort
 fbgrab
 fbi
-fblogo
 fbset
 fcrackzip
 fdflush
 fdupes
 fdutils
+febootstrap
 feh
 fetchmail
 fgetty
 file
 filepp
-file-rc
 filetraq
-fileutils
-findimagedupes
 findutils
 finger
 firehol
@@ -696,7 +646,6 @@ fortunes-min
 fping
 fprobe
 fprobe-ulog
-fragroute
 freeglut3
 freeradius
 freeradius-ldap
@@ -705,8 +654,6 @@ ftp
 ftpcopy
 ftp-upload
 ftpwatch
-fttools
-funionfs
 funny-manpages
 fusedav
 fuseiso
@@ -717,28 +664,22 @@ fvwm
 fwlogwatch
 fxload
 g++
-g++-4.1
 gaffitter
 gamin
-gawk
 gcal
 gcc
-gcc-4.1
-gcc-4.1-base
-gcc-4.2-base
 gcolor2
-gcom
 gdb
 gddrescue
-gdk-imlib11
+geeqie
 gems
 genders
-genisoimage
+genext2fs
 geresh
 getmail4
 gettext
-gettext-base
 gettext-el
+gfs2-tools
 gfs-tools
 gftp-common
 gftp-text
@@ -747,7 +688,9 @@ giblib1
 gif2png
 giftcurs
 git-core
+git-email
 gitpkg
+git-svn
 gitweb
 gkermit
 gkrellm
@@ -762,35 +705,33 @@ gkrellweather
 glark
 gmailfs
 gmrun
-gnu-fdisk
-gnuhtml2latex
+gnuit
 gnupg
+gnupg2
 gnupg-agent
+gnupg-pkcs11-scd
 gnutls-bin
 gocr
 gpart
+gparted
 gpgsm
 gpgv
 gphoto2
 gpm
+gptsync
 gq
-gqcam
-gqview
 grabc
 graphviz
 grep
 grepmail
 groff
-groff-base
 grub
-gscanbus
 gsfonts
 gsfonts-x11
 gsm-utils
 gtkam
 guessnet
 gv
-gzip
 gzrt
 habak
 hal
@@ -800,9 +741,7 @@ harden-remoteaudit
 harden-tools
 hasciicam
 hdapsd
-hdaps-utils
 hddtemp
-hdparm
 hexedit
 hfsplus
 hfsprogs
@@ -819,8 +758,6 @@ hotkeys
 hotkey-setup
 hotswap-text
 hoz
-hpijs
-hping2
 hping3
 ht
 htcheck
@@ -832,13 +769,12 @@ httptunnel
 hunt
 hwdata
 hwinfo
-hwtools
+i2c-tools
 i810switch
 i8kutils
 ibod
 ibritish
 icecast2
-icedax
 iceweasel
 iceweasel-webdeveloper
 icheck
@@ -854,7 +790,7 @@ ifrename
 ifstat
 iftop
 ifupdown
-ifupdown-scripts-zg2
+ifupdown-extra
 igal
 ihu
 ii
@@ -864,8 +800,6 @@ imagemagick
 imapcopy
 imapfilter
 imediff2
-imlib11
-imlib-base
 imsniff
 im-switch
 imwheel
@@ -883,6 +817,7 @@ inotify-tools
 input-utils
 intltool-debian
 iodine
+iotop
 ipcalc
 iperf
 ipgrab
@@ -892,6 +827,7 @@ ipppd
 iprelay
 iproute
 ipsec-tools
+ipset
 iptables
 iptraf
 iptstate
@@ -900,7 +836,6 @@ iputils-tracepath
 ipv6calc
 ipvsadm
 ipx
-ipxripd
 ipython
 irb
 irb1.8
@@ -934,7 +869,6 @@ jhead
 jigit
 jigl
 jikes
-jmon
 joe
 john
 joystick
@@ -948,6 +882,7 @@ kernel-package
 ketchup
 kexec-tools
 keychain
+keynav
 keyutils
 kismet
 klibc-utils
@@ -962,14 +897,9 @@ krb5-user
 ksh
 kvm
 labrea
-lacheck
-lanmap
 laptop-detect
 laptop-mode-tools
-latex-beamer
-latexmk
-latex-mk
-latex-xcolor
+latencytop
 lbdb
 lcap
 ldapscripts
@@ -983,28 +913,28 @@ 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
@@ -1023,6 +953,7 @@ logtools
 logwatch
 lomoco
 loop-aes-utils
+loop-aes-testsuite
 lrzsz
 lsb-base
 lsb-release
@@ -1030,11 +961,11 @@ lsdvd
 lshw
 lslk
 lsof
-lspowertweak
 lsscsi
 ltrace
 lua50
 luasocket
+luvcview
 lvm2
 lwatch
 lynx
@@ -1045,13 +976,11 @@ m4
 macchanger
 macutils
 madison-lite
-madwifi-tools
 magicrescue
 mailcheck
 maildirsync
 mailfilter
 mailplate
-mailx
 mairix
 make
 makedev
@@ -1101,7 +1030,6 @@ mksh
 mktemp
 mlocate
 mmv
-mobilemesh
 moc
 modconf
 module-assistant
@@ -1112,7 +1040,6 @@ moosic
 moreutils
 most
 mount
-mozilla-imagezoom
 mp
 mp3blaster
 mp3c
@@ -1135,7 +1062,6 @@ mrxvt
 mrxvt-common
 msmtp
 msort
-ms-sys
 mtd-tools
 mtools
 mtpaint
@@ -1147,11 +1073,9 @@ multipath-tools
 multitail
 multitee
 muscletools
-mutella
 mutt
 muttprofile
 mysql-client
-mysql-client-5.0
 mysql-common
 naim
 nano
@@ -1167,16 +1091,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
@@ -1187,7 +1104,6 @@ nethack-console
 nethogs
 netmask
 netpbm
-netpipes
 netpipe-tcp
 netrik
 netris
@@ -1201,10 +1117,12 @@ netwox
 newsbeuter
 nfs-common
 nfs-kernel-server
+nfswatch
 ngrep
 nictools-nopci
 nictools-pci
 nikto
+nilfs2-tools
 nload
 nmap
 nmapfe
@@ -1217,14 +1135,12 @@ ntfsprogs
 ntlmaps
 ntp
 ntpdate
-nufw
 nullidentd
 num-utils
 nutcpc
 nvi
 nvidia-xconfig
 nvtv
-o3read
 obconf
 obexftp
 obexpushd
@@ -1239,6 +1155,7 @@ openafs-client
 openafs-krb5
 openbox
 openbsd-inetd
+opencryptoki
 openipmi
 open-iscsi
 openjade
@@ -1246,6 +1163,9 @@ opensc
 openssh-client
 openssh-server
 openssl
+openvas-client
+openvas-server
+open-vm-tools
 openvpn
 ophcrack
 opie-client
@@ -1262,7 +1182,6 @@ p7zip
 packeth
 packit
 pads
-paketto
 pal
 pamusb-tools
 paperkey
@@ -1282,6 +1201,7 @@ paxctl
 pax-utils
 pbuilder
 pbzip2
+pcaputils
 pciutils
 pcmciautils
 pconf-detect
@@ -1290,7 +1210,6 @@ pcopy
 pcregrep
 pcscd
 pdfcube
-pdfjam
 pdksh
 pdmenu
 pdns-backend-ldap
@@ -1304,15 +1223,14 @@ pdumpfs
 pekwm
 perforate
 perl
-perl-base
 perl-doc
 perlmagick
 perl-modules
 perl-suid
 perl-tk
 pfqueue
-pgf
 pia
+pigz
 pilot-link
 pinentry-curses
 pinfo
@@ -1323,6 +1241,7 @@ pktstat
 playmidi
 playmp3list
 plptools
+pmailq
 pmidi
 pmount
 pngtools
@@ -1345,12 +1264,10 @@ postfix-ldap
 postfix-pcre
 postgresql-client-8.2
 postgresql-client-common
-potion
+postmark
 powermgmt-base
 powernowd
 powertop
-powertweakd
-powertweak-gtk
 pperl
 ppmd
 ppp
@@ -1361,7 +1278,6 @@ pppstatus
 pptpd
 pptp-linux
 preload
-preview-latex-style
 prismstumbler
 pristine-tar
 privbind
@@ -1426,16 +1342,17 @@ python-twisted-bin
 python-urwid
 pytris
 qc-usb-utils
+qiv
 qjackctl
+qla-tools
 qprof
 qpxtool
-qtparted
 quilt
 quota
 racoon
 radeontool
 radio
-raggle
+radvd
 rain
 rake
 randomize-lines
@@ -1468,12 +1385,10 @@ reiserfsprogs
 remind
 renameutils
 reniced
-replicator
 reportbug
 reprepro
 resolvconf
 retty
-rgpsp
 rinetd
 rinse
 rkhunter
@@ -1503,6 +1418,7 @@ rxvt-beta
 rxvt-unicode
 s3cmd
 s3switch
+safecopy
 saidar
 sam
 samba
@@ -1512,6 +1428,7 @@ sash
 sbm
 sc
 scalpel
+scamper
 scanlogd
 scanmem
 scantv
@@ -1523,8 +1440,8 @@ scponly
 screen
 screenie
 scrot
+scrounge-ntfs
 scsiadd
-scsi-idle
 scsitools
 sdate
 sdd
@@ -1554,11 +1471,9 @@ shorewall
 shtool
 sic
 sigit
-sing
 sipsak
 sip-tester
 sitecopy
-sjog
 sl
 slapd
 slat
@@ -1586,13 +1501,11 @@ snarf
 sniffit
 snmp
 snoopy
-snort
 snowdrop
-snownews
 socat
-sound-recorder
 sox
 sp
+speakup-tools
 speechd-el
 speech-dispatcher
 speedometer
@@ -1604,25 +1517,26 @@ splint
 splitvt
 sqlite
 sqlite3
-squashfs-tools
+squashfs-lzma-tools
 squid
 squid-common
 squidview
 src2tex
 srcinst
+ssdeep
 ssed
 ssh
 ssh-askpass
 sshfs
 ssl-cert
 ssldump
+sslscan
 ssmping
 star
 starttls
 statgrab
 statserial
 stealth
-stegdetect
 steghide
 stow
 strace
@@ -1646,12 +1560,12 @@ synergy
 syrep
 sysfsutils
 syslinux
-syslog-ng
 sysprof
 sysstat
 systune
 sysvinit
 sysvinit-utils
+tableau-parm
 tagtool
 tailor
 taktuk
@@ -1682,27 +1596,18 @@ 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
 thttpd
 tidy
+tig
+timelimit
 timeout
 tin
 tinyhoneypot
-tinysnmp-tools
 tk8.4
 tla
 tmpreaper
@@ -1718,7 +1623,6 @@ tpconfig
 tpp
 t-prot
 tra
-traceproto
 traceroute
 transfig
 trayer
@@ -1727,11 +1631,8 @@ treil
 trickle
 tshark
 tsocks
-tspc
 tss
-ttf-bitstream-vera
 ttf-dejavu
-tthsum
 ttmkfdir
 ttysnoop
 tweak
@@ -1740,8 +1641,8 @@ twolame
 txt2man
 txt2pdbdoc
 txt2regex
-type1inst
 tzdata
+u3-tool
 ucf
 udftools
 udpcast
@@ -1751,22 +1652,20 @@ uml-utilities
 unace
 unclutter
 uncrustify
+unhide
 uni2ascii
 unicode
 unifont
-unionfs-tools
 unison
-unison2.9.1
 units
 uniutils
 unixcw
 unp
 unrar-free
 unrtf
+unsort
 unzip
-unzoo
 update-inetd
-upstreamdev
 upx-ucl
 urlscan
 urlview
@@ -1794,7 +1693,6 @@ vim-addon-manager
 vim-common
 vim-gtk
 vim-gui-common
-vim-latexsuite
 vim-python
 vim-ruby
 vim-runtime
@@ -1804,8 +1702,6 @@ vinetto
 vkeybd
 vlan
 vlock
-vnc-common
-vncommand
 vnstat
 vobcopy
 vorbisgain
@@ -1848,7 +1744,6 @@ whowatch
 wiggle
 wikipedia2text
 wikipediafs
-windowlab
 wipe
 wireless-tools
 wireshark
@@ -1857,9 +1752,7 @@ wmaloader
 wmctrl
 wmii
 wmmisc
-wodim
 wondershaper
-workbone
 wpasupplicant
 wprint
 wput
@@ -1922,7 +1815,7 @@ xmms2-plugin-id3v2
 xmms2-plugin-jack
 xmms2-plugin-mad
 xmms2-plugin-vorbis
-xmove
+xmount
 xnee
 xnest
 xosd-bin
@@ -1930,13 +1823,13 @@ xpdf
 xpdf-reader
 xprobe
 xresprobe
+xrestop
 xrsh
 xsel
 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
@@ -1956,21 +1849,19 @@ 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-newport
 xserver-xorg-video-nsc
 xserver-xorg-video-nv
+xserver-xorg-video-radeonhd
 xserver-xorg-video-rendition
 xserver-xorg-video-s3
 xserver-xorg-video-s3virge
@@ -1984,12 +1875,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
@@ -2003,12 +1892,12 @@ xutils-dev
 xvfb
 xvkbd
 xvncviewer
-xwatchwin
 xwit
 xzoom
 yacpi
 yaird
 yasr
+yatm
 yeahconsole
 yersinia
 youtube-dl
@@ -2020,6 +1909,7 @@ zile
 zip
 zlib1g
 zoidberg
+zoo
 zsh
 zsh-doc
 zsh-static
@@ -2036,24 +1926,19 @@ bluez-firmware
 chntpw
 dvdrtools
 figlet
-firmware-ipw3945
 firmware-iwlwifi
 firmware-qlogic
-firmware-rt61
-firmware-rt73
-glimpse
+firmware-ralink
 iozone3
-ipw3945d
 irpas
 lha
-lmbench
+# lmbench
 manpages-posix
 netperf
-nttcp
+# nttcp
 python-profiler
 rar
 sl-modem-daemon
-tth
 unrar
 zd1211-firmware
 ## }}}
@@ -2061,51 +1946,56 @@ zd1211-firmware
 ## x86/32bit (class I386) specific packages {{{
 PACKAGES aptitude I386
 
-# we want to use linux-kernel-headers-grml instead of linux-libc-dev:
-linux-kernel-headers-grml
+## general:
+grml
+# use linux-kernel-headers-grml instead of linux-libc-dev?
+# linux-kernel-headers-grml
 
-## Current kernel version 2.6.23-grml:
-acx100-2.6.23-grml
-atl2-modules-2.6.23-grml
-aufs-modules-2.6.23-grml
-bcm5700-module-2.6.23-grml
-drbd8-2.6.23-grml
-exmap-modules-2.6.23-grml
-#fglrx-kernel-2.6.23-grml
-grml-kerneladdons-2.6.23
-gspca-modules-2.6.23-grml
-ipw3945-modules-2.6.23-grml
-iscsitarget-2.6.23-grml
-ivtv-modules-2.6.23-grml
-kqemu-modules-2.6.23-grml
-linux-doc-2.6.23-grml
-linux-headers-2.6.23-grml
-linux-image-2.6.23-grml
-#linux-source-2.6.23-grml
-linux-wlan-ng-modules-2.6.23-grml
-loop-aes-modules-2.6.23-grml
-lzma-modules-2.6.23-grml
-madwifi-modules-2.6.23-grml
-ndiswrapper-modules-2.6.23-grml
-nozomi-modules-2.6.23-grml
-#nvidia-kernel-2.6.23-grml
-openafs-modules-2.6.23-grml
-qc-usb-modules-2.6.23-grml
-realtime-lsm-module-2.6.23-grml
-rt2400-modules-2.6.23-grml
-rt2500-modules-2.6.23-grml
-rt73-module-2.6.23-grml
-sl-modem-modules-2.6.23-grml
-squashfs-modules-2.6.23-grml
-sysprof-module-2.6.23-grml
-tp-smapi-modules-2.6.23-grml
-truecrypt-2.6.23-grml
-#virtualbox-ose-modules-2.6.23-grml
-#zaptel-modules-2.6.23-grml
+## 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 {{{
 PACKAGES aptitude AMD64
-linux-image-2.6.23-grml64 aufs-modules-2.6.23-grml64
+
+## general:
+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
+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