X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=4c9ce6cc183cfe507bc83b871d5e43c612a7e286;hb=52af937ab56463fd89120532fe314097f8de59e5;hp=994147753db8f68176c6d38afe394f3f3b1554d4;hpb=cd32c0f2e48575284125f4f8f3dcd56747bee035;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 9941477..3f62aa9 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 {{{
@@ -27,7 +24,6 @@ afflib
 amap
 asleap
 bar
-base64
 bfa
 bkp
 btsco
@@ -52,7 +48,6 @@ gateguardian
 gatling
 gifshuffle
 glipper-nognome
-grml
 grml2hd
 grml2hd-utils
 grml2usb
@@ -70,8 +65,10 @@ grml-files
 grml-firefox
 grml-hwinfo
 grml-laptop
+grml-live
 grml-mercurial-utils
 grml-network
+grml-paste
 grml-policyrcd
 grml-pylib
 grml-rebuildfstab
@@ -116,14 +113,12 @@ ptfinder
 rainbowcrack
 rootsh
 salvage-ntfs
-scrounge-ntfs
 shadowfs
 shish
 shmux
 sitar
 smap
 speechd-up
-ssdeep
 sudosh
 svn-ssh-wrappers
 tal
@@ -147,7 +142,7 @@ zsh-lovers
 # 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
+# salvage-ntfs shadowfs shish shmux speechd-up squashfs
 # sudosh tal thc-pptp-bruter tlswrap tpm-tools trapdoor2 trousers yersinia
 ## }}}
 
@@ -165,9 +160,9 @@ ace-of-penguins
 ack-grep
 acl
 acpi
-acpi-support
 acpid
 acpidump
+acpi-support
 acpitail
 acpitool
 adduser
@@ -175,38 +170,40 @@ aespipe
 aewan
 afio
 aggregate
+aiccu
 aircrack-ng
-airsnort
 ajaxterm
 alien
 alsa-base
 alsa-oss
-alsa-utils
 alsaplayer-alsa
 alsaplayer-common
 alsaplayer-gtk
 alsaplayer-jack
 alsaplayer-oss
+alsa-utils
 amanda-client
 amanda-common
 anacron
 antiword
 aoetools
+aosd-cat
+apache2.2-common
 apache2-mpm-prefork
 apache2-utils
-apache2.2-common
 apcupsd
 apcupsd-cgi
 apel
 apf-client
 apf-server
 apg
-apmd
 apt
 apt-dpkg-ref
 apt-file
+aptitude
 apt-listbugs
 apt-listchanges
+aptsh
 apt-show-source
 apt-show-versions
 apt-spy
@@ -214,26 +211,24 @@ apt-src
 apt-transport-https
 apt-utils
 apt-zip
-aptitude
-aptsh
 apwal
 ara
 archivemail
 argus-client
 aria2
 arj
-arp-scan
 arping
+arp-scan
 arptables
 arpwatch
 array-info
-array-util
 arrayprobe
 ascii
 ascii2binary
 asciidoc
 ash
 asn1c
+asql
 asr-manpages
 astyle
 asused
@@ -247,6 +242,7 @@ atop
 atsar
 attr
 aub
+auctex
 aufs-tools
 aumix
 auto-apt
@@ -254,7 +250,6 @@ autoconf
 automake
 automake1.4
 automake1.7
-automake1.8
 automake1.9
 autopsy
 autossh
@@ -266,8 +261,8 @@ awesfx
 awesome
 axel
 axp
-backup-manager
 backup2l
+backup-manager
 backuppc
 bacula-common
 bacula-console
@@ -292,13 +287,12 @@ beep
 bfbtester
 biabam
 bibcursed
-biew
 bin86
 binclock
 bind9
 bind9-host
-binfmt-support
 binfmtc
+binfmt-support
 bing
 binstats
 binutils
@@ -309,7 +303,7 @@ bittorrent
 bittwist
 bkhive
 blktrace
-bluetooth-alsa
+bluez-audio
 bluez-hcidump
 bluez-utils
 bmon
@@ -321,6 +315,7 @@ brltty
 brltty-flite
 bsdgames
 bsdiff
+bsd-mailx
 bsdmainutils
 bsdtar
 bsdutils
@@ -333,12 +328,11 @@ busybox
 bvi
 bwm-ng
 bzip2
-bzr
 c3270
-ca-certificates
 cabber
 cabextract
 caca-utils
+ca-certificates
 cadaver
 calcurse
 calife
@@ -350,15 +344,16 @@ cbm
 cbrowser
 ccache
 ccal
+cciss-vol-status
 ccontrol
 ccrypt
 ccze
-cd-discid
 cdbackup
 cdbs
 cdck
 cdda2wav
 cddb
+cd-discid
 cdebootstrap
 cdecl
 cdparanoia
@@ -375,7 +370,6 @@ cfengine2
 cfv
 cgdb
 check
-check
 cheops
 chkrootkit
 chrootuid
@@ -383,7 +377,6 @@ clamav
 clamav-base
 clamav-daemon
 clamav-freshclam
-clamav-getfiles
 clamav-testfiles
 clex
 clive
@@ -395,6 +388,7 @@ colorgcc
 compartment
 concalc
 configure-debian
+conky
 connect-proxy
 conntrack
 console-common
@@ -411,8 +405,6 @@ cpio
 cpipe
 cplay
 cpp
-cpp-2.95
-cpp-4.1
 cproto
 cpu
 cpuburn
@@ -421,12 +413,11 @@ cpuid
 cpulimit
 crack
 crack-common
-cracklib-runtime
 cracklib2
+cracklib-runtime
 cramfsprogs
 cron
 crosshurd
-cryopid
 cryptcat
 cryptsetup
 cscope
@@ -438,16 +429,14 @@ ctorrent
 ctrlproxy
 cu
 cuetools
+cups-bsd
+cups-client
 cups-pdf
-cupsys
-cupsys-bsd
-cupsys-client
-cupsys-common
 curl
 curlftpfs
 cvs
-cvs-buildpackage
 cvs2cl
+cvs-buildpackage
 cvsconnect
 cvsdelta
 cw
@@ -460,7 +449,6 @@ dares
 dares-qt
 dash
 davfs2
-db4.3-util
 dbishell
 dbs
 dbus
@@ -486,7 +474,6 @@ debian-goodies
 debian-reference-common
 debian-reference-en
 debianutils
-debmake
 debmirror
 debootstrap
 deborphan
@@ -500,14 +487,14 @@ detox
 devio
 devscripts
 devtodo
-dh-kpatches
-dh-make
-dh-make-perl
 dhcp3-client
 dhcp3-common
 dhcp3-server
 dhcpdump
 dhcping
+dh-kpatches
+dh-make
+dh-make-perl
 di
 diakonos
 dialog
@@ -518,7 +505,6 @@ dietlibc
 dietlibc-dev
 diff
 diffstat
-dillo
 ding
 dir2ogg
 dirdiff
@@ -538,9 +524,9 @@ dnsproxy
 dnstracer
 dnsutils
 docbook
+docbook2odf
 docbook-dsssl
 docbook-to-man
-docbook2odf
 dog
 doscan
 dosfstools
@@ -559,7 +545,6 @@ dput
 drbd8-utils
 drbdlinks
 driftnet
-dropbear
 dsbltesters
 dselect
 dsh
@@ -572,15 +557,16 @@ duplicity
 dupload
 durep
 dvb-utils
-dvd+rw-tools
 dvdbackup
 dvdisaster
+dvd+rw-tools
 dvi2tty
 dvipng
 dviutils
+dvtm
+dwdiff
 dwm
 dwm-tools
-dynafont
 dzen2
 e2fslibs
 e2fsprogs
@@ -588,15 +574,14 @@ e2tools
 e2undel
 e3
 ebtables
-eciadsl
 ecryptfs-utils
 ed
+edac-utils
 edbrowse
 eflite
 eieio
 eject
 electric-fence
-elfkickers
 elfsh
 elinks
 elmo
@@ -609,17 +594,19 @@ 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
@@ -639,23 +626,25 @@ exiftran
 exiv2
 expect
 ext2resize
+ext3grep
 exuberant-ctags
 faad
 facter
 fai-client
 fai-doc
-fai-server
 fail2ban
+fai-server
 fake
 fakechroot
 fakeroot
+faketime
 farpd
 fatresize
 fatsort
 fbgrab
 fbi
-fblogo
 fbset
+fcoretools
 fcrackzip
 fdflush
 fdupes
@@ -664,18 +653,17 @@ feh
 fetchmail
 fgetty
 file
-file-rc
 filepp
+file-rc
 filetraq
 fileutils
-findimagedupes
 findutils
 finger
 firehol
 fish
-fl-cow
 flashrom
 flawfinder
+fl-cow
 flex
 flexbackup
 flite
@@ -695,49 +683,43 @@ fortunes-min
 fping
 fprobe
 fprobe-ulog
-fragroute
 freeglut3
 freeradius
 freeradius-ldap
 freesweep
 ftp
-ftp-upload
 ftpcopy
+ftp-upload
 ftpwatch
-fttools
-funionfs
 funny-manpages
-fuse-utils
 fusedav
 fuseiso
 fuseiso9660
 fusesmb
+fuse-utils
 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,42 +729,42 @@ gif2png
 giftcurs
 git-core
 gitpkg
+git-svn
 gitweb
 gkermit
 gkrellm
-gkrellm-reminder
-gkrellm-volume
-gkrellm-x86info
 gkrellmd
 gkrellmitime
+gkrellm-reminder
+gkrellm-volume
 gkrellmwireless
+gkrellm-x86info
 gkrellshoot
 gkrellweather
 glark
 gmailfs
 gmrun
-gnu-fdisk
 gnuhtml2latex
+gnuit
 gnupg
 gnupg-agent
+gnupg-pkcs11-scd
 gnutls-bin
 gocr
 gpart
+gparted
 gpgsm
 gpgv
 gphoto2
 gpm
 gq
 gqcam
-gqview
 grabc
 graphviz
 grep
 grepmail
 groff
-groff-base
 grub
-gscanbus
 gsfonts
 gsfonts-x11
 gsm-utils
@@ -799,7 +781,6 @@ harden-remoteaudit
 harden-tools
 hasciicam
 hdapsd
-hdaps-utils
 hddtemp
 hdparm
 hexedit
@@ -811,14 +792,13 @@ hibernate
 hicolor-icon-theme
 hnb
 honeyd
-hostap-utils
 hostapd
+hostap-utils
 hostname
-hotkey-setup
 hotkeys
+hotkey-setup
 hotswap-text
 hoz
-hpijs
 hping2
 hping3
 ht
@@ -831,7 +811,7 @@ httptunnel
 hunt
 hwdata
 hwinfo
-hwtools
+i2c-tools
 i810switch
 i8kutils
 ibod
@@ -853,20 +833,18 @@ ifrename
 ifstat
 iftop
 ifupdown
-ifupdown-scripts-zg2
+ifupdown-extra
 igal
 ihu
 ii
 iisemulator
 ike-scan
-im-switch
 imagemagick
 imapcopy
 imapfilter
 imediff2
-imlib-base
-imlib11
 imsniff
+im-switch
 imwheel
 inadyn
 indent
@@ -882,6 +860,7 @@ inotify-tools
 input-utils
 intltool-debian
 iodine
+iotop
 ipcalc
 iperf
 ipgrab
@@ -891,6 +870,7 @@ ipppd
 iprelay
 iproute
 ipsec-tools
+ipset
 iptables
 iptraf
 iptstate
@@ -899,7 +879,6 @@ iputils-tracepath
 ipv6calc
 ipvsadm
 ipx
-ipxripd
 ipython
 irb
 irb1.8
@@ -933,7 +912,6 @@ jhead
 jigit
 jigl
 jikes
-jmon
 joe
 john
 joystick
@@ -947,6 +925,7 @@ kernel-package
 ketchup
 kexec-tools
 keychain
+keynav
 keyutils
 kismet
 klibc-utils
@@ -965,23 +944,26 @@ lacheck
 lanmap
 laptop-detect
 laptop-mode-tools
+latencytop
 latex-beamer
+latexmk
 latex-mk
 latex-xcolor
-latexmk
 lbdb
 lcap
-ld.so.preload-manager
-ldap-utils
 ldapscripts
+ldap-utils
 ldapvi
 lde
 ldnsutils
+ld.so.preload-manager
 leave
 less
 lft
 lftp
 libaa-bin
+libcap2-bin
+libewf1
 libpam-chroot
 libpam-devperm
 libpam-dotfile
@@ -998,12 +980,10 @@ lilo
 linda
 links
 links2
-linneighborhood
 lintian
-linux-sound-base
-linux-wlan-ng
 linuxdoc-tools
 linuxlogo
+linux-sound-base
 listadmin
 live-initramfs
 lkl
@@ -1022,6 +1002,7 @@ logtools
 logwatch
 lomoco
 loop-aes-utils
+loop-aes-testsuite
 lrzsz
 lsb-base
 lsb-release
@@ -1029,11 +1010,11 @@ lsdvd
 lshw
 lslk
 lsof
-lspowertweak
 lsscsi
 ltrace
 lua50
 luasocket
+luvcview
 lvm2
 lwatch
 lynx
@@ -1044,13 +1025,11 @@ m4
 macchanger
 macutils
 madison-lite
-madwifi-tools
 magicrescue
 mailcheck
 maildirsync
 mailfilter
 mailplate
-mailx
 mairix
 make
 makedev
@@ -1098,8 +1077,8 @@ mklibs-copy
 mknbi
 mksh
 mktemp
+mlocate
 mmv
-mobilemesh
 moc
 modconf
 module-assistant
@@ -1110,7 +1089,6 @@ moosic
 moreutils
 most
 mount
-mozilla-imagezoom
 mp
 mp3blaster
 mp3c
@@ -1131,21 +1109,19 @@ mr
 mrb
 mrxvt
 mrxvt-common
-ms-sys
 msmtp
 msort
-mt-st
 mtd-tools
 mtools
-mtp-tools
 mtpaint
+mtp-tools
 mtr-tiny
+mt-st
 multi-aterm
 multipath-tools
 multitail
 multitee
 muscletools
-mutella
 mutt
 muttprofile
 mysql-client
@@ -1165,17 +1141,12 @@ ncurses-base
 ncurses-bin
 ncurses-term
 ndisc6
-ndiswrapper-common
-ndiswrapper-utils
-ndiswrapper-utils-1.1
 ndiswrapper-utils-1.9
 ne
 nedit
-nemesis
-nessus-plugins
 nessusclient
 nessusd
-net-tools
+nessus-plugins
 netbase
 netcat
 netcat6
@@ -1187,18 +1158,19 @@ nethogs
 netmask
 netpbm
 netpipe-tcp
-netpipes
 netrik
 netris
 netrw
 netsed
 netstat-nat
 netsurf
+net-tools
 netwag
 netwox
 newsbeuter
 nfs-common
 nfs-kernel-server
+nfswatch
 ngrep
 nictools-nopci
 nictools-pci
@@ -1215,14 +1187,12 @@ ntfsprogs
 ntlmaps
 ntp
 ntpdate
-nufw
 nullidentd
 num-utils
 nutcpc
 nvi
 nvidia-xconfig
 nvtv
-o3read
 obconf
 obexftp
 obexpushd
@@ -1233,25 +1203,27 @@ olsrd
 olsrd-plugins
 op
 opalmod
-open-iscsi
 openafs-client
 openafs-krb5
 openbox
 openbsd-inetd
+opencryptoki
 openipmi
+open-iscsi
 openjade
 opensc
 openssh-client
 openssh-server
 openssl
+open-vm-tools
 openvpn
 ophcrack
 opie-client
 orange
 orpheus
-os-prober
 osdsh
 osiris
+os-prober
 oss-compat
 p0f
 p3nfs
@@ -1260,7 +1232,6 @@ p7zip
 packeth
 packit
 pads
-paketto
 pal
 pamusb-tools
 paperkey
@@ -1276,10 +1247,11 @@ patcher
 patchutils
 pavuk
 pax
-pax-utils
 paxctl
+pax-utils
 pbuilder
 pbzip2
+pcaputils
 pciutils
 pcmciautils
 pconf-detect
@@ -1302,12 +1274,11 @@ pdumpfs
 pekwm
 perforate
 perl
-perl-base
 perl-doc
+perlmagick
 perl-modules
 perl-suid
 perl-tk
-perlmagick
 pfqueue
 pgf
 pia
@@ -1321,6 +1292,7 @@ pktstat
 playmidi
 playmp3list
 plptools
+pmailq
 pmidi
 pmount
 pngtools
@@ -1343,12 +1315,9 @@ postfix-ldap
 postfix-pcre
 postgresql-client-8.2
 postgresql-client-common
-potion
 powermgmt-base
 powernowd
 powertop
-powertweak-gtk
-powertweakd
 pperl
 ppmd
 ppp
@@ -1356,8 +1325,8 @@ pppconfig
 pppoe
 pppoeconf
 pppstatus
-pptp-linux
 pptpd
+pptp-linux
 preload
 preview-latex-style
 prismstumbler
@@ -1391,6 +1360,10 @@ pxfw
 pydb
 pymacs
 python
+python2.4
+python2.4-minimal
+python2.5
+python2.5-minimal
 python-apt
 python-cddb
 python-celementtree
@@ -1418,22 +1391,18 @@ python-subversion
 python-support
 python-twisted-bin
 python-urwid
-python2.4
-python2.4-minimal
-python2.5
-python2.5-minimal
 pytris
 qc-usb-utils
+qiv
 qjackctl
 qprof
 qpxtool
-qtparted
 quilt
 quota
 racoon
 radeontool
 radio
-raggle
+radvd
 rain
 rake
 randomize-lines
@@ -1491,9 +1460,9 @@ rsync
 rtorrent
 rubilicious
 ruby
-ruby-prof
 ruby1.8
 ruby1.8-examples
+ruby-prof
 rungetty
 runit
 rutilt
@@ -1501,6 +1470,7 @@ rxvt-beta
 rxvt-unicode
 s3cmd
 s3switch
+safecopy
 saidar
 sam
 samba
@@ -1510,6 +1480,7 @@ sash
 sbm
 sc
 scalpel
+scamper
 scanlogd
 scanmem
 scantv
@@ -1521,7 +1492,7 @@ scponly
 screen
 screenie
 scrot
-scsi-idle
+scrounge-ntfs
 scsiadd
 scsitools
 sdate
@@ -1552,11 +1523,9 @@ shorewall
 shtool
 sic
 sigit
-sing
-sip-tester
 sipsak
+sip-tester
 sitecopy
-sjog
 sl
 slapd
 slat
@@ -1573,26 +1542,24 @@ slurm
 sm
 smake
 smartmontools
-smb-nat
 smbc
 smbclient
 smbfs
 smbldap-tools
+smb-nat
 smbnetfs
 sn
 snarf
 sniffit
 snmp
 snoopy
-snort
 snowdrop
-snownews
 socat
-sound-recorder
 sox
 sp
-speech-dispatcher
+speakup-tools
 speechd-el
+speech-dispatcher
 speedometer
 speex
 spell
@@ -1602,25 +1569,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
@@ -1644,13 +1612,11 @@ synergy
 syrep
 sysfsutils
 syslinux
-syslog-ng
 sysprof
 sysstat
 systune
 sysvinit
 sysvinit-utils
-t-prot
 tagtool
 tailor
 taktuk
@@ -1676,8 +1642,8 @@ tcsh
 tct
 tdl
 telak
-telnet-ssl
 telnetd-ssl
+telnet-ssl
 testdisk
 tetradraw
 tetrinet-client
@@ -1695,13 +1661,15 @@ texlive-latex-base
 texlive-latex-recommended
 texpower
 textdraw
+tf
 tgt
 thttpd
 tidy
+tig
+timelimit
 timeout
 tin
 tinyhoneypot
-tinysnmp-tools
 tk8.4
 tla
 tmpreaper
@@ -1715,8 +1683,8 @@ toshset
 toshutils
 tpconfig
 tpp
+t-prot
 tra
-traceproto
 traceroute
 transfig
 trayer
@@ -1725,9 +1693,7 @@ treil
 trickle
 tshark
 tsocks
-tspc
 tss
-ttf-bitstream-vera
 ttf-dejavu
 tthsum
 ttmkfdir
@@ -1738,8 +1704,8 @@ twolame
 txt2man
 txt2pdbdoc
 txt2regex
-type1inst
 tzdata
+u3-tool
 ucf
 udftools
 udpcast
@@ -1749,30 +1715,28 @@ 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
 uruk
 usbutils
 usbview
-user-setup
 userinfo
+user-setup
 uswsusp
 util-linux
 util-linux-locales
@@ -1802,12 +1766,10 @@ vinetto
 vkeybd
 vlan
 vlock
-vnc-common
-vncommand
 vnstat
 vobcopy
-vorbis-tools
 vorbisgain
+vorbis-tools
 vpnc
 vrfy
 vrms
@@ -1828,8 +1790,8 @@ wavemon
 wcalc
 wdiff
 webcam
-webcam-server
 webcamd
+webcam-server
 webcheck
 webcpp
 weblint-perl
@@ -1855,16 +1817,14 @@ wmaloader
 wmctrl
 wmii
 wmmisc
-wodim
 wondershaper
 workbone
 wpasupplicant
 wprint
 wput
-wwwconfig-common
 wvdial
+wwwconfig-common
 wyrd
-x-ttcidfont-conf
 x11-common
 x11vnc
 x2x
@@ -1921,7 +1881,6 @@ xmms2-plugin-id3v2
 xmms2-plugin-jack
 xmms2-plugin-mad
 xmms2-plugin-vorbis
-xmove
 xnee
 xnest
 xosd-bin
@@ -1929,6 +1888,7 @@ xpdf
 xpdf-reader
 xprobe
 xresprobe
+xrestop
 xrsh
 xsel
 xserver-xorg
@@ -1955,21 +1915,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
@@ -1983,30 +1941,29 @@ 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
 xtermset
 xtrace
 xtrlock
+x-ttcidfont-conf
 xtv
 xutils
 xutils-dev
 xvfb
 xvkbd
 xvncviewer
-xwatchwin
 xwit
 xzoom
 yacpi
 yaird
 yasr
+yatm
 yeahconsole
 yersinia
 youtube-dl
@@ -2018,6 +1975,7 @@ zile
 zip
 zlib1g
 zoidberg
+zoo
 zsh
 zsh-doc
 zsh-static
@@ -2037,15 +1995,15 @@ figlet
 firmware-ipw3945
 firmware-iwlwifi
 firmware-qlogic
-glimpse
+firmware-ralink
 iozone3
 ipw3945d
 irpas
 lha
-lmbench
+# lmbench
 manpages-posix
 netperf
-nttcp
+# nttcp
 python-profiler
 rar
 sl-modem-daemon
@@ -2057,73 +2015,59 @@ 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
-
-## Current kernel version 2.6.23-grml:
-acx100-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
-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
-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
+## general:
+grml
+# use linux-kernel-headers-grml instead of linux-libc-dev?
+# linux-kernel-headers-grml
 
-## Kernel 2.6.22-grml:
-#aufs-modules-2.6.22-grml
-#drbd8-module-2.6.22-grml
-#exmap-modules-2.6.22-grml
-#grml-kerneladdons-2.6.22
-#gspca-modules-2.6.22-grml
-#ipw3945-modules-2.6.22-grml
-#iscsitarget-module-2.6.22-grml
-#kqemu-modules-2.6.22-grml
-#linux-doc-2.6.22-grml
-#linux-headers-2.6.22-grml
-#linux-image-2.6.22-grml
-#linux-kernel-headers-grml
-#madwifi-modules-2.6.22-grml
-#misdn-modules-2.6.22-grml
-#ndiswrapper-modules-2.6.22-grml
-#openafs-modules-2.6.22-grml
-#qc-usb-modules-2.6.22-grml
-#realtime-lsm-module-2.6.22-grml
-#sl-modem-modules-2.6.22-grml
-#sysprof-module-2.6.22-grml
-#tidev-modules-2.6.22-grml
-#truecrypt-2.6.22-grml
-# }}}
+## current kernel version 2.6.28-grml:
+aufs-modules-2.6.28-grml
+drbd8-2.6.28-grml
+#fglrx-kernel-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
+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
+rt2400-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
+xtables-addons-modules-2.6.28-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.28-grml64:
+aufs-modules-2.6.28-grml64
+drbd8-2.6.28-grml64
+#fglrx-kernel-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
+ndiswrapper-modules-2.6.28-grml64
+#nvidia-kernel-2.6.28-grml64
+openafs-modules-2.6.28-grml64
+rt2400-modules-2.6.28-grml64
+speakup-modules-2.6.28-grml64
+sysprof-module-2.6.28-grml64
+xtables-addons-modules-2.6.28-grml64
+#virtualbox-ose-guest-modules-2.6.28-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 ## }}}
 
 # vim: foldmethod=marker