X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=327fd7474239281f88a3943b02d3d21be258106b;hb=af3b852c4bf755eecd2b15ee2c75bf1a5285c35a;hp=0d2491cbef83c97c7acfc228bbcf2acd1e35ffbb;hpb=7e8cc3b5207a41486101d0382e833464308fde49;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 0d2491c..bd46816 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -13,96 +13,57 @@ 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 {{{
-3ware-cli-binary
 aamath
 advchk
 aesutil
 afflib
 amap
-asleap
-bar
-base64
 bfa
 bkp
-btsco
 cmospwd
-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-rescueboot
 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
 libacme-smirch-perl
-libpam-thinkfinger
-libstdc++2.10-glibc2.2
 md5deep
 minised
 msgid-chooser
@@ -111,57 +72,31 @@ ncp
 pip
 prism54-firmware
 prosilla
-pspax
 ptfinder
 rainbowcrack
 rootsh
-salvage-ntfs
-scrounge-ntfs
 shadowfs
 shish
 shmux
 sitar
 smap
-speechd-up
-ssdeep
 sudosh
 svn-ssh-wrappers
 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 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
 4g8
-915resolution
 9base
 9menu
 abcde
 abook
 acct
-ace-of-penguins
 ack-grep
 acl
 acpi
@@ -175,8 +110,8 @@ aespipe
 aewan
 afio
 aggregate
+aiccu
 aircrack-ng
-airsnort
 ajaxterm
 alien
 alsa-base
@@ -202,7 +137,6 @@ apel
 apf-client
 apf-server
 apg
-apmd
 apt
 apt-dpkg-ref
 apt-file
@@ -219,9 +153,7 @@ apt-utils
 apt-zip
 apwal
 ara
-archivemail
 argus-client
-aria2
 arj
 arping
 arp-scan
@@ -229,34 +161,23 @@ arptables
 arpwatch
 array-info
 arrayprobe
-array-util
 ascii
 ascii2binary
 asciidoc
-ash
 asn1c
 asql
-asr-manpages
-astyle
 asused
 at
-aterm
 atftpd
-athcool
 athena-jot
-atitvout
 atop
 atsar
 attr
-aub
-aufs-tools
 aumix
-auto-apt
 autoconf
 automake
 automake1.4
 automake1.7
-automake1.8
 automake1.9
 autopsy
 autossh
@@ -267,7 +188,6 @@ away
 awesfx
 awesome
 axel
-axp
 backup2l
 backup-manager
 backuppc
@@ -280,10 +200,8 @@ base-passwd
 bash
 bash-builtins
 bash-doc
-bash-minimal
 bash-static
 bastille
-bazaar
 bb
 bbe
 bc
@@ -293,8 +211,6 @@ bcrypt
 beep
 bfbtester
 biabam
-bibcursed
-biew
 bin86
 binclock
 bind9
@@ -311,7 +227,6 @@ bittorrent
 bittwist
 bkhive
 blktrace
-bluetooth-alsa
 bluez-hcidump
 bluez-utils
 bmon
@@ -327,82 +242,62 @@ bsd-mailx
 bsdmainutils
 bsdtar
 bsdutils
-bsign
+btrfs-tools
 btscanner
 buffer
 build-essential
 burn
-busybox
 bvi
 bwm-ng
-bzip2
-bzr
 c3270
-cabber
 cabextract
 caca-utils
 ca-certificates
 cadaver
-calcurse
-calife
-camserv
 capiutils
 catdoc
-catdvi
 cbm
-cbrowser
 ccache
 ccal
+cciss-vol-status
 ccontrol
 ccrypt
 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
-cheops
 chkrootkit
+chntpw
 chrootuid
 clamav
 clamav-base
 clamav-daemon
 clamav-freshclam
-clamav-getfiles
 clamav-testfiles
 clex
-clive
 cloop-utils
-cmatrix
 cmus
 codeville
 colorgcc
+comgt
 compartment
 concalc
 configure-debian
+conkeror
 connect-proxy
 conntrack
-console-common
-console-data
-console-terminus
-console-tools
 conspy
 convmv
 coreutils
@@ -413,8 +308,6 @@ cpio
 cpipe
 cplay
 cpp
-cpp-2.95
-cpp-4.1
 cproto
 cpu
 cpuburn
@@ -422,38 +315,28 @@ 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
 cvs2cl
-cvs-buildpackage
 cvsconnect
 cvsdelta
-cw
-cwcp
 daemon
 dante-client
 dar
@@ -462,8 +345,6 @@ dares
 dares-qt
 dash
 davfs2
-db4.3-util
-dbishell
 dbs
 dbus
 dbus-x11
@@ -472,8 +353,6 @@ dcfldd
 dconf
 dcraw
 dctrl-tools
-ddccontrol
-ddccontrol-db
 ddclient
 ddrescue
 dds2tar
@@ -488,22 +367,17 @@ 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
@@ -516,11 +390,9 @@ dialog
 dict
 diction
 dictionaries-common
-dietlibc
 dietlibc-dev
-diff
 diffstat
-dillo
+diffutils
 ding
 dir2ogg
 dirdiff
@@ -531,7 +403,6 @@ disktype
 distcc
 distmp3
 dlint
-dmidecode
 dmraid
 dmsetup
 dns2tcp
@@ -552,8 +423,6 @@ dpatch
 dpkg
 dpkg-awk
 dpkg-dev
-dpkg-ftp
-dpkg-multicd
 dpkg-repack
 dpkg-ruby
 dpkg-sig
@@ -561,7 +430,6 @@ dput
 drbd8-utils
 drbdlinks
 driftnet
-dropbear
 dsbltesters
 dselect
 dsh
@@ -569,110 +437,87 @@ dsniff
 dstat
 dtach
 dump
-dumputils
 duplicity
 dupload
 durep
-dvb-utils
+dvb-apps
 dvdbackup
 dvdisaster
 dvd+rw-tools
-dvi2tty
-dvipng
-dviutils
-dwm
-dwm-tools
-dynafont
+dvtm
+dwdiff
 dzen2
-e2fslibs
 e2fsprogs
 e2tools
 e2undel
 e3
 ebtables
-eciadsl
 ecryptfs-utils
 ed
-edac-utils
 edbrowse
 eflite
 eieio
-eject
+ekeyd
 electric-fence
-elfkickers
 elfsh
 elinks
-elmo
 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
 evms
 evms-bootdebug
 evms-cli
 evms-ncurses
+ewf-tools
 exifprobe
 exiftran
 exiv2
 expect
-ext2resize
+ext3grep
 exuberant-ctags
-faad
 facter
 fai-client
 fai-doc
 fail2ban
 fai-server
+fai-setup-storage
 fake
-fakechroot
 fakeroot
+faketime
 farpd
+fatattr
 fatresize
 fatsort
 fbgrab
 fbi
-fblogo
 fbset
+fbterm
 fcrackzip
-fdflush
 fdupes
-fdutils
+febootstrap
 feh
 fetchmail
-fgetty
-file
-filepp
-file-rc
-filetraq
-fileutils
 findutils
 finger
+fio
 firehol
 fish
 flashrom
@@ -682,14 +527,9 @@ flex
 flexbackup
 flite
 fluxbox
-fluxconf
-fnfx-client
-fnfxd
-fnord
 fondu
 fontconfig
 fontconfig-config
-fonty
 foremost
 fortune-mod
 fortunes-debian-hints
@@ -697,57 +537,46 @@ fortunes-min
 fping
 fprobe
 fprobe-ulog
-fragroute
 freeglut3
 freeradius
 freeradius-ldap
 freesweep
+fsarchiver
 ftp
 ftpcopy
 ftp-upload
 ftpwatch
-fttools
-funionfs
 funny-manpages
 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
+gdisk
+geeqie
 gems
 genders
-genisoimage
-geresh
+genext2fs
 getmail4
 gettext
-gettext-base
 gettext-el
+gfs2-tools
 gfs-tools
 gftp-common
 gftp-text
 ghostscript
 giblib1
-gif2png
-giftcurs
 git-core
+git-email
 gitpkg
 git-svn
 gitweb
@@ -762,51 +591,36 @@ gkrellm-x86info
 gkrellshoot
 gkrellweather
 glark
-gmailfs
 gmrun
-gnu-fdisk
-gnuhtml2latex
+gnuit
 gnupg
+gnupg2
 gnupg-agent
-gnupg-pkcs11-scd
 gnutls-bin
-gocr
 gpart
 gparted
 gpgsm
 gpgv
 gphoto2
 gpm
-gq
-gqcam
-gqview
+gptsync
 grabc
 graphviz
 grep
 grepmail
 groff
-groff-base
-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
@@ -814,17 +628,12 @@ hfsutils
 hgsvn
 hibernate
 hicolor-icon-theme
-hnb
 honeyd
 hostapd
 hostap-utils
-hostname
-hotkeys
 hotkey-setup
 hotswap-text
 hoz
-hpijs
-hping2
 hping3
 ht
 htcheck
@@ -833,53 +642,44 @@ htop
 httperf
 httping
 httptunnel
+hunspell
+hunspell-en-us
+hunspell-de-de
 hunt
 hwdata
-hwinfo
+hwloc
+i2c-tools
+i3-wm
 i810switch
-i8kutils
 ibod
-ibritish
-icecast2
-icedax
 iceweasel
-iceweasel-webdeveloper
 icheck
 icmpush
 id3
 id3v2
 idesk
-idswakeup
 ifenslave-2.6
 ifmetric
-ifplugd
 ifrename
 ifstat
 iftop
 ifupdown
 ifupdown-extra
-ifupdown-scripts-zg2
-igal
 ihu
 ii
 iisemulator
-ike-scan
 imagemagick
 imapcopy
 imapfilter
 imediff2
-imlib11
-imlib-base
 imsniff
 im-switch
 imwheel
 inadyn
 indent
+infiniband-diags
 info
 info2www
-ingerman
-initramfs-tools
-initscripts
 ink
 inotail
 inoticoming
@@ -887,6 +687,7 @@ inotify-tools
 input-utils
 intltool-debian
 iodine
+iotop
 ipcalc
 iperf
 ipgrab
@@ -903,33 +704,25 @@ iputils-ping
 iputils-tracepath
 ipv6calc
 ipvsadm
-ipx
-ipxripd
 ipython
 irb
-irb1.8
 ircii
 irda-utils
 irqbalance
 irssi
 irssi-plugin-xmpp
 irssi-scripts
-isakmpd
 iscsitarget
-isdnactivecards
 isdnutils-base
 isdnvboxclient
-isic
-ispell
 isync
 itop
 ivtv-utils
+iw
 iwatch
 jack
 jackd
-jail
 jailer
-jailtool
 jed
 jed-common
 jed-extra
@@ -937,110 +730,82 @@ jfsutils
 jhead
 jigit
 jigl
-jikes
-jmon
 joe
 john
 joystick
 jp2a
 juke
-jwm
 kanif
-kbd-compat
 keepalived
 kernel-package
 ketchup
 kexec-tools
 keychain
+keynav
 keyutils
 kismet
-klibc-utils
 knockd
 knocker
 konwert
-konwert-filters
 kpartx
-kqemu-common
 krb5-config
 krb5-user
 ksh
 kvm
 labrea
-lacheck
-lanmap
-laptop-detect
 laptop-mode-tools
-latex-beamer
-latexmk
-latex-mk
-latex-xcolor
+latencytop
 lbdb
-lcap
 ldapscripts
 ldap-utils
 ldapvi
 lde
 ldnsutils
-ld.so.preload-manager
 leave
-less
 lft
 lftp
 libaa-bin
-libpam-chroot
-libpam-devperm
-libpam-dotfile
-libpam-krb5
-libpam-modules
-libpam-mount
-libpam-pwgen
-libpam-smbpass
-libpam-ssh
-libpam-tmpdir
+libcap2-bin
+libewf1
+libnss-mdns
+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
 loadlin
 localepurge
 locales
 lockfile-progs
-loco
 log2mail
 logapp
 login
 logrotate
 logtools
 logwatch
-lomoco
+loop-aes-testsuite
 loop-aes-utils
 lrzsz
 lsb-base
 lsb-release
 lsdvd
 lshw
-lslk
 lsof
-lspowertweak
 lsscsi
 ltrace
 lua50
 luasocket
-lvm2
+luvcview
 lwatch
+lxc
 lynx
 lzma
 lzop
@@ -1049,7 +814,6 @@ m4
 macchanger
 macutils
 madison-lite
-madwifi-tools
 magicrescue
 mailcheck
 maildirsync
@@ -1071,10 +835,10 @@ mbmon
 mboxcheck
 mboxgrep
 mbr
+mbuffer
 mc
 mcabber
 mcelog
-mdadm
 mdetect
 medusa
 memstat
@@ -1084,102 +848,73 @@ menu
 menu-xdg
 mercurial
 mesa-utils
-metamail
 mg
-mgetty
-mgp
 migrationtools
 mii-diag
 mikmod
 mime-support
 minicom
-mirrordir
 mixmaster
 mkcue
 mkelfimage
-mkisofs
 mklibs-copy
 mknbi
 mksh
-mktemp
 mlocate
 mmv
-mobilemesh
 moc
-modconf
+modem-cmd
 module-assistant
-module-init-tools
 molly-guard
 monit
-moosic
 moreutils
 most
 mount
-mozilla-imagezoom
 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
-ms-sys
-mtd-tools
+mtd-utils
 mtools
 mtpaint
 mtp-tools
 mtr-tiny
 mt-st
-multi-aterm
 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
 ncftp
 ncmpc
-ncpfs
 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
@@ -1195,43 +930,40 @@ netrik
 netris
 netrw
 netsed
-netstat-nat
+netsniff-ng
 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
-nstx
 ntfs-3g
 ntfsprogs
 ntlmaps
 ntp
 ntpdate
-nufw
 nullidentd
+numactl
 num-utils
 nutcpc
 nvi
 nvidia-xconfig
 nvtv
-o3read
 obconf
 obexftp
 obexpushd
 odt2txt
-offlineimap
 oinkmaster
 olsrd
 olsrd-plugins
@@ -1240,15 +972,12 @@ 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
@@ -1266,9 +995,7 @@ p7zip
 packeth
 packit
 pads
-paketto
 pal
-pamusb-tools
 paperkey
 par
 par2
@@ -1287,37 +1014,26 @@ pax-utils
 pbuilder
 pbzip2
 pcaputils
-pciutils
 pcmciautils
 pconf-detect
 pconsole
-pcopy
 pcregrep
 pcscd
 pdfcube
-pdfjam
 pdksh
 pdmenu
-pdns-backend-ldap
-pdns-backend-pgsql
-pdns-backend-pipe
-pdns-backend-sqlite
 pdns-recursor
-pdns-server
 pdsh
-pdumpfs
-pekwm
 perforate
 perl
-perl-base
 perl-doc
 perlmagick
 perl-modules
 perl-suid
 perl-tk
 pfqueue
-pgf
 pia
+pigz
 pilot-link
 pinentry-curses
 pinfo
@@ -1326,10 +1042,8 @@ piuparts
 pkg-config
 pktstat
 playmidi
-playmp3list
 plptools
 pmailq
-pmidi
 pmount
 pngtools
 pnm2ppa
@@ -1337,7 +1051,6 @@ pnputils
 po-debconf
 podget
 podracer
-policyrcd-script-zg2
 polipo
 pop3browser
 poppler-utils
@@ -1349,16 +1062,12 @@ 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
 pppconfig
 pppoe
@@ -1367,7 +1076,6 @@ pppstatus
 pptpd
 pptp-linux
 preload
-preview-latex-style
 prismstumbler
 pristine-tar
 privbind
@@ -1381,11 +1089,8 @@ proxychains
 proxycheck
 psad
 pscan
-psfontmgr
-psh
 psmisc
 pssh
-pstack
 pstotext
 psutils
 pterm
@@ -1398,30 +1103,25 @@ pxe
 pxfw
 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-pyogg
 python-pysqlite2
 python-pyvorbis
 python-scapy
@@ -1432,22 +1132,19 @@ python-twisted-bin
 python-urwid
 pytris
 qc-usb-utils
+qiv
 qjackctl
+qla-tools
 qprof
 qpxtool
-qtparted
 quilt
 quota
 racoon
 radeontool
 radio
-raggle
-rain
+radvd
 rake
 randomize-lines
-ras
-ratmenu
-ratpoison
 rats
 rblcheck
 rc
@@ -1455,15 +1152,12 @@ rcov
 rcs
 rdate
 rdesktop
-rdiff
-rdiff-backup
 rdoc
 rdoc1.8
 read-edid
 readline-common
 readpst
 realpath
-realtime-lsm
 recode
 recordmydesktop
 recover
@@ -1474,28 +1168,21 @@ reiserfsprogs
 remind
 renameutils
 reniced
-replicator
 reportbug
 reprepro
-resolvconf
-retty
-rgpsp
 rinetd
 rinse
 rkhunter
 rlwrap
-rman
 rng-tools
 rofs
 root-tail
-router-audit-tool
 rox-filer
 rpl
 rpm
 rrdtool
 rsnapshot
 rssh
-rsync
 rtorrent
 rubilicious
 ruby
@@ -1508,9 +1195,8 @@ rutilt
 rxvt-beta
 rxvt-unicode
 s3cmd
-s3switch
+safecopy
 saidar
-sam
 samba
 samba-common
 samdump2
@@ -1530,11 +1216,9 @@ scponly
 screen
 screenie
 scrot
-scsiadd
-scsi-idle
+scrounge-ntfs
 scsitools
 sdate
-sdd
 sdparm
 secure-delete
 secvpn
@@ -1546,7 +1230,6 @@ sensord
 ser2net
 setcd
 setserial
-sfind
 sformat
 sg3-utils
 sgml-base
@@ -1556,19 +1239,15 @@ sgrep
 shaperd
 shared-mime-info
 sharutils
-shc
 shorewall
 shtool
 sic
 sigit
-sing
 sipsak
 sip-tester
 sitecopy
-sjog
 sl
 slapd
-slat
 slay
 sleepd
 sleepenh
@@ -1580,7 +1259,6 @@ slrnpull
 slsh
 slurm
 sm
-smake
 smartmontools
 smbc
 smbclient
@@ -1592,31 +1270,26 @@ sn
 snarf
 sniffit
 snmp
-snoopy
-snort
-snowdrop
-snownews
 socat
-sound-recorder
 sox
 sp
+speakup-tools
 speechd-el
 speech-dispatcher
 speedometer
 speex
 spell
 spellutils
-spicctrl
 splint
-splitvt
 sqlite
 sqlite3
-squashfs-tools
+squashfs-lzma-tools
 squid
 squid-common
 squidview
 src2tex
 srcinst
+ssdeep
 ssed
 ssh
 ssh-askpass
@@ -1625,17 +1298,14 @@ ssl-cert
 ssldump
 sslscan
 ssmping
-star
-starttls
 statgrab
 statserial
 stealth
-stegdetect
 steghide
 stow
-strace
 streamripper
 stress
+stressapptest
 stunnel4
 subversion
 subversion-tools
@@ -1646,7 +1316,6 @@ super
 supercat
 sux
 swaks
-swapd
 swatch
 swish++
 symlinks
@@ -1654,19 +1323,18 @@ synergy
 syrep
 sysfsutils
 syslinux
-syslog-ng
 sysprof
 sysstat
 systune
 sysvinit
 sysvinit-utils
+tableau-parm
 tagtool
 tailor
 taktuk
 tar
 tart
 tcc
-tcl8.3
 tcl8.4
 tcng
 tcpd
@@ -1690,43 +1358,27 @@ 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
 tk8.4
-tla
 tmpreaper
+tmux
 tn5250
 tnef
 tofrodos
 toilet
-toilet-fonts
 tor
-toshset
-toshutils
 tpconfig
 tpp
 t-prot
-tra
-traceproto
 traceroute
 transfig
 trayer
@@ -1735,25 +1387,20 @@ treil
 trickle
 tshark
 tsocks
-tspc
-tss
-ttf-bitstream-vera
 ttf-dejavu
-tthsum
-ttmkfdir
 ttysnoop
 tweak
-twm
 twolame
 txt2man
 txt2pdbdoc
 txt2regex
-type1inst
 tzdata
+u3-tool
 ucf
 udftools
 udpcast
 udptunnel
+ufsutils
 ulogd
 uml-utilities
 unace
@@ -1763,28 +1410,23 @@ 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
+usb-modeswitch
 usbview
 userinfo
 user-setup
-uswsusp
 util-linux
 util-linux-locales
 uudeview
@@ -1792,7 +1434,6 @@ v4l-conf
 vbetool
 vbindiff
 vblade
-vcdtools
 vde2
 vera
 vfu
@@ -1803,9 +1444,6 @@ vim-addon-manager
 vim-common
 vim-gtk
 vim-gui-common
-vim-latexsuite
-vim-python
-vim-ruby
 vim-runtime
 vim-scripts
 vim-vimoutliner
@@ -1813,8 +1451,6 @@ vinetto
 vkeybd
 vlan
 vlock
-vnc-common
-vncommand
 vnstat
 vobcopy
 vorbisgain
@@ -1828,24 +1464,18 @@ 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-common
 weechat-curses
 weechat-plugins
 weechat-scripts
@@ -1857,32 +1487,21 @@ whowatch
 wiggle
 wikipedia2text
 wikipediafs
-windowlab
 wipe
-wireless-tools
 wireshark
 wireshark-common
 wmaloader
 wmctrl
 wmii
-wmmisc
-wodim
 wondershaper
-workbone
-wpasupplicant
-wprint
 wput
 wvdial
 wwwconfig-common
-wyrd
 x11-common
 x11vnc
-x2x
 x86info
-xar
 xautolock
 xautomation
-xaw3dg
 xawtv
 xawtv-plugins
 xbacklight
@@ -1895,7 +1514,6 @@ xcursor-themes
 xdelta
 xdelta3
 xdesktopwaves
-xdialog
 xfaces
 xfig
 xfonts-100dpi
@@ -1907,11 +1525,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
@@ -1919,7 +1535,6 @@ xjed
 xkb-data
 xkbset
 xloadimage
-xlockmore
 xml-core
 xmlindent
 xmlstarlet
@@ -1931,7 +1546,7 @@ xmms2-plugin-id3v2
 xmms2-plugin-jack
 xmms2-plugin-mad
 xmms2-plugin-vorbis
-xmove
+xmount
 xnee
 xnest
 xosd-bin
@@ -1944,63 +1559,9 @@ 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
-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-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
-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-vga
-xserver-xorg-video-via
-xserver-xorg-video-vmware
-xserver-xorg-video-voodoo
 xsltproc
-xsteg
 xtail
 xterm
 xtermcontrol
@@ -2009,29 +1570,28 @@ xtrace
 xtrlock
 x-ttcidfont-conf
 xtv
+xul-ext-webdeveloper
 xutils
 xutils-dev
 xvfb
 xvkbd
-xvncviewer
-xwatchwin
 xwit
 xzoom
+xz-utils
 yacpi
-yaird
 yasr
 yatm
 yeahconsole
 yersinia
 youtube-dl
-ysm
 zec
-zeroconf
+zerofree
+zfs-fuse
 zgv
 zile
 zip
-zlib1g
 zoidberg
+zoo
 zsh
 zsh-doc
 zsh-static
@@ -2041,30 +1601,17 @@ zzuf
 ## }}}
 
 ## non-free {{{
-abs-guide
 agrep
 atmel-firmware
 bluez-firmware
-chntpw
-dvdrtools
-figlet
-firmware-ipw3945
 firmware-iwlwifi
 firmware-qlogic
 firmware-ralink
-glimpse
 iozone3
-ipw3945d
-irpas
 lha
-lmbench
 manpages-posix
 netperf
-nttcp
 python-profiler
-rar
-sl-modem-daemon
-tth
 unrar
 zd1211-firmware
 ## }}}
@@ -2074,52 +1621,38 @@ PACKAGES aptitude I386
 
 ## general:
 grml
-grml-files
-# we want to use linux-kernel-headers-grml instead of linux-libc-dev:
-linux-kernel-headers-grml
+linux-tools-2.6.36
+
+# i386-only software
+athcool
+atitvout
+bsign
+fnfx-client
+fnfxd
+pstack
+retty
+s3switch
+spicctrl
+
+# 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
-at76-usb-modules-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-module-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
-#open-vm-modules-2.6.23-grml
-qc-usb-modules-2.6.23-grml
-r6040-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
-virtualbox-ose-guest-modules-2.6.23-grml virtualbox-ose-guest-utils
-#zaptel-modules-2.6.23-grml
+## current kernel version 2.6.36-grml:
+#fglrx-kernel-2.6.36-grml
+iscsitarget-module-2.6.36-grml
+linux-doc-2.6.36-grml
+linux-headers-2.6.36-grml
+linux-image-2.6.36-grml
+#linux-source-2.6.36-grml
+loop-aes-modules-2.6.36-grml
+ndiswrapper-modules-2.6.36-grml
+#nvidia-kernel-2.6.36-grml
+openafs-modules-2.6.36-grml
+speakup-modules-2.6.36-grml
+sysprof-module-2.6.36-grml
+tp-smapi-modules-2.6.36-grml
+virtualbox-ose-guest-modules-2.6.36-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+xtables-addons-modules-2.6.36-grml
 ## }}}
 
 ## amd64 specific packages {{{
@@ -2127,37 +1660,24 @@ PACKAGES aptitude AMD64
 
 ## general:
 grml64
-grml-files64
+linux-tools-2.6.36
 
-## current kernel version 2.6.23-grml64:
-acx100-2.6.23-grml64
-at76-usb-modules-2.6.23-grml64
-atl2-modules-2.6.23-grml64
-aufs-modules-2.6.23-grml64
-drbd8-2.6.23-grml64
-exmap-modules-2.6.23-grml64
-# grml64-kerneladdons-2.6.23
-gspca-modules-2.6.23-grml64
-ipw3945-modules-2.6.23-grml64
-ivtv-modules-2.6.23-grml64
-kqemu-modules-2.6.23-grml64
-linux-doc-2.6.23-grml64
-linux-headers-2.6.23-grml64
-linux-image-2.6.23-grml64
-#linux-source-2.6.23-grml
-loop-aes-modules-2.6.23-grml64
-lzma-modules-2.6.23-grml64
-madwifi-modules-2.6.23-grml64
-ndiswrapper-modules-2.6.23-grml64
-nozomi-modules-2.6.23-grml64
-openafs-modules-2.6.23-grml64
-qc-usb-modules-2.6.23-grml64
-realtime-lsm-module-2.6.23-grml64
-rt2400-modules-2.6.23-grml64
-rt2500-modules-2.6.23-grml64
-squashfs-modules-2.6.23-grml64
-sysprof-module-2.6.23-grml64
-truecrypt-2.6.23-grml64
+## current kernel version 2.6.36-grml64:
+#fglrx-kernel-2.6.36-grml64
+iscsitarget-module-2.6.36-grml64
+linux-doc-2.6.36-grml64
+linux-headers-2.6.36-grml64
+linux-image-2.6.36-grml64
+#linux-source-2.6.36-grml
+loop-aes-modules-2.6.36-grml64
+ndiswrapper-modules-2.6.36-grml64
+#nvidia-kernel-2.6.36-grml64
+openafs-modules-2.6.36-grml64
+speakup-modules-2.6.36-grml64
+sysprof-module-2.6.36-grml64
+tp-smapi-modules-2.6.36-grml64
+xtables-addons-modules-2.6.36-grml64
+virtualbox-ose-guest-modules-2.6.36-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 ## }}}
 
 # vim: foldmethod=marker