X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=11a9bc204881953c3946bb24e446d7ba0c46294b;hb=bfe1fbd4df16c2c92cbed7e19cb52b2d533bf61a;hp=c1054f03b75dcc5bcd97bdf856c9b77381e43251;hpb=8cd7dd1acce00d0054e2b45730f6601fb00f17a6;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 c1054f0..70d02b2 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -16,97 +16,27 @@ PACKAGES aptitude
 ## }}}
 
 ## grml specific packages {{{
-aamath
-advchk
-aesutil
-afflib
-amap
-bfa
-bkp
-btsco
-cmospwd
-cpuburn-in-binary
-ctris
-dd-rhelp
-deletemail
-dired
-dupmerge
-dupseek
-elizatalk
-ex
-ext3rminator
-ftpbackup
-fvwm-crystal-minimal
-gateguardian
-gatling
-gifshuffle
-glipper-nognome
 grml-debugtools
 grml-desktop
-grml-docs
-grml-files
-grml-firefox
-grml-laptop
+grml-feedback
 grml-live
 grml-paste
-grml-pylib
 grml-quickconfig-standard
-grml-sectools
-grml-templates
+grml-rescueboot
 grml-terminalserver
 grml-x
 heirloom-sh
-histring
-i855crt
-icmp-mtu
-icmp-quench
-icmp-reset
-ipw-firmware
-lcdtest
-libacme-bleach-perl
-libacme-eyedrops-perl
-libacme-smirch-perl
-libpam-thinkfinger
-libstdc++2.10-glibc2.2
-md5deep
-minised
-msgid-chooser
-nat-traverse
-ncp
-pip
-prism54-firmware
-prosilla
-pspax
 ptfinder
-rainbowcrack
-rootsh
-shadowfs
-shish
-shmux
-sitar
-smap
-speechd-up
-sudosh
-svn-ssh-wrappers
-tal
-texttools-doc
-thc-ipv6
-thinkfinger-tools
-upgrade-oldest
-zfs-fuse
 zsh-lovers
 ## }}}
 
 ## Official Debian packages {{{
-2vcard
-3270-common
 4g8
 9base
 9menu
 abcde
 abook
 acct
-ace-of-penguins
 ack-grep
 acl
 acpi
@@ -118,6 +48,7 @@ acpitool
 adduser
 aespipe
 aewan
+afflib-tools
 afio
 aggregate
 aiccu
@@ -163,11 +94,8 @@ apt-utils
 apt-zip
 apwal
 ara
-archivemail
 argus-client
-aria2
 arj
-arping
 arp-scan
 arptables
 arpwatch
@@ -176,23 +104,16 @@ arrayprobe
 ascii
 ascii2binary
 asciidoc
-asn1c
 asql
-asr-manpages
-astyle
 asused
 at
-aterm
+atftp
 atftpd
-athcool
 athena-jot
-atitvout
 atop
 atsar
 attr
-aub
 aumix
-auto-apt
 autoconf
 automake
 automake1.4
@@ -207,10 +128,8 @@ away
 awesfx
 awesome
 axel
-axp
 backup2l
 backup-manager
-backuppc
 bacula-common
 bacula-console
 bacula-fd
@@ -220,8 +139,6 @@ base-passwd
 bash
 bash-builtins
 bash-doc
-bash-minimal
-bash-static
 bastille
 bb
 bbe
@@ -232,7 +149,6 @@ bcrypt
 beep
 bfbtester
 biabam
-bibcursed
 bin86
 binclock
 bind9
@@ -249,7 +165,6 @@ bittorrent
 bittwist
 bkhive
 blktrace
-bluez-audio
 bluez-hcidump
 bluez-utils
 bmon
@@ -265,7 +180,7 @@ bsd-mailx
 bsdmainutils
 bsdtar
 bsdutils
-bsign
+bti
 btrfs-tools
 btscanner
 buffer
@@ -273,19 +188,13 @@ build-essential
 burn
 bvi
 bwm-ng
-c3270
-cabber
 cabextract
 caca-utils
 ca-certificates
 cadaver
-calcurse
-calife
-camserv
 capiutils
 catdoc
 cbm
-cbrowser
 ccache
 ccal
 cciss-vol-status
@@ -295,25 +204,16 @@ ccze
 cdbackup
 cdbs
 cdck
-cdda2wav
-cddb
 cd-discid
 cdebootstrap
-cdecl
 cdparanoia
 cdpr
-cdrbq
 cdrdao
-cdrecord
 cdrskin
-cdtool
-cedet-common
 centerim-utf8
 cereal
-cfengine2
 cfv
 cgdb
-check
 chkrootkit
 chntpw
 chrootuid
@@ -323,9 +223,9 @@ clamav-daemon
 clamav-freshclam
 clamav-testfiles
 clex
-clive
+clipit
 cloop-utils
-cmatrix
+cmospwd
 cmus
 codeville
 colorgcc
@@ -334,12 +234,8 @@ compartment
 concalc
 configure-debian
 conkeror
-conky
 connect-proxy
 conntrack
-console-data
-console-terminus
-console-tools
 conspy
 convmv
 coreutils
@@ -364,10 +260,8 @@ cryptcat
 cryptsetup
 cscope
 csh
-csstidy
 csync2
 ctorrent
-ctrlproxy
 cu
 cuetools
 cups-bsd
@@ -377,15 +271,11 @@ curl
 curlftpfs
 cvs
 cvs2cl
-cvs-buildpackage
 cvsconnect
 cvsdelta
-cw
-cwcp
 daemon
 dante-client
 dar
-darcs
 dares
 dares-qt
 dash
@@ -398,9 +288,7 @@ dcfldd
 dconf
 dcraw
 dctrl-tools
-ddccontrol
 ddclient
-ddrescue
 dds2tar
 debarchiver
 debconf
@@ -418,8 +306,6 @@ debootstrap
 debsecan
 debsigs
 debsums
-defoma
-detachtty
 detox
 devio
 devscripts
@@ -437,7 +323,6 @@ dialog
 dict
 diction
 dictionaries-common
-dietlibc
 dietlibc-dev
 diffstat
 diffutils
@@ -462,17 +347,13 @@ docbook
 docbook2odf
 docbook-dsssl
 docbook-to-man
-dog
 doscan
 dosfstools
 dov4l
-doxygen
 dpatch
 dpkg
 dpkg-awk
 dpkg-dev
-dpkg-ftp
-dpkg-multicd
 dpkg-repack
 dpkg-ruby
 dpkg-sig
@@ -487,7 +368,6 @@ dsniff
 dstat
 dtach
 dump
-dumputils
 duplicity
 dupload
 durep
@@ -497,8 +377,6 @@ dvdisaster
 dvd+rw-tools
 dvtm
 dwdiff
-dwm
-dwm-tools
 dzen2
 e2fsprogs
 e2tools
@@ -509,16 +387,13 @@ ecryptfs-utils
 ed
 edbrowse
 eflite
-eieio
 electric-fence
 elfsh
 elinks
-elmo
 elscreen
 elvis
 elvis-common
 emacs
-emcast
 emuga
 encfs
 enscribe
@@ -527,7 +402,6 @@ ent
 epdfview
 equivs
 erc
-es
 espeak
 espeakup
 etckeeper
@@ -537,8 +411,6 @@ ethstatus
 ethtool
 etpan-ng
 ettercap-gtk
-euro-support
-evilwm
 evms
 evms-bootdebug
 evms-cli
@@ -550,12 +422,12 @@ exiv2
 expect
 ext3grep
 exuberant-ctags
-faad
 facter
 fai-client
 fai-doc
 fail2ban
 fai-server
+fai-setup-storage
 fake
 fakeroot
 faketime
@@ -568,15 +440,10 @@ fbi
 fbset
 fbterm
 fcrackzip
-fdflush
 fdupes
-fdutils
 febootstrap
 feh
 fetchmail
-fgetty
-filepp
-filetraq
 findutils
 finger
 fio
@@ -589,14 +456,9 @@ flex
 flexbackup
 flite
 fluxbox
-fluxconf
-fnfx-client
-fnfxd
-fnord
 fondu
 fontconfig
 fontconfig-config
-fonty
 foremost
 fortune-mod
 fortunes-debian-hints
@@ -617,14 +479,13 @@ funny-manpages
 fusedav
 fuseiso
 fuseiso9660
-fusesmb
 fuse-utils
-fvwm
 fwlogwatch
 fxload
 g++
 gaffitter
 gamin
+gatling
 gcal
 gcc
 gcolor2
@@ -635,19 +496,14 @@ geeqie
 gems
 genders
 genext2fs
-geresh
 getmail4
 gettext
 gettext-el
-gfs2-tools
-gfs-tools
 gftp-common
 gftp-text
 ghostscript
 giblib1
-gif2png
-giftcurs
-git-core
+git
 git-email
 gitpkg
 git-svn
@@ -668,9 +524,7 @@ gnuit
 gnupg
 gnupg2
 gnupg-agent
-gnupg-pkcs11-scd
 gnutls-bin
-gocr
 gpart
 gparted
 gpgsm
@@ -678,12 +532,12 @@ gpgv
 gphoto2
 gpm
 gptsync
-gq
 grabc
 graphviz
 grep
 grepmail
 groff
+grub-imageboot
 gsfonts
 gsfonts-x11
 gsm-utils
@@ -692,12 +546,8 @@ guessnet
 guymager
 gv
 gzrt
-habak
-hal
-hal-info
 haproxy
 harden-tools
-hasciicam
 hdapsd
 hddtemp
 hexedit
@@ -707,11 +557,9 @@ hfsutils
 hgsvn
 hibernate
 hicolor-icon-theme
-hnb
 honeyd
 hostapd
 hostap-utils
-hotkeys
 hotkey-setup
 hotswap-text
 hoz
@@ -723,24 +571,24 @@ htop
 httperf
 httping
 httptunnel
+hunspell
+hunspell-en-us
+hunspell-de-de
 hunt
 hwdata
+hwloc
 i2c-tools
+i3-wm
 i810switch
-i8kutils
 ibod
-ibritish
-icecast2
 iceweasel
 icheck
 icmpush
 id3
 id3v2
 idesk
-idswakeup
 ifenslave-2.6
 ifmetric
-ifplugd
 ifrename
 ifstat
 iftop
@@ -749,7 +597,6 @@ ifupdown-extra
 ihu
 ii
 iisemulator
-ike-scan
 imagemagick
 imapcopy
 imapfilter
@@ -762,9 +609,7 @@ indent
 infiniband-diags
 info
 info2www
-ingerman
 ink
-inotail
 inoticoming
 inotify-tools
 input-utils
@@ -783,25 +628,21 @@ ipsec-tools
 iptables
 iptraf
 iptstate
+iputils-arping
 iputils-ping
 iputils-tracepath
 ipv6calc
 ipvsadm
-ipx
 ipython
-irb
 ircii
 irda-utils
 irqbalance
 irssi
 irssi-plugin-xmpp
 irssi-scripts
-isakmpd
 iscsitarget
-isdnactivecards
 isdnutils-base
 isdnvboxclient
-ispell
 isync
 itop
 ivtv-utils
@@ -809,9 +650,7 @@ iw
 iwatch
 jack
 jackd
-jail
 jailer
-jailtool
 jed
 jed-common
 jed-extra
@@ -819,15 +658,12 @@ jfsutils
 jhead
 jigit
 jigl
-jikes
 joe
 john
 joystick
 jp2a
 juke
-jwm
 kanif
-kbd-compat
 keepalived
 kernel-package
 ketchup
@@ -840,7 +676,6 @@ knockd
 knocker
 konwert
 kpartx
-kqemu-common
 krb5-config
 krb5-user
 ksh
@@ -854,7 +689,6 @@ ldap-utils
 ldapvi
 lde
 ldnsutils
-ld.so.preload-manager
 leave
 lft
 lftp
@@ -862,19 +696,11 @@ libaa-bin
 libcap2-bin
 libewf1
 libnss-mdns
-libpam-chroot
-libpam-devperm
-libpam-dotfile
-libpam-modules
-libpam-mount
-libpam-smbpass
-libpam-ssh
-libpam-tmpdir
+libnss-myhostname
 libsmbios-bin
 libtool
 lighttpd
 lilo
-linda
 links
 links2
 lintian
@@ -882,28 +708,22 @@ linuxdoc-tools
 linuxlogo
 linux-sound-base
 listadmin
-lkl
 lltag
 lm-sensors
 loadlin
 localepurge
 locales
 lockfile-progs
-loco
-log2mail
 logapp
 login
 logrotate
 logtools
 logwatch
-loop-aes-testsuite
-loop-aes-utils
 lrzsz
 lsb-base
 lsb-release
 lsdvd
 lshw
-lslk
 lsof
 lsscsi
 ltrace
@@ -954,72 +774,56 @@ menu
 menu-xdg
 mercurial
 mesa-utils
-metamail
 mg
-mgp
 migrationtools
 mii-diag
 mikmod
 mime-support
 minicom
-mirrordir
 mixmaster
 mkcue
 mkelfimage
-mkisofs
 mklibs-copy
 mknbi
 mksh
 mlocate
 mmv
 moc
-modconf
 modem-cmd
 module-assistant
 molly-guard
 monit
-moosic
 moreutils
 most
 mount
 mp
-mp3blaster
-mp3c
 mp3gain
 mp3info
 mp3splt
 mp3val
-mp3wrap
 mpack
-mpage
 mpc
 mpg123-alsa
 mpg321
 mplayer
-mplayer-skin-blue
 mpt-status
 mr
 mrb
-mrxvt
-mrxvt-common
 msmtp
 msort
-mtd-tools
+mtd-utils
 mtools
 mtpaint
 mtp-tools
 mtr-tiny
 mt-st
-multi-aterm
 multipath-tools
 multitail
 multitee
-muscletools
 mutt
 muttprofile
 mysql-client
 mysql-common
-naim
 nano
 nasm
 nast
@@ -1030,17 +834,14 @@ ncc
 ncdu
 ncftp
 ncmpc
-ncpfs
 ncurses-base
 ncurses-bin
 ncurses-term
 ndisc6
 ndiswrapper-utils-1.9
 ne
-nedit
 netbase
-netcat
-netcat6
+netcat-openbsd
 netdiag
 netdiscover
 nethack-common
@@ -1054,7 +855,6 @@ netris
 netrw
 netsed
 netsniff-ng
-netstat-nat
 netsurf
 net-tools
 netwag
@@ -1064,18 +864,14 @@ nfs-kernel-server
 nfswatch
 nginx
 ngrep
-nictools-nopci
 nictools-pci
 nikto
-nilfs2-tools
+nilfs-tools
 nload
 nmap
 normalize-audio
-noshell
 nsd
-nstx
 ntfs-3g
-ntfsprogs
 ntlmaps
 ntp
 ntpdate
@@ -1090,28 +886,22 @@ obconf
 obexftp
 obexpushd
 odt2txt
-offlineimap
 oinkmaster
 olsrd
 olsrd-plugins
-op
 opalmod
 openafs-client
 openafs-krb5
 openbox
-opencryptoki
 openipmi
 open-iscsi
-openjade
 opensc
 openssl
 openvas-client
 open-vm-tools
 openvpn
 ophcrack
-opie-client
 orange
-orpheus
 osdsh
 osiris
 os-prober
@@ -1124,11 +914,11 @@ packeth
 packit
 pads
 pal
-pamusb-tools
 paperkey
 par
 par2
 paris-traceroute
+partclone
 parted
 partimage
 partimage-server
@@ -1146,21 +936,13 @@ pcaputils
 pcmciautils
 pconf-detect
 pconsole
-pcopy
 pcregrep
 pcscd
 pdfcube
 pdksh
 pdmenu
-pdns-backend-ldap
-pdns-backend-pgsql
-pdns-backend-pipe
-pdns-backend-sqlite
 pdns-recursor
-pdns-server
 pdsh
-pdumpfs
-pekwm
 perforate
 perl
 perl-doc
@@ -1179,10 +961,8 @@ piuparts
 pkg-config
 pktstat
 playmidi
-playmp3list
 plptools
 pmailq
-pmidi
 pmount
 pngtools
 pnm2ppa
@@ -1190,34 +970,27 @@ pnputils
 po-debconf
 podget
 podracer
-policyrcd-script-zg2
 polipo
 pop3browser
 poppler-utils
 pork
-portmap
 portsentry
 posh
 poster
 postfix
-postfix-ldap
 postfix-pcre
 postgresql-client
 postmark
 powermgmt-base
-powernowd
 powertop
 pperl
-ppmd
 ppp
 pppconfig
-pppoe
 pppoeconf
 pppstatus
 pptpd
 pptp-linux
 preload
-prismstumbler
 pristine-tar
 privbind
 privoxy
@@ -1230,16 +1003,15 @@ proxychains
 proxycheck
 psad
 pscan
-psfontmgr
-psh
 psmisc
 pssh
-pstack
 pstotext
 psutils
 pterm
 ptunnel
 pump
+puppet
+puppetmaster
 pv
 pwgen
 pwman3
@@ -1249,26 +1021,18 @@ pydb
 pymacs
 pyneighborhood
 python
-python2.4
-python2.4-minimal
-python2.5
-python2.5-minimal
 python-apt
 python-cddb
-python-celementtree
 python-central
 python-crypto
 python-dbus
-python-elementtree
 python-eyed3
 python-fuse
 python-gnupginterface
 python-gobject
 python-id3
-python-libgmail
 python-minimal
 python-pexpect
-python-pyao
 python-pycallgraph
 python-pymad
 python-pysqlite2
@@ -1279,12 +1043,10 @@ python-subversion
 python-support
 python-twisted-bin
 python-urwid
-pytris
 qc-usb-utils
 qiv
 qjackctl
 qla-tools
-qprof
 qpxtool
 quilt
 quota
@@ -1292,28 +1054,20 @@ racoon
 radeontool
 radio
 radvd
-rain
 rake
 randomize-lines
-ras
-ratmenu
 ratpoison
 rats
 rblcheck
-rc
 rcov
 rcs
 rdate
 rdesktop
-rdiff
-rdiff-backup
-rdoc
-rdoc1.8
+rdfind
 read-edid
 readline-common
 readpst
 realpath
-realtime-lsm
 recode
 recordmydesktop
 recover
@@ -1326,20 +1080,20 @@ renameutils
 reniced
 reportbug
 reprepro
-retty
+reptyr
 rinetd
 rinse
 rkhunter
 rlwrap
-rman
 rng-tools
 rofs
 root-tail
-router-audit-tool
 rox-filer
+rpcbind
 rpl
 rpm
 rrdtool
+rs
 rsnapshot
 rssh
 rtorrent
@@ -1354,15 +1108,12 @@ rutilt
 rxvt-beta
 rxvt-unicode
 s3cmd
-s3switch
 safecopy
 saidar
-sam
 samba
 samba-common
 samdump2
 sash
-sbm
 sc
 scalpel
 scamper
@@ -1380,7 +1131,6 @@ scrot
 scrounge-ntfs
 scsitools
 sdate
-sdd
 sdparm
 secure-delete
 secvpn
@@ -1392,17 +1142,14 @@ sensord
 ser2net
 setcd
 setserial
-sfind
 sformat
 sg3-utils
 sgml-base
-sgml-data
 sgmltools-lite
 sgrep
 shaperd
 shared-mime-info
 sharutils
-shc
 shorewall
 shtool
 sic
@@ -1412,7 +1159,6 @@ sip-tester
 sitecopy
 sl
 slapd
-slat
 slay
 sleepd
 sleepenh
@@ -1424,7 +1170,6 @@ slrnpull
 slsh
 slurm
 sm
-smake
 smartmontools
 smbc
 smbclient
@@ -1436,21 +1181,14 @@ sn
 snarf
 sniffit
 snmp
-snoopy
-snowdrop
 socat
 sox
-sp
 speakup-tools
 speechd-el
 speech-dispatcher
 speedometer
 speex
-spell
-spellutils
-spicctrl
 splint
-splitvt
 sqlite
 sqlite3
 squashfs-lzma-tools
@@ -1468,8 +1206,6 @@ ssl-cert
 ssldump
 sslscan
 ssmping
-star
-starttls
 statgrab
 statserial
 stealth
@@ -1488,7 +1224,6 @@ super
 supercat
 sux
 swaks
-swapd
 swatch
 swish++
 symlinks
@@ -1508,7 +1243,6 @@ taktuk
 tar
 tart
 tcc
-tcl8.3
 tcl8.4
 tcng
 tcpd
@@ -1530,50 +1264,37 @@ telak
 telnetd-ssl
 telnet-ssl
 testdisk
-tetradraw
 tetrinet-client
 texi2html
 texinfo
 textdraw
 tf
 tgt
-thttpd
-tidy
 tig
 timelimit
 tin
 tinyhoneypot
 tk8.4
-tla
 tmpreaper
-tn5250
+tmux
 tnef
 tofrodos
 toilet
-toilet-fonts
 tor
-toshset
-toshutils
 tpconfig
-tpm-tools
 tpp
 t-prot
-tra
 traceroute
 transfig
 trayer
 tree
 treil
 trickle
-trousers
 tshark
 tsocks
-tss
 ttf-dejavu
-ttmkfdir
 ttysnoop
 tweak
-twm
 twolame
 txt2man
 txt2pdbdoc
@@ -1597,9 +1318,7 @@ unifont
 unison
 units
 uniutils
-unixcw
 unp
-unrar-free
 unrtf
 unsort
 unzip
@@ -1611,8 +1330,6 @@ uruk
 usb-modeswitch
 usbview
 userinfo
-user-setup
-uswsusp
 util-linux
 util-linux-locales
 uudeview
@@ -1620,12 +1337,10 @@ v4l-conf
 vbetool
 vbindiff
 vblade
-vcdtools
 vde2
 vera
 vfu
 videogen
-viewglob
 vim
 vim-addon-manager
 vim-common
@@ -1651,26 +1366,17 @@ vtun
 w3m
 w3m-el
 w3m-img
-w9wm
-wacom-tools
 wajig
 wakeonlan
 wamerican-small
 wapiti
-waproamd
 wavemon
 wcalc
 wdiff
 webcam
 webcamd
-webcam-server
 webcheck
-webcpp
 weblint-perl
-weechat
-weechat-curses
-weechat-plugins
-weechat-scripts
 weplab
 wget
 whiptail
@@ -1685,34 +1391,26 @@ wireshark-common
 wmaloader
 wmctrl
 wmii
-wmmisc
 wondershaper
-wprint
 wput
 wvdial
 wwwconfig-common
-wyrd
 x11-common
 x11vnc
-x2x
 x86info
-xar
 xautolock
 xautomation
-xaw3dg
 xawtv
 xawtv-plugins
 xbacklight
 xbase-clients
 xbitmaps
-xcardii
 xcb
 xclip
 xcursor-themes
 xdelta
 xdelta3
 xdesktopwaves
-xfaces
 xfig
 xfonts-100dpi
 xfonts-75dpi
@@ -1723,11 +1421,9 @@ xfonts-biznet-base
 xfonts-bolkhov-cp1251-75dpi
 xfonts-bolkhov-cp1251-misc
 xfonts-encodings
-xfonts-intl-european
 xfonts-scalable
 xfonts-terminus
 xfonts-utils
-xfs
 xfsdump
 xfsprogs
 xinetd
@@ -1738,14 +1434,6 @@ xloadimage
 xml-core
 xmlindent
 xmlstarlet
-xmms2
-xmms2-client-cli
-xmms2-core
-xmms2-plugin-alsa
-xmms2-plugin-id3v2
-xmms2-plugin-jack
-xmms2-plugin-mad
-xmms2-plugin-vorbis
 xmount
 xnee
 xnest
@@ -1759,59 +1447,14 @@ xrsh
 xsel
 xserver-xorg
 xserver-xorg-core
-xserver-xorg-input-aiptek
 xserver-xorg-input-all
-xserver-xorg-input-elographics
-xserver-xorg-input-evdev
-xserver-xorg-input-evtouch
-xserver-xorg-input-hyperpen
-xserver-xorg-input-joystick
-xserver-xorg-input-kbd
-xserver-xorg-input-mouse
-xserver-xorg-input-penmount
-xserver-xorg-input-synaptics
-xserver-xorg-input-vmmouse
-xserver-xorg-input-void
-xserver-xorg-input-wacom
 xserver-xorg-video-all
-xserver-xorg-video-amd
-xserver-xorg-video-apm
-xserver-xorg-video-ark
-xserver-xorg-video-ati
-xserver-xorg-video-chips
-xserver-xorg-video-cirrus
-xserver-xorg-video-dummy
-xserver-xorg-video-fbdev
-xserver-xorg-video-glint
-xserver-xorg-video-i128
-xserver-xorg-video-i740
-xserver-xorg-video-intel
-xserver-xorg-video-ivtv
-xserver-xorg-video-mga
-xserver-xorg-video-neomagic
-xserver-xorg-video-nv
-xserver-xorg-video-radeonhd
-xserver-xorg-video-rendition
-xserver-xorg-video-s3
-xserver-xorg-video-s3virge
-xserver-xorg-video-savage
-xserver-xorg-video-siliconmotion
-xserver-xorg-video-sis
-xserver-xorg-video-sisusb
-xserver-xorg-video-tdfx
-xserver-xorg-video-tga
-xserver-xorg-video-trident
-xserver-xorg-video-tseng
-xserver-xorg-video-v4l
-xserver-xorg-video-vesa
-xserver-xorg-video-via
-xserver-xorg-video-vmware
-xserver-xorg-video-voodoo
 xsltproc
 xtail
 xterm
 xtermcontrol
 xtermset
+xtightvncviewer
 xtrace
 xtrlock
 x-ttcidfont-conf
@@ -1821,46 +1464,38 @@ xutils
 xutils-dev
 xvfb
 xvkbd
-xvncviewer
 xwit
 xzoom
 xz-utils
 yacpi
-yaird
 yasr
-yatm
 yeahconsole
 yersinia
 youtube-dl
-ysm
-zec
 zerofree
+zfs-fuse
 zgv
 zile
 zip
-zlib1g
 zoidberg
 zoo
 zsh
 zsh-doc
-zsh-static
 zssh
 zsync
 zzuf
 ## }}}
 
 ## non-free {{{
-abs-guide
 agrep
 atmel-firmware
 bluez-firmware
-dvdrtools
-figlet
+firmware-brcm80211
 firmware-iwlwifi
 firmware-qlogic
 firmware-ralink
+firmware-realtek
 iozone3
-irpas
 lha
 manpages-posix
 netperf
@@ -1873,53 +1508,53 @@ zd1211-firmware
 PACKAGES aptitude I386
 
 ## general:
-grml
-perf
-# use linux-kernel-headers-grml instead of linux-libc-dev?
-# linux-kernel-headers-grml
+linux-tools-3.0
+
+# i386-only software
+athcool
+atitvout
+bsign
+fnfx-client
+fnfxd
+pstack
+retty
 
-## current kernel version 2.6.33-grml:
-drbd8-2.6.33-grml
-#fglrx-kernel-2.6.33-grml
-iscsitarget-module-2.6.33-grml
-linux-doc-2.6.33-grml
-linux-headers-2.6.33-grml
-linux-image-2.6.33-grml
-#linux-source-2.6.33-grml
-loop-aes-modules-2.6.33-grml
-ndiswrapper-modules-2.6.33-grml
-#nvidia-kernel-2.6.33-grml
-openafs-modules-2.6.33-grml
-speakup-modules-2.6.33-grml
-sysprof-module-2.6.33-grml
-tp-smapi-modules-2.6.33-grml
-virtualbox-ose-guest-modules-2.6.33-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-xtables-addons-modules-2.6.33-grml
+## current kernel version 3.0-grml:
+#fglrx-kernel-3.0-grml
+iscsitarget-module-3.0-grml
+linux-doc-3.0-grml
+linux-headers-3.0-grml
+linux-image-3.0-grml
+#linux-source-3.0-grml
+ndiswrapper-modules-3.0-grml
+#nvidia-kernel-3.0-grml
+openafs-modules-3.0-grml
+sysprof-module-3.0-grml
+tp-smapi-modules-3.0-grml
+virtualbox-ose-guest-modules-3.0-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+xtables-addons-modules-3.0-grml
 ## }}}
 
 ## amd64 specific packages {{{
 PACKAGES aptitude AMD64
 
 ## general:
-grml64
-perf
+linux-tools-3.0
 
-## current kernel version 2.6.33-grml64:
-drbd8-2.6.33-grml64
-#fglrx-kernel-2.6.33-grml64
-iscsitarget-module-2.6.33-grml64
-linux-doc-2.6.33-grml64
-linux-headers-2.6.33-grml64
-linux-image-2.6.33-grml64
-#linux-source-2.6.33-grml
-loop-aes-modules-2.6.33-grml64
-ndiswrapper-modules-2.6.33-grml64
-#nvidia-kernel-2.6.33-grml64
-openafs-modules-2.6.33-grml64
-speakup-modules-2.6.33-grml64
-sysprof-module-2.6.33-grml64
-xtables-addons-modules-2.6.33-grml64
-#virtualbox-ose-guest-modules-2.6.33-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+## current kernel version 3.0-grml64:
+#fglrx-kernel-3.0-grml64
+iscsitarget-module-3.0-grml64
+linux-doc-3.0-grml64
+linux-headers-3.0-grml64
+linux-image-3.0-grml64
+#linux-source-3.0-grml
+ndiswrapper-modules-3.0-grml64
+#nvidia-kernel-3.0-grml64
+openafs-modules-3.0-grml64
+sysprof-module-3.0-grml64
+tp-smapi-modules-3.0-grml64
+xtables-addons-modules-3.0-grml64
+virtualbox-ose-guest-modules-3.0-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 ## }}}
 
 # vim: foldmethod=marker