X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=9b75a487f600a6e34093acc9d59f333639384b64;hb=045b6fb0cf1d8f368c07929d1d304ebc7a60cbd4;hp=1b62314fde723fe9660f6142d48d630f423abf7b;hpb=fc7c6e6dc606a3dc2bf641a1d83ad2b9851a27fa;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 1b62314..54bc239 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -1,71 +1,21 @@
 PACKAGES aptitude
 
-# TODO: get rid of all packages that are libs/dependencies only;
-#       identify all I386-only packages
-
-## Known problems, TODO:
-
-# 3ware-3dm2-binary: problem with
-#   openssl req -new -x509 -nodes -out /etc/3dm2/3dm2.pem -keyout /etc/3dm2/3dm2.pem -days 365
-# of /var/lib/dpkg/info/3ware-3dm2-binary.postinst
-
-# apt-listbugs, fails due to:
-# // DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-listbugs apt || exit 10"};
-# in /etc/apt/apt.conf.d/10apt-listbugs
-# with
-# E: Sub-process /usr/bin/dpkg returned an error code (1)
-# E: Sub-process /usr/sbin/apt-listbugs apt || exit 10 returned an error code (10)
+## Known problems {{{
 
 # a2ps fails with:
 #Setting up a2ps (1:4.13c~rc5-1) ...
 #ERROR: emacsen-common being used before being configured.
-#ERROR: This is likely a bug in the a2ps package, which needs to
-#ERROR: add one of the appropriate dependencies.
-#ERROR: See /usr/share/doc/emacsen-common/debian-emacs-policy.gz
-#ERROR: for details.
-#dpkg: error processing a2ps (--configure):
-# subprocess post-installation script returned error exit status 2
-
-# bandwidthd-pgsql fails with:
-#Preconfiguring packages ...
-#cp: cannot stat `/usr/share/doc/bandwidthd-pgsql/bandwidthd-pgsql.conf': No such file or directory
-#bandwidthd-pgsql failed to preconfigure, with exit status 1
-
-# wvdial executes 'wvdialconf /etc/wvdial.conf':
-#Setting up wvdial (1.56-1.2) ...
-#Editing `/etc/wvdial.conf'.
-#
-#Scanning your serial ports for a modem.
-#
-#Modem Port Scan<*1>: S0   S1   S2   S3
-#WvModem<*1>: Cannot get information for serial port.
-#ttyUSB0<*1>: ATQ0 V1 E1 -- OK
-#[...]
+# [...] => #246296
+# ... but the package is usually being installed as a dependency later on
 
-# vifm:
+# vifm fails with:
 #Setting up vifm (0.3-2) ...
 #dpkg: error processing vifm (--configure):
 # subprocess post-installation script returned error exit status 1
 
-# gsm-utils:
-# creates a group with GUID 1000 => #353967
-
-# ivtv-utils:
-# ships /usr/include/linux/ivtv.h => #443165
-
-## End-of-TODO
-
-## Warnings:
-
-# /var/lib/dpkg/info/tidev-modules-2.6.22-grml.postinst: line 9: update-devfsd: command not found
+## }}}
 
-# The update-modules command is deprecated and should not be used!
-# -> used by:
-# dumputils evms ipx irda-utils mt-st rng-tools setserial tidev-modules-2.6.22-grml toshutils udftools
-
-## End-of-Warnings
-
-# grml specific packages:
+## grml specific packages {{{
 3ware-cli-binary
 aamath
 advchk
@@ -73,8 +23,6 @@ aesutil
 afflib
 amap
 asleap
-bar
-base64
 bfa
 bkp
 btsco
@@ -85,7 +33,6 @@ ctris
 dd-rhelp
 ded
 deletemail
-detox
 dired
 dupmerge
 dupseek
@@ -100,7 +47,6 @@ gateguardian
 gatling
 gifshuffle
 glipper-nognome
-grml
 grml2hd
 grml2hd-utils
 grml2usb
@@ -118,12 +64,13 @@ 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-sectools
@@ -137,15 +84,18 @@ 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
@@ -159,41 +109,28 @@ 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
-trapdoor2
 trousers
 udev
 upgrade-oldest
 zfs-fuse
 zsh-lovers
+## }}}
 
-## Notice: this packages are known to be x86-only currently [2007-10-05]:
-# 3ware-cli-binary aamath aesutil afflib asleap athcool atitvout btsco chntpw
-# cmospwd cpp-2.95 cpuburn-in-binary ctapi-cyberjack ctris dd-rhelp
-# deletemail detox dupmerge dupseek dynamic-disk ecryptfs-utils ext3rminator
-# fdflush firescope fnfx-client fnfxd ftpbackup fuseiso9660 fvwm-crystal-minimal
-# gateguardian gatling gifshuffle gkrellm-x86info glipper-nognome heirloom-sh
-# histring hydra i810switch i855crt i8kutils icmp-mtu icmp-quench icmp-reset
-# irpas lcdtest minised nat-traverse orpheus ppmd prosilla pspax pstack ptfinder
-# rainbowcrack replicator rootsh s3switch salvage-ntfs scrounge-ntfs shadowfs
-# shmux sjog speechd-up spicctrl ssdeep sudosh tlswrap toshset toshutils
-# tpm-tools trapdoor2 trousers unison2.9.1 xserver-xorg-video-amd zfs-fuse
-
-# official Debian packages:
+## Official Debian packages {{{
 2vcard
 3270-common
 4g8
@@ -207,9 +144,9 @@ ace-of-penguins
 ack-grep
 acl
 acpi
-acpi-support
 acpid
 acpidump
+acpi-support
 acpitail
 acpitool
 adduser
@@ -217,38 +154,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
@@ -256,26 +195,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
@@ -296,7 +233,6 @@ autoconf
 automake
 automake1.4
 automake1.7
-automake1.8
 automake1.9
 autopsy
 autossh
@@ -305,10 +241,11 @@ avahi-daemon
 aview
 away
 awesfx
+awesome
 axel
 axp
-backup-manager
 backup2l
+backup-manager
 backuppc
 bacula-common
 bacula-console
@@ -333,13 +270,12 @@ beep
 bfbtester
 biabam
 bibcursed
-biew
 bin86
 binclock
 bind9
 bind9-host
-binfmt-support
 binfmtc
+binfmt-support
 bing
 binstats
 binutils
@@ -347,9 +283,10 @@ bison
 bitlbee
 bittornado
 bittorrent
+bittwist
 bkhive
 blktrace
-bluetooth-alsa
+bluez-audio
 bluez-hcidump
 bluez-utils
 bmon
@@ -361,10 +298,12 @@ brltty
 brltty-flite
 bsdgames
 bsdiff
+bsd-mailx
 bsdmainutils
 bsdtar
 bsdutils
 bsign
+btrfs-tools
 btscanner
 buffer
 build-essential
@@ -373,32 +312,31 @@ busybox
 bvi
 bwm-ng
 bzip2
-bzr
 c3270
-ca-certificates
 cabber
 cabextract
 caca-utils
+ca-certificates
 cadaver
 calcurse
 calife
 camserv
 capiutils
 catdoc
-catdvi
 cbm
 cbrowser
 ccache
 ccal
+cciss-vol-status
 ccontrol
 ccrypt
 ccze
-cd-discid
 cdbackup
 cdbs
 cdck
 cdda2wav
 cddb
+cd-discid
 cdebootstrap
 cdecl
 cdparanoia
@@ -409,22 +347,18 @@ cdrecord
 cdrskin
 cdtool
 cedet-common
-centericq-common
-centerim-common
 centerim-utf8
+cereal
 cfengine2
 cfv
 cgdb
 check
-check
-cheops
 chkrootkit
 chrootuid
 clamav
 clamav-base
 clamav-daemon
 clamav-freshclam
-clamav-getfiles
 clamav-testfiles
 clex
 clive
@@ -433,9 +367,12 @@ cmatrix
 cmus
 codeville
 colorgcc
+comgt
 compartment
 concalc
 configure-debian
+conkeror
+conky
 connect-proxy
 conntrack
 console-common
@@ -452,8 +389,6 @@ cpio
 cpipe
 cplay
 cpp
-cpp-2.95
-cpp-4.1
 cproto
 cpu
 cpuburn
@@ -462,33 +397,29 @@ cpuid
 cpulimit
 crack
 crack-common
-cracklib-runtime
 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
-cvs-buildpackage
 cvs2cl
+cvs-buildpackage
 cvsconnect
 cvsdelta
 cw
@@ -501,7 +432,6 @@ dares
 dares-qt
 dash
 davfs2
-db4.3-util
 dbishell
 dbs
 dbus
@@ -527,7 +457,6 @@ debian-goodies
 debian-reference-common
 debian-reference-en
 debianutils
-debmake
 debmirror
 debootstrap
 deborphan
@@ -537,17 +466,18 @@ debsums
 defoma
 defrag
 detachtty
+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
@@ -558,7 +488,6 @@ dietlibc
 dietlibc-dev
 diff
 diffstat
-dillo
 ding
 dir2ogg
 dirdiff
@@ -569,7 +498,6 @@ disktype
 distcc
 distmp3
 dlint
-dmidecode
 dmraid
 dmsetup
 dns2tcp
@@ -578,9 +506,9 @@ dnsproxy
 dnstracer
 dnsutils
 docbook
+docbook2odf
 docbook-dsssl
 docbook-to-man
-docbook2odf
 dog
 doscan
 dosfstools
@@ -599,7 +527,6 @@ dput
 drbd8-utils
 drbdlinks
 driftnet
-dropbear
 dsbltesters
 dselect
 dsh
@@ -612,22 +539,21 @@ 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
 e2tools
 e2undel
 e3
 ebtables
-eciadsl
 ecryptfs-utils
 ed
 edbrowse
@@ -635,7 +561,6 @@ eflite
 eieio
 eject
 electric-fence
-elfkickers
 elfsh
 elinks
 elmo
@@ -648,17 +573,20 @@ 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
@@ -676,23 +604,24 @@ exifprobe
 exiftran
 exiv2
 expect
-ext2resize
+ext3grep
 exuberant-ctags
 faad
 facter
 fai-client
 fai-doc
-fai-server
 fail2ban
+fai-server
 fake
 fakechroot
 fakeroot
+faketime
 farpd
+fatattr
 fatresize
 fatsort
 fbgrab
 fbi
-fblogo
 fbset
 fcrackzip
 fdflush
@@ -702,18 +631,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
@@ -733,96 +661,88 @@ 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
+ghostscript
 giblib1
 gif2png
 giftcurs
 git-core
+git-email
 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
+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
-gs
-gs-common
-gs-esp
-gscanbus
 gsfonts
 gsfonts-x11
 gsm-utils
@@ -838,8 +758,8 @@ haproxy
 harden-remoteaudit
 harden-tools
 hasciicam
+hdapsd
 hddtemp
-hdparm
 hexedit
 hfsplus
 hfsprogs
@@ -849,15 +769,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
 htcheck
@@ -869,13 +787,12 @@ httptunnel
 hunt
 hwdata
 hwinfo
-hwtools
+i2c-tools
 i810switch
 i8kutils
 ibod
 ibritish
 icecast2
-icedax
 iceweasel
 iceweasel-webdeveloper
 icheck
@@ -883,7 +800,6 @@ icmpush
 id3
 id3v2
 idesk
-idn
 idswakeup
 ifenslave-2.6
 ifmetric
@@ -892,20 +808,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
@@ -919,9 +833,9 @@ inotail
 inoticoming
 inotify-tools
 input-utils
-ation-report
 intltool-debian
 iodine
+iotop
 ipcalc
 iperf
 ipgrab
@@ -931,6 +845,7 @@ ipppd
 iprelay
 iproute
 ipsec-tools
+ipset
 iptables
 iptraf
 iptstate
@@ -939,7 +854,6 @@ iputils-tracepath
 ipv6calc
 ipvsadm
 ipx
-ipxripd
 ipython
 irb
 irb1.8
@@ -949,7 +863,6 @@ irqbalance
 irssi
 irssi-plugin-xmpp
 irssi-scripts
-irssi-text
 isakmpd
 iscsitarget
 isdnactivecards
@@ -959,6 +872,7 @@ isic
 ispell
 isync
 itop
+ivtv-utils
 iwatch
 jack
 jackd
@@ -973,7 +887,6 @@ jhead
 jigit
 jigl
 jikes
-jmon
 joe
 john
 joystick
@@ -987,6 +900,7 @@ kernel-package
 ketchup
 kexec-tools
 keychain
+keynav
 keyutils
 kismet
 klibc-utils
@@ -1001,37 +915,44 @@ krb5-user
 ksh
 kvm
 labrea
-lacheck
-lanmap
 laptop-detect
 laptop-mode-tools
-latex-beamer
-latex-mk
-latex-xcolor
-latexmk
+latencytop
 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
+libpam-krb5
+libpam-modules
+libpam-mount
+libpam-smbpass
+libpam-ssh
+libpam-tmpdir
+libsmbios-bin
+libtool
 lighttpd
 lilo
 linda
 links
 links2
-linneighborhood
 lintian
-linux-sound-base
-linux-wlan-ng
 linuxdoc-tools
 linuxlogo
+linux-sound-base
 listadmin
 live-initramfs
 lkl
@@ -1050,6 +971,7 @@ logtools
 logwatch
 lomoco
 loop-aes-utils
+loop-aes-testsuite
 lrzsz
 lsb-base
 lsb-release
@@ -1057,11 +979,11 @@ lsdvd
 lshw
 lslk
 lsof
-lspowertweak
 lsscsi
 ltrace
 lua50
 luasocket
+luvcview
 lvm2
 lwatch
 lynx
@@ -1072,13 +994,11 @@ m4
 macchanger
 macutils
 madison-lite
-madwifi-tools
 magicrescue
 mailcheck
 maildirsync
 mailfilter
 mailplate
-mailx
 mairix
 make
 makedev
@@ -1120,13 +1040,14 @@ minicom
 mirrordir
 mixmaster
 mkcue
+mkelfimage
 mkisofs
 mklibs-copy
 mknbi
 mksh
 mktemp
+mlocate
 mmv
-mobilemesh
 moc
 modconf
 module-assistant
@@ -1137,7 +1058,6 @@ moosic
 moreutils
 most
 mount
-mozilla-imagezoom
 mp
 mp3blaster
 mp3c
@@ -1154,24 +1074,23 @@ mpg321
 mplayer
 mplayer-skin-blue
 mpt-status
+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
@@ -1191,17 +1110,9 @@ 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
 netbase
 netcat
 netcat6
@@ -1213,21 +1124,24 @@ 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
 nikto
+nilfs2-tools
 nload
 nmap
 nmapfe
@@ -1240,14 +1154,12 @@ ntfsprogs
 ntlmaps
 ntp
 ntpdate
-nufw
 nullidentd
 num-utils
 nutcpc
 nvi
 nvidia-xconfig
 nvtv
-o3read
 obconf
 obexftp
 obexpushd
@@ -1258,25 +1170,29 @@ 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
+openvas-client
+openvas-server
+open-vm-tools
 openvpn
 ophcrack
 opie-client
 orange
 orpheus
-os-prober
 osdsh
 osiris
+os-prober
 oss-compat
 p0f
 p3nfs
@@ -1285,7 +1201,6 @@ p7zip
 packeth
 packit
 pads
-paketto
 pal
 pamusb-tools
 paperkey
@@ -1301,10 +1216,11 @@ patcher
 patchutils
 pavuk
 pax
-pax-utils
 paxctl
+pax-utils
 pbuilder
 pbzip2
+pcaputils
 pciutils
 pcmciautils
 pconf-detect
@@ -1313,7 +1229,6 @@ pcopy
 pcregrep
 pcscd
 pdfcube
-pdfjam
 pdksh
 pdmenu
 pdns-backend-ldap
@@ -1327,15 +1242,14 @@ pdumpfs
 pekwm
 perforate
 perl
-perl-base
 perl-doc
+perlmagick
 perl-modules
 perl-suid
 perl-tk
-perlmagick
 pfqueue
-pgf
 pia
+pigz
 pilot-link
 pinentry-curses
 pinfo
@@ -1346,6 +1260,7 @@ pktstat
 playmidi
 playmp3list
 plptools
+pmailq
 pmidi
 pmount
 pngtools
@@ -1368,12 +1283,10 @@ postfix-ldap
 postfix-pcre
 postgresql-client-8.2
 postgresql-client-common
-potion
+postmark
 powermgmt-base
 powernowd
 powertop
-powertweak-gtk
-powertweakd
 pperl
 ppmd
 ppp
@@ -1381,10 +1294,9 @@ pppconfig
 pppoe
 pppoeconf
 pppstatus
-pptp-linux
 pptpd
+pptp-linux
 preload
-preview-latex-style
 prismstumbler
 pristine-tar
 privbind
@@ -1416,6 +1328,10 @@ pxfw
 pydb
 pymacs
 python
+python2.4
+python2.4-minimal
+python2.5
+python2.5-minimal
 python-apt
 python-cddb
 python-celementtree
@@ -1443,22 +1359,19 @@ 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
+qla-tools
 qprof
 qpxtool
-qtparted
 quilt
 quota
 racoon
 radeontool
 radio
-raggle
+radvd
 rain
 rake
 randomize-lines
@@ -1496,7 +1409,6 @@ reportbug
 reprepro
 resolvconf
 retty
-rgpsp
 rinetd
 rinse
 rkhunter
@@ -1513,19 +1425,20 @@ rrdtool
 rsnapshot
 rssh
 rsync
-rt2400
-rt2500
 rtorrent
 rubilicious
 ruby
-ruby-prof
 ruby1.8
 ruby1.8-examples
+ruby-prof
 rungetty
+runit
+rutilt
 rxvt-beta
 rxvt-unicode
 s3cmd
 s3switch
+safecopy
 saidar
 sam
 samba
@@ -1535,6 +1448,7 @@ sash
 sbm
 sc
 scalpel
+scamper
 scanlogd
 scanmem
 scantv
@@ -1546,7 +1460,7 @@ scponly
 screen
 screenie
 scrot
-scsi-idle
+scrounge-ntfs
 scsiadd
 scsitools
 sdate
@@ -1577,11 +1491,9 @@ shorewall
 shtool
 sic
 sigit
-sing
-sip-tester
 sipsak
+sip-tester
 sitecopy
-sjog
 sl
 slapd
 slat
@@ -1598,26 +1510,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
@@ -1627,25 +1537,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
@@ -1658,6 +1569,7 @@ sucrack
 sudo
 sudoku
 super
+supercat
 sux
 swaks
 swapd
@@ -1668,13 +1580,12 @@ synergy
 syrep
 sysfsutils
 syslinux
-syslog-ng
 sysprof
 sysstat
 systune
 sysvinit
 sysvinit-utils
-t-prot
+tableau-parm
 tagtool
 tailor
 taktuk
@@ -1700,32 +1611,23 @@ tcsh
 tct
 tdl
 telak
-telnet-ssl
 telnetd-ssl
+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
@@ -1739,7 +1641,8 @@ toshset
 toshutils
 tpconfig
 tpp
-traceproto
+t-prot
+tra
 traceroute
 transfig
 trayer
@@ -1748,11 +1651,8 @@ treil
 trickle
 tshark
 tsocks
-tspc
 tss
-ttf-bitstream-vera
 ttf-dejavu
-tthsum
 ttmkfdir
 ttysnoop
 tweak
@@ -1761,8 +1661,8 @@ twolame
 txt2man
 txt2pdbdoc
 txt2regex
-type1inst
 tzdata
+u3-tool
 ucf
 udftools
 udpcast
@@ -1772,30 +1672,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
@@ -1815,7 +1713,6 @@ vim-addon-manager
 vim-common
 vim-gtk
 vim-gui-common
-vim-latexsuite
 vim-python
 vim-ruby
 vim-runtime
@@ -1825,12 +1722,10 @@ vinetto
 vkeybd
 vlan
 vlock
-vnc-common
-vncommand
 vnstat
 vobcopy
-vorbis-tools
 vorbisgain
+vorbis-tools
 vpnc
 vrfy
 vrms
@@ -1851,8 +1746,8 @@ wavemon
 wcalc
 wdiff
 webcam
-webcam-server
 webcamd
+webcam-server
 webcheck
 webcpp
 weblint-perl
@@ -1869,7 +1764,6 @@ whowatch
 wiggle
 wikipedia2text
 wikipediafs
-windowlab
 wipe
 wireless-tools
 wireshark
@@ -1878,16 +1772,13 @@ wmaloader
 wmctrl
 wmii
 wmmisc
-wodim
 wondershaper
-workbone
 wpasupplicant
 wprint
 wput
-wwwconfig-common
 wvdial
+wwwconfig-common
 wyrd
-x-ttcidfont-conf
 x11-common
 x11vnc
 x2x
@@ -1944,7 +1835,7 @@ xmms2-plugin-id3v2
 xmms2-plugin-jack
 xmms2-plugin-mad
 xmms2-plugin-vorbis
-xmove
+xmount
 xnee
 xnest
 xosd-bin
@@ -1952,13 +1843,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
@@ -1978,21 +1869,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
@@ -2006,30 +1895,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
@@ -2041,14 +1929,16 @@ zile
 zip
 zlib1g
 zoidberg
+zoo
 zsh
 zsh-doc
 zsh-static
 zssh
 zsync
 zzuf
+## }}}
 
-# non-free:
+## non-free {{{
 abs-guide
 agrep
 atmel-firmware
@@ -2056,79 +1946,79 @@ bluez-firmware
 chntpw
 dvdrtools
 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
-tth
 unrar
 zd1211-firmware
+## }}}
 
-# x86/32bit (class I386) specific packages:
+## x86/32bit (class I386) specific packages {{{
 PACKAGES aptitude I386
 
-# we also want to use linux-kernel-headers-grml instead of linux-libc-dev:
-linux-kernel-headers-grml
-
-#acx100-2.6.23-grml
-aufs-modules-2.6.23-grml
-#bcm5700-module-2.6.23-grml
-grml-kerneladdons-2.6.23
-gspca-modules-2.6.23-grml
-ipw3945-modules-2.6.23-grml
-#ivtv-modules-2.6.23-grml
-kqemu-modules-2.6.23-grml
-#kvm-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
-loop-aes-modules-2.6.23-grml
-nozomi-modules-2.6.23-grml
-#nvidia-kernel-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
-sl-modem-modules-2.6.23-grml
-#spca5xx-modules-2.6.23-grml
-sysprof-module-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
 
-#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.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
+rt2400-modules-2.6.31-grml
+rt73-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.20-grml64 aufs-modules-2.6.20-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
+rt2400-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