X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=f5c6589a5f9022a396599064894368b71c21535f;hp=070af119037ebb0452a2dd9a4784a8b536b25c71;hb=94f225af4b9e560ccbca1e336e79d6757133ee87;hpb=16154aa1fda92779cac1ad5346f9b39e81b883f7

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 070af11..f5c6589 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
@@ -85,7 +35,6 @@ ctris
 dd-rhelp
 ded
 deletemail
-detox
 dired
 dupmerge
 dupseek
@@ -100,7 +49,6 @@ gateguardian
 gatling
 gifshuffle
 glipper-nognome
-grml
 grml2hd
 grml2hd-utils
 grml2usb
@@ -118,8 +66,10 @@ grml-files
 grml-firefox
 grml-hwinfo
 grml-laptop
+grml-live
 grml-mercurial-utils
 grml-network
+grml-paste
 grml-policyrcd
 grml-pylib
 grml-rebuildfstab
@@ -146,6 +96,12 @@ ipw-firmware
 lame
 latextug
 lcdtest
+libacme-bleach-perl
+libacme-eyedrops-perl
+libacme-smirch-perl
+libewf
+libpam-thinkfinger
+libstdc++2.10-glibc2.2
 md5deep
 minised
 msgid-chooser
@@ -159,41 +115,40 @@ 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
+## 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 shadowfs shish shmux speechd-up squashfs
+# sudosh tal thc-pptp-bruter tlswrap tpm-tools trapdoor2 trousers yersinia
+## }}}
 
-# official Debian packages:
+## Official Debian packages {{{
 2vcard
 3270-common
 4g8
@@ -207,9 +162,9 @@ ace-of-penguins
 ack-grep
 acl
 acpi
-acpi-support
 acpid
 acpidump
+acpi-support
 acpitail
 acpitool
 adduser
@@ -223,32 +178,34 @@ 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 +213,25 @@ 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
+array-util
 ascii
 ascii2binary
 asciidoc
 ash
 asn1c
+asql
 asr-manpages
 astyle
 asused
@@ -289,6 +245,7 @@ atop
 atsar
 attr
 aub
+auctex
 aufs-tools
 aumix
 auto-apt
@@ -305,10 +262,11 @@ avahi-daemon
 aview
 away
 awesfx
+awesome
 axel
 axp
-backup-manager
 backup2l
+backup-manager
 backuppc
 bacula-common
 bacula-console
@@ -338,8 +296,8 @@ bin86
 binclock
 bind9
 bind9-host
-binfmt-support
 binfmtc
+binfmt-support
 bing
 binstats
 binutils
@@ -347,9 +305,10 @@ bison
 bitlbee
 bittornado
 bittorrent
+bittwist
 bkhive
 blktrace
-bluetooth-alsa
+bluez-audio
 bluez-hcidump
 bluez-utils
 bmon
@@ -361,6 +320,7 @@ brltty
 brltty-flite
 bsdgames
 bsdiff
+bsd-mailx
 bsdmainutils
 bsdtar
 bsdutils
@@ -375,10 +335,10 @@ bwm-ng
 bzip2
 bzr
 c3270
-ca-certificates
 cabber
 cabextract
 caca-utils
+ca-certificates
 cadaver
 calcurse
 calife
@@ -393,12 +353,12 @@ ccal
 ccontrol
 ccrypt
 ccze
-cd-discid
 cdbackup
 cdbs
 cdck
 cdda2wav
 cddb
+cd-discid
 cdebootstrap
 cdecl
 cdparanoia
@@ -409,14 +369,12 @@ cdrecord
 cdrskin
 cdtool
 cedet-common
-centericq-common
-centerim-common
 centerim-utf8
+cereal
 cfengine2
 cfv
 cgdb
 check
-check
 cheops
 chkrootkit
 chrootuid
@@ -436,6 +394,7 @@ colorgcc
 compartment
 concalc
 configure-debian
+conky
 connect-proxy
 conntrack
 console-common
@@ -462,8 +421,8 @@ cpuid
 cpulimit
 crack
 crack-common
-cracklib-runtime
 cracklib2
+cracklib-runtime
 cramfsprogs
 cron
 crosshurd
@@ -483,12 +442,11 @@ cups-pdf
 cupsys
 cupsys-bsd
 cupsys-client
-cupsys-common
 curl
 curlftpfs
 cvs
-cvs-buildpackage
 cvs2cl
+cvs-buildpackage
 cvsconnect
 cvsdelta
 cw
@@ -537,17 +495,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
@@ -578,9 +537,9 @@ dnsproxy
 dnstracer
 dnsutils
 docbook
+docbook2odf
 docbook-dsssl
 docbook-to-man
-docbook2odf
 dog
 doscan
 dosfstools
@@ -612,15 +571,16 @@ duplicity
 dupload
 durep
 dvb-utils
-dvd+rw-tools
 dvdbackup
 dvdisaster
+dvd+rw-tools
 dvi2tty
 dvipng
 dviutils
 dwm
 dwm-tools
 dynafont
+dzen2
 e2fslibs
 e2fsprogs
 e2tools
@@ -630,6 +590,7 @@ ebtables
 eciadsl
 ecryptfs-utils
 ed
+edac-utils
 edbrowse
 eflite
 eieio
@@ -648,17 +609,19 @@ emacs22-bin-common
 emacs22-common
 emacsen-common
 emcast
-emelfm
 emuga
 encfs
 enscribe
 enscript
+ent
+epdfview
 equivs
 erc
 es
 esound-common
 espeak
 espeak-data
+etckeeper
 eterm
 etherwake
 ethstatus
@@ -677,13 +640,14 @@ exiftran
 exiv2
 expect
 ext2resize
+ext3grep
 exuberant-ctags
 faad
 facter
 fai-client
 fai-doc
-fai-server
 fail2ban
+fai-server
 fake
 fakechroot
 fakeroot
@@ -702,18 +666,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
@@ -739,17 +702,17 @@ 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
@@ -776,6 +739,7 @@ getmail4
 gettext
 gettext-base
 gettext-el
+gfs2-tools
 gfs-tools
 gftp-common
 gftp-text
@@ -785,27 +749,30 @@ 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
@@ -836,6 +803,8 @@ haproxy
 harden-remoteaudit
 harden-tools
 hasciicam
+hdapsd
+hdaps-utils
 hddtemp
 hdparm
 hexedit
@@ -847,11 +816,11 @@ hibernate
 hicolor-icon-theme
 hnb
 honeyd
-hostap-utils
 hostapd
+hostap-utils
 hostname
-hotkey-setup
 hotkeys
+hotkey-setup
 hotswap-text
 hoz
 hpijs
@@ -867,7 +836,7 @@ httptunnel
 hunt
 hwdata
 hwinfo
-hwtools
+i2c-tools
 i810switch
 i8kutils
 ibod
@@ -881,7 +850,6 @@ icmpush
 id3
 id3v2
 idesk
-idn
 idswakeup
 ifenslave-2.6
 ifmetric
@@ -890,20 +858,21 @@ ifrename
 ifstat
 iftop
 ifupdown
+ifupdown-extra
 ifupdown-scripts-zg2
 igal
 ihu
 ii
 iisemulator
 ike-scan
-im-switch
 imagemagick
 imapcopy
 imapfilter
 imediff2
-imlib-base
 imlib11
+imlib-base
 imsniff
+im-switch
 imwheel
 inadyn
 indent
@@ -917,9 +886,9 @@ inotail
 inoticoming
 inotify-tools
 input-utils
-ation-report
 intltool-debian
 iodine
+iotop
 ipcalc
 iperf
 ipgrab
@@ -929,6 +898,7 @@ ipppd
 iprelay
 iproute
 ipsec-tools
+ipset
 iptables
 iptraf
 iptstate
@@ -947,7 +917,6 @@ irqbalance
 irssi
 irssi-plugin-xmpp
 irssi-scripts
-irssi-text
 isakmpd
 iscsitarget
 isdnactivecards
@@ -957,6 +926,7 @@ isic
 ispell
 isync
 itop
+ivtv-utils
 iwatch
 jack
 jackd
@@ -985,6 +955,7 @@ kernel-package
 ketchup
 kexec-tools
 keychain
+keynav
 keyutils
 kismet
 klibc-utils
@@ -1004,21 +975,33 @@ lanmap
 laptop-detect
 laptop-mode-tools
 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
+libpam-chroot
+libpam-devperm
+libpam-dotfile
+libpam-krb5
+libpam-modules
+libpam-mount
+libpam-pwgen
+libpam-smbpass
+libpam-ssh
+libpam-tmpdir
+libtool
 lighttpd
 lilo
 linda
@@ -1026,10 +1009,10 @@ links
 links2
 linneighborhood
 lintian
-linux-sound-base
-linux-wlan-ng
 linuxdoc-tools
 linuxlogo
+linux-sound-base
+linux-wlan-ng
 listadmin
 live-initramfs
 lkl
@@ -1048,6 +1031,7 @@ logtools
 logwatch
 lomoco
 loop-aes-utils
+loop-aes-testsuite
 lrzsz
 lsb-base
 lsb-release
@@ -1060,6 +1044,7 @@ lsscsi
 ltrace
 lua50
 luasocket
+luvcview
 lvm2
 lwatch
 lynx
@@ -1076,7 +1061,6 @@ mailcheck
 maildirsync
 mailfilter
 mailplate
-mailx
 mairix
 make
 makedev
@@ -1118,11 +1102,13 @@ minicom
 mirrordir
 mixmaster
 mkcue
+mkelfimage
 mkisofs
 mklibs-copy
 mknbi
 mksh
 mktemp
+mlocate
 mmv
 mobilemesh
 moc
@@ -1156,15 +1142,15 @@ mr
 mrb
 mrxvt
 mrxvt-common
-ms-sys
 msmtp
 msort
-mt-st
+ms-sys
 mtd-tools
 mtools
-mtp-tools
 mtpaint
+mtp-tools
 mtr-tiny
+mt-st
 multi-aterm
 multipath-tools
 multitail
@@ -1197,10 +1183,9 @@ ndiswrapper-utils-1.9
 ne
 nedit
 nemesis
-nessus-plugins
 nessusclient
 nessusd
-net-tools
+nessus-plugins
 netbase
 netcat
 netcat6
@@ -1212,12 +1197,13 @@ nethogs
 netmask
 netpbm
 netpipe-tcp
-netpipes
 netrik
 netris
+netrw
 netsed
 netstat-nat
 netsurf
+net-tools
 netwag
 netwox
 newsbeuter
@@ -1239,7 +1225,6 @@ ntfsprogs
 ntlmaps
 ntp
 ntpdate
-nufw
 nullidentd
 num-utils
 nutcpc
@@ -1257,25 +1242,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
@@ -1300,10 +1287,11 @@ patcher
 patchutils
 pavuk
 pax
-pax-utils
 paxctl
+pax-utils
 pbuilder
 pbzip2
+pcaputils
 pciutils
 pcmciautils
 pconf-detect
@@ -1328,10 +1316,10 @@ perforate
 perl
 perl-base
 perl-doc
+perlmagick
 perl-modules
 perl-suid
 perl-tk
-perlmagick
 pfqueue
 pgf
 pia
@@ -1345,6 +1333,7 @@ pktstat
 playmidi
 playmp3list
 plptools
+pmailq
 pmidi
 pmount
 pngtools
@@ -1371,8 +1360,8 @@ potion
 powermgmt-base
 powernowd
 powertop
-powertweak-gtk
 powertweakd
+powertweak-gtk
 pperl
 ppmd
 ppp
@@ -1380,8 +1369,8 @@ pppconfig
 pppoe
 pppoeconf
 pppstatus
-pptp-linux
 pptpd
+pptp-linux
 preload
 preview-latex-style
 prismstumbler
@@ -1415,6 +1404,10 @@ pxfw
 pydb
 pymacs
 python
+python2.4
+python2.4-minimal
+python2.5
+python2.5-minimal
 python-apt
 python-cddb
 python-celementtree
@@ -1442,22 +1435,16 @@ python-subversion
 python-support
 python-twisted-bin
 python-urwid
-python2.4
-python2.4-minimal
-python2.5
-python2.5-minimal
 pytris
 qc-usb-utils
 qjackctl
 qprof
 qpxtool
-qtparted
 quilt
 quota
 racoon
 radeontool
 radio
-raggle
 rain
 rake
 randomize-lines
@@ -1512,15 +1499,15 @@ 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
@@ -1534,6 +1521,7 @@ sash
 sbm
 sc
 scalpel
+scamper
 scanlogd
 scanmem
 scantv
@@ -1545,8 +1533,9 @@ scponly
 screen
 screenie
 scrot
-scsi-idle
+scrounge-ntfs
 scsiadd
+scsi-idle
 scsitools
 sdate
 sdd
@@ -1577,8 +1566,8 @@ shtool
 sic
 sigit
 sing
-sip-tester
 sipsak
+sip-tester
 sitecopy
 sjog
 sl
@@ -1597,11 +1586,11 @@ slurm
 sm
 smake
 smartmontools
-smb-nat
 smbc
 smbclient
 smbfs
 smbldap-tools
+smb-nat
 smbnetfs
 sn
 snarf
@@ -1612,11 +1601,10 @@ snort
 snowdrop
 snownews
 socat
-sound-recorder
 sox
 sp
-speech-dispatcher
 speechd-el
+speech-dispatcher
 speedometer
 speex
 spell
@@ -1626,18 +1614,20 @@ 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
@@ -1657,6 +1647,7 @@ sucrack
 sudo
 sudoku
 super
+supercat
 sux
 swaks
 swapd
@@ -1667,13 +1658,11 @@ synergy
 syrep
 sysfsutils
 syslinux
-syslog-ng
 sysprof
 sysstat
 systune
 sysvinit
 sysvinit-utils
-t-prot
 tagtool
 tailor
 taktuk
@@ -1699,8 +1688,8 @@ tcsh
 tct
 tdl
 telak
-telnet-ssl
 telnetd-ssl
+telnet-ssl
 testdisk
 tetradraw
 tetrinet-client
@@ -1721,10 +1710,11 @@ textdraw
 tgt
 thttpd
 tidy
+tig
+timelimit
 timeout
 tin
 tinyhoneypot
-tinysnmp-tools
 tk8.4
 tla
 tmpreaper
@@ -1738,6 +1728,8 @@ toshset
 toshutils
 tpconfig
 tpp
+t-prot
+tra
 traceproto
 traceroute
 transfig
@@ -1771,6 +1763,7 @@ uml-utilities
 unace
 unclutter
 uncrustify
+unhide
 uni2ascii
 unicode
 unifont
@@ -1783,6 +1776,7 @@ unixcw
 unp
 unrar-free
 unrtf
+unsort
 unzip
 unzoo
 update-inetd
@@ -1793,8 +1787,8 @@ urlview
 uruk
 usbutils
 usbview
-user-setup
 userinfo
+user-setup
 uswsusp
 util-linux
 util-linux-locales
@@ -1828,8 +1822,8 @@ vnc-common
 vncommand
 vnstat
 vobcopy
-vorbis-tools
 vorbisgain
+vorbis-tools
 vpnc
 vrfy
 vrms
@@ -1850,8 +1844,8 @@ wavemon
 wcalc
 wdiff
 webcam
-webcam-server
 webcamd
+webcam-server
 webcheck
 webcpp
 weblint-perl
@@ -1883,10 +1877,9 @@ workbone
 wpasupplicant
 wprint
 wput
-wwwconfig-common
 wvdial
+wwwconfig-common
 wyrd
-x-ttcidfont-conf
 x11-common
 x11vnc
 x2x
@@ -1951,6 +1944,7 @@ xpdf
 xpdf-reader
 xprobe
 xresprobe
+xrestop
 xrsh
 xsel
 xserver-xorg
@@ -1992,6 +1986,7 @@ 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
@@ -2017,6 +2012,7 @@ xtermcontrol
 xtermset
 xtrace
 xtrlock
+x-ttcidfont-conf
 xtv
 xutils
 xutils-dev
@@ -2029,6 +2025,7 @@ xzoom
 yacpi
 yaird
 yasr
+yatm
 yeahconsole
 yersinia
 youtube-dl
@@ -2046,8 +2043,9 @@ zsh-static
 zssh
 zsync
 zzuf
+## }}}
 
-# non-free:
+## non-free {{{
 abs-guide
 agrep
 atmel-firmware
@@ -2058,7 +2056,7 @@ figlet
 firmware-ipw3945
 firmware-iwlwifi
 firmware-qlogic
-glimpse
+firmware-ralink
 iozone3
 ipw3945d
 irpas
@@ -2073,61 +2071,83 @@ 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:
+## general:
+grml
+# we 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
-
-#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.26-grml:
+acx100-2.6.26-grml
+at76-usb-modules-2.6.26-grml
+atl2-modules-2.6.26-grml
+aufs-modules-2.6.26-grml
+drbd8-2.6.26-grml
+exmap-modules-2.6.26-grml
+#fglrx-kernel-2.6.26-grml
+grml-kerneladdons-2.6.26
+gspca-modules-2.6.26-grml
+iscsitarget-module-2.6.26-grml
+kqemu-modules-2.6.26-grml
+linux-doc-2.6.26-grml
+linux-headers-2.6.26-grml
+linux-image-2.6.26-grml
+#linux-source-2.6.26-grml
+linux-uvc-modules-2.6.26-grml
+linux-wlan-ng-modules-2.6.26-grml
+loop-aes-modules-2.6.26-grml
+madwifi-modules-2.6.26-grml
+ndiswrapper-modules-2.6.26-grml
+#nvidia-kernel-2.6.26-grml
+openafs-modules-2.6.26-grml
+#open-vm-modules-2.6.26-grml
+qc-usb-modules-2.6.26-grml
+rt2400-modules-2.6.26-grml
+rt2500-modules-2.6.26-grml
+rt73-modules-2.6.26-grml
+sl-modem-modules-2.6.26-grml
+speakup-modules-2.6.26-grml
+sysprof-module-2.6.26-grml
+tp-smapi-modules-2.6.26-grml
+truecrypt-2.6.26-grml
+virtualbox-ose-guest-modules-2.6.26-grml virtualbox-ose-guest-utils
+#virtualbox-ose-modules-2.6.26-grml
+#zaptel-modules-2.6.26-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.26-grml64:
+acx100-2.6.26-grml64
+at76-usb-modules-2.6.26-grml64
+atl2-modules-2.6.26-grml64
+aufs-modules-2.6.26-grml64
+drbd8-2.6.26-grml64
+exmap-modules-2.6.26-grml64
+# grml64-kerneladdons-2.6.26
+gspca-modules-2.6.26-grml64
+kqemu-modules-2.6.26-grml64
+linux-doc-2.6.26-grml64
+linux-headers-2.6.26-grml64
+linux-image-2.6.26-grml64
+#linux-source-2.6.26-grml
+loop-aes-modules-2.6.26-grml64
+madwifi-modules-2.6.26-grml64
+ndiswrapper-modules-2.6.26-grml64
+openafs-modules-2.6.26-grml64
+qc-usb-modules-2.6.26-grml64
+rt2400-modules-2.6.26-grml64
+rt2500-modules-2.6.26-grml64
+sysprof-module-2.6.26-grml64
+truecrypt-2.6.26-grml64
+## }}}
+
+# vim: foldmethod=marker