X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=1dafb0514fd73752bc61c940f6fce03b651cc98f;hb=29517fe81184588fcd95c1000c472aab640320d1;hp=3f62aa978a5fb58271ef151d6b1e905eb163d8cd;hpb=52af937ab56463fd89120532fe314097f8de59e5;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 3f62aa9..9c16a7d 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -16,90 +16,53 @@ PACKAGES aptitude
 ## }}}
 
 ## grml specific packages {{{
-3ware-cli-binary
 aamath
 advchk
 aesutil
 afflib
 amap
-asleap
-bar
 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-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
@@ -108,11 +71,9 @@ ncp
 pip
 prism54-firmware
 prosilla
-pspax
 ptfinder
 rainbowcrack
 rootsh
-salvage-ntfs
 shadowfs
 shish
 shmux
@@ -125,38 +86,18 @@ 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 shadowfs shish shmux speechd-up squashfs
-# 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
@@ -213,9 +154,7 @@ apt-utils
 apt-zip
 apwal
 ara
-archivemail
 argus-client
-aria2
 arj
 arping
 arp-scan
@@ -226,26 +165,16 @@ arrayprobe
 ascii
 ascii2binary
 asciidoc
-ash
 asn1c
 asql
-asr-manpages
-astyle
 asused
 at
-aterm
 atftpd
-athcool
 athena-jot
-atitvout
 atop
 atsar
 attr
-aub
-auctex
-aufs-tools
 aumix
-auto-apt
 autoconf
 automake
 automake1.4
@@ -260,7 +189,6 @@ away
 awesfx
 awesome
 axel
-axp
 backup2l
 backup-manager
 backuppc
@@ -273,10 +201,8 @@ base-passwd
 bash
 bash-builtins
 bash-doc
-bash-minimal
 bash-static
 bastille
-bazaar
 bb
 bbe
 bc
@@ -286,7 +212,6 @@ bcrypt
 beep
 bfbtester
 biabam
-bibcursed
 bin86
 binclock
 bind9
@@ -303,7 +228,6 @@ bittorrent
 bittwist
 bkhive
 blktrace
-bluez-audio
 bluez-hcidump
 bluez-utils
 bmon
@@ -320,26 +244,21 @@ bsdmainutils
 bsdtar
 bsdutils
 bsign
+btrfs-tools
 btscanner
 buffer
 build-essential
 burn
-busybox
 bvi
 bwm-ng
-bzip2
 c3270
 cabber
 cabextract
 caca-utils
 ca-certificates
 cadaver
-calcurse
-calife
-camserv
 capiutils
 catdoc
-catdvi
 cbm
 cbrowser
 ccache
@@ -352,26 +271,22 @@ 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
@@ -379,22 +294,17 @@ clamav-daemon
 clamav-freshclam
 clamav-testfiles
 clex
-clive
 cloop-utils
-cmatrix
 cmus
 codeville
 colorgcc
+comgt
 compartment
 concalc
 configure-debian
-conky
+conkeror
 connect-proxy
 conntrack
-console-common
-console-data
-console-terminus
-console-tools
 conspy
 convmv
 coreutils
@@ -412,11 +322,8 @@ cpufrequtils
 cpuid
 cpulimit
 crack
-crack-common
-cracklib2
 cracklib-runtime
 cramfsprogs
-cron
 crosshurd
 cryptcat
 cryptsetup
@@ -424,7 +331,6 @@ cscope
 csh
 csstidy
 csync2
-ctioga
 ctorrent
 ctrlproxy
 cu
@@ -436,11 +342,8 @@ curl
 curlftpfs
 cvs
 cvs2cl
-cvs-buildpackage
 cvsconnect
 cvsdelta
-cw
-cwcp
 daemon
 dante-client
 dar
@@ -449,7 +352,6 @@ dares
 dares-qt
 dash
 davfs2
-dbishell
 dbs
 dbus
 dbus-x11
@@ -458,8 +360,6 @@ dcfldd
 dconf
 dcraw
 dctrl-tools
-ddccontrol
-ddccontrol-db
 ddclient
 ddrescue
 dds2tar
@@ -476,19 +376,15 @@ debian-reference-en
 debianutils
 debmirror
 debootstrap
-deborphan
 debsecan
 debsigs
 debsums
-defoma
-defrag
 detachtty
 detox
 devio
 devscripts
 devtodo
 dhcp3-client
-dhcp3-common
 dhcp3-server
 dhcpdump
 dhcping
@@ -503,8 +399,8 @@ diction
 dictionaries-common
 dietlibc
 dietlibc-dev
-diff
 diffstat
+diffutils
 ding
 dir2ogg
 dirdiff
@@ -515,7 +411,6 @@ disktype
 distcc
 distmp3
 dlint
-dmidecode
 dmraid
 dmsetup
 dns2tcp
@@ -556,19 +451,15 @@ dumputils
 duplicity
 dupload
 durep
-dvb-utils
+dvb-apps
 dvdbackup
 dvdisaster
 dvd+rw-tools
-dvi2tty
-dvipng
-dviutils
 dvtm
 dwdiff
 dwm
 dwm-tools
 dzen2
-e2fslibs
 e2fsprogs
 e2tools
 e2undel
@@ -576,23 +467,17 @@ e3
 ebtables
 ecryptfs-utils
 ed
-edac-utils
 edbrowse
 eflite
 eieio
-eject
+ekeyd
 electric-fence
 elfsh
 elinks
-elmo
 elscreen
 elvis
 elvis-common
 emacs
-emacs22
-emacs22-bin-common
-emacs22-common
-emacsen-common
 emcast
 emuga
 encfs
@@ -602,10 +487,7 @@ ent
 epdfview
 equivs
 erc
-es
-esound-common
 espeak
-espeak-data
 espeakup
 etckeeper
 eterm
@@ -613,52 +495,43 @@ 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
 fake
-fakechroot
 fakeroot
 faketime
 farpd
+fatattr
 fatresize
 fatsort
 fbgrab
 fbi
 fbset
-fcoretools
+fbterm
 fcrackzip
-fdflush
 fdupes
-fdutils
+febootstrap
 feh
 fetchmail
-fgetty
-file
-filepp
-file-rc
-filetraq
-fileutils
 findutils
 finger
+fio
 firehol
 fish
 flashrom
@@ -668,14 +541,9 @@ flex
 flexbackup
 flite
 fluxbox
-fluxconf
-fnfx-client
-fnfxd
-fnord
 fondu
 fontconfig
 fontconfig-config
-fonty
 foremost
 fortune-mod
 fortunes-debian-hints
@@ -687,6 +555,7 @@ freeglut3
 freeradius
 freeradius-ldap
 freesweep
+fsarchiver
 ftp
 ftpcopy
 ftp-upload
@@ -703,14 +572,12 @@ fxload
 g++
 gaffitter
 gamin
-gawk
 gcal
 gcc
 gcolor2
-gcom
 gdb
 gddrescue
-gdk-imlib11
+gdisk
 geeqie
 gems
 genders
@@ -725,9 +592,8 @@ gftp-common
 gftp-text
 ghostscript
 giblib1
-gif2png
-giftcurs
 git-core
+git-email
 gitpkg
 git-svn
 gitweb
@@ -742,13 +608,11 @@ gkrellm-x86info
 gkrellshoot
 gkrellweather
 glark
-gmailfs
 gmrun
-gnuhtml2latex
 gnuit
 gnupg
+gnupg2
 gnupg-agent
-gnupg-pkcs11-scd
 gnutls-bin
 gocr
 gpart
@@ -757,32 +621,28 @@ gpgsm
 gpgv
 gphoto2
 gpm
+gptsync
 gq
-gqcam
 grabc
 graphviz
 grep
 grepmail
 groff
-grub
 gsfonts
 gsfonts-x11
 gsm-utils
 gtkam
 guessnet
+guymager
 gv
-gzip
 gzrt
-habak
 hal
 hal-info
 haproxy
-harden-remoteaudit
 harden-tools
 hasciicam
 hdapsd
 hddtemp
-hdparm
 hexedit
 hfsplus
 hfsprogs
@@ -790,16 +650,12 @@ hfsutils
 hgsvn
 hibernate
 hicolor-icon-theme
-hnb
 honeyd
 hostapd
 hostap-utils
-hostname
-hotkeys
 hotkey-setup
 hotswap-text
 hoz
-hping2
 hping3
 ht
 htcheck
@@ -808,33 +664,30 @@ 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
-igal
 ihu
 ii
 iisemulator
@@ -848,11 +701,9 @@ im-switch
 imwheel
 inadyn
 indent
+infiniband-diags
 info
 info2www
-ingerman
-initramfs-tools
-initscripts
 ink
 inotail
 inoticoming
@@ -870,7 +721,6 @@ ipppd
 iprelay
 iproute
 ipsec-tools
-ipset
 iptables
 iptraf
 iptstate
@@ -878,10 +728,8 @@ iputils-ping
 iputils-tracepath
 ipv6calc
 ipvsadm
-ipx
 ipython
 irb
-irb1.8
 ircii
 irda-utils
 irqbalance
@@ -890,20 +738,17 @@ 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
@@ -919,7 +764,6 @@ jp2a
 juke
 jwm
 kanif
-kbd-compat
 keepalived
 kernel-package
 ketchup
@@ -928,11 +772,9 @@ keychain
 keynav
 keyutils
 kismet
-klibc-utils
 knockd
 knocker
 konwert
-konwert-filters
 kpartx
 kqemu-common
 krb5-config
@@ -940,44 +782,25 @@ krb5-user
 ksh
 kvm
 labrea
-lacheck
-lanmap
-laptop-detect
 laptop-mode-tools
 latencytop
-latex-beamer
-latexmk
-latex-mk
-latex-xcolor
 lbdb
-lcap
 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-pwgen
-libpam-smbpass
-libpam-ssh
-libpam-tmpdir
+libnss-mdns
+libsmbios-bin
 libtool
 lighttpd
 lilo
-linda
 links
 links2
 lintian
@@ -985,7 +808,6 @@ linuxdoc-tools
 linuxlogo
 linux-sound-base
 listadmin
-live-initramfs
 lkl
 lltag
 lm-sensors
@@ -993,30 +815,27 @@ loadlin
 localepurge
 locales
 lockfile-progs
-loco
 log2mail
 logapp
 login
 logrotate
 logtools
 logwatch
-lomoco
-loop-aes-utils
 loop-aes-testsuite
+loop-aes-utils
 lrzsz
 lsb-base
 lsb-release
 lsdvd
 lshw
-lslk
 lsof
 lsscsi
 ltrace
 lua50
 luasocket
 luvcview
-lvm2
 lwatch
+lxc
 lynx
 lzma
 lzop
@@ -1046,10 +865,10 @@ mbmon
 mboxcheck
 mboxgrep
 mbr
+mbuffer
 mc
 mcabber
 mcelog
-mdadm
 mdetect
 medusa
 memstat
@@ -1061,8 +880,6 @@ mercurial
 mesa-utils
 metamail
 mg
-mgetty
-mgp
 migrationtools
 mii-diag
 mikmod
@@ -1076,13 +893,11 @@ mkisofs
 mklibs-copy
 mknbi
 mksh
-mktemp
 mlocate
 mmv
 moc
-modconf
+modem-cmd
 module-assistant
-module-init-tools
 molly-guard
 monit
 moosic
@@ -1096,9 +911,7 @@ mp3gain
 mp3info
 mp3splt
 mp3val
-mp3wrap
 mpack
-mpage
 mpc
 mpg123-alsa
 mpg321
@@ -1117,7 +930,6 @@ mtpaint
 mtp-tools
 mtr-tiny
 mt-st
-multi-aterm
 multipath-tools
 multitail
 multitee
@@ -1125,18 +937,17 @@ muscletools
 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
@@ -1144,9 +955,6 @@ ndisc6
 ndiswrapper-utils-1.9
 ne
 nedit
-nessusclient
-nessusd
-nessus-plugins
 netbase
 netcat
 netcat6
@@ -1162,22 +970,22 @@ 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
@@ -1188,6 +996,7 @@ ntlmaps
 ntp
 ntpdate
 nullidentd
+numactl
 num-utils
 nutcpc
 nvi
@@ -1197,7 +1006,6 @@ obconf
 obexftp
 obexpushd
 odt2txt
-offlineimap
 oinkmaster
 olsrd
 olsrd-plugins
@@ -1206,15 +1014,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
@@ -1233,7 +1038,6 @@ packeth
 packit
 pads
 pal
-pamusb-tools
 paperkey
 par
 par2
@@ -1252,7 +1056,6 @@ pax-utils
 pbuilder
 pbzip2
 pcaputils
-pciutils
 pcmciautils
 pconf-detect
 pconsole
@@ -1260,7 +1063,6 @@ pcopy
 pcregrep
 pcscd
 pdfcube
-pdfjam
 pdksh
 pdmenu
 pdns-backend-ldap
@@ -1270,7 +1072,6 @@ pdns-backend-sqlite
 pdns-recursor
 pdns-server
 pdsh
-pdumpfs
 pekwm
 perforate
 perl
@@ -1280,8 +1081,8 @@ perl-modules
 perl-suid
 perl-tk
 pfqueue
-pgf
 pia
+pigz
 pilot-link
 pinentry-curses
 pinfo
@@ -1290,10 +1091,8 @@ piuparts
 pkg-config
 pktstat
 playmidi
-playmp3list
 plptools
 pmailq
-pmidi
 pmount
 pngtools
 pnm2ppa
@@ -1313,13 +1112,12 @@ poster
 postfix
 postfix-ldap
 postfix-pcre
-postgresql-client-8.2
-postgresql-client-common
+postgresql-client
+postmark
 powermgmt-base
 powernowd
 powertop
 pperl
-ppmd
 ppp
 pppconfig
 pppoe
@@ -1328,7 +1126,6 @@ pppstatus
 pptpd
 pptp-linux
 preload
-preview-latex-style
 prismstumbler
 pristine-tar
 privbind
@@ -1342,7 +1139,6 @@ proxychains
 proxycheck
 psad
 pscan
-psfontmgr
 psh
 psmisc
 pssh
@@ -1359,9 +1155,9 @@ pxe
 pxfw
 pydb
 pymacs
+pyneighborhood
 python
 python2.4
-python2.4-minimal
 python2.5
 python2.5-minimal
 python-apt
@@ -1376,13 +1172,10 @@ 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
@@ -1395,6 +1188,7 @@ pytris
 qc-usb-utils
 qiv
 qjackctl
+qla-tools
 qprof
 qpxtool
 quilt
@@ -1416,8 +1210,6 @@ rcov
 rcs
 rdate
 rdesktop
-rdiff
-rdiff-backup
 rdoc
 rdoc1.8
 read-edid
@@ -1435,28 +1227,22 @@ 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
@@ -1469,7 +1255,6 @@ rutilt
 rxvt-beta
 rxvt-unicode
 s3cmd
-s3switch
 safecopy
 saidar
 sam
@@ -1493,7 +1278,6 @@ screen
 screenie
 scrot
 scrounge-ntfs
-scsiadd
 scsitools
 sdate
 sdd
@@ -1508,7 +1292,6 @@ sensord
 ser2net
 setcd
 setserial
-sfind
 sformat
 sg3-utils
 sgml-base
@@ -1540,7 +1323,6 @@ slrnpull
 slsh
 slurm
 sm
-smake
 smartmontools
 smbc
 smbclient
@@ -1553,7 +1335,6 @@ snarf
 sniffit
 snmp
 snoopy
-snowdrop
 socat
 sox
 sp
@@ -1564,9 +1345,7 @@ speedometer
 speex
 spell
 spellutils
-spicctrl
 splint
-splitvt
 sqlite
 sqlite3
 squashfs-lzma-tools
@@ -1591,9 +1370,9 @@ statserial
 stealth
 steghide
 stow
-strace
 streamripper
 stress
+stressapptest
 stunnel4
 subversion
 subversion-tools
@@ -1617,6 +1396,7 @@ sysstat
 systune
 sysvinit
 sysvinit-utils
+tableau-parm
 tagtool
 tailor
 taktuk
@@ -1647,40 +1427,23 @@ 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
 tn5250
 tnef
 tofrodos
 toilet
-toilet-fonts
 tor
-toshset
-toshutils
 tpconfig
 tpp
 t-prot
@@ -1695,8 +1458,6 @@ tshark
 tsocks
 tss
 ttf-dejavu
-tthsum
-ttmkfdir
 ttysnoop
 tweak
 twm
@@ -1710,6 +1471,7 @@ ucf
 udftools
 udpcast
 udptunnel
+ufsutils
 ulogd
 uml-utilities
 unace
@@ -1722,7 +1484,6 @@ unifont
 unison
 units
 uniutils
-unixcw
 unp
 unrar-free
 unrtf
@@ -1733,7 +1494,7 @@ upx-ucl
 urlscan
 urlview
 uruk
-usbutils
+usb-modeswitch
 usbview
 userinfo
 user-setup
@@ -1745,7 +1506,6 @@ v4l-conf
 vbetool
 vbindiff
 vblade
-vcdtools
 vde2
 vera
 vfu
@@ -1756,9 +1516,6 @@ vim-addon-manager
 vim-common
 vim-gtk
 vim-gui-common
-vim-latexsuite
-vim-python
-vim-ruby
 vim-runtime
 vim-scripts
 vim-vimoutliner
@@ -1785,18 +1542,15 @@ 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
@@ -1808,26 +1562,19 @@ whowatch
 wiggle
 wikipedia2text
 wikipediafs
-windowlab
 wipe
-wireless-tools
 wireshark
 wireshark-common
 wmaloader
 wmctrl
 wmii
-wmmisc
 wondershaper
-workbone
-wpasupplicant
-wprint
 wput
 wvdial
 wwwconfig-common
 wyrd
 x11-common
 x11vnc
-x2x
 x86info
 xar
 xautolock
@@ -1845,7 +1592,6 @@ xcursor-themes
 xdelta
 xdelta3
 xdesktopwaves
-xdialog
 xfaces
 xfig
 xfonts-100dpi
@@ -1857,11 +1603,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
@@ -1869,7 +1613,6 @@ xjed
 xkb-data
 xkbset
 xloadimage
-xlockmore
 xml-core
 xmlindent
 xmlstarlet
@@ -1881,6 +1624,7 @@ xmms2-plugin-id3v2
 xmms2-plugin-jack
 xmms2-plugin-mad
 xmms2-plugin-vorbis
+xmount
 xnee
 xnest
 xosd-bin
@@ -1893,57 +1637,8 @@ 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-dummy
-xserver-xorg-video-fbdev
-xserver-xorg-video-glint
-xserver-xorg-video-i128
-xserver-xorg-video-i740
-xserver-xorg-video-i810
-xserver-xorg-video-intel
-xserver-xorg-video-ivtv
-xserver-xorg-video-mga
-xserver-xorg-video-neomagic
-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-via
-xserver-xorg-video-vmware
-xserver-xorg-video-voodoo
 xsltproc
 xtail
 xterm
@@ -1953,6 +1648,7 @@ xtrace
 xtrlock
 x-ttcidfont-conf
 xtv
+xul-ext-webdeveloper
 xutils
 xutils-dev
 xvfb
@@ -1960,6 +1656,7 @@ xvkbd
 xvncviewer
 xwit
 xzoom
+xz-utils
 yacpi
 yaird
 yasr
@@ -1969,7 +1666,7 @@ yersinia
 youtube-dl
 ysm
 zec
-zeroconf
+zerofree
 zgv
 zile
 zip
@@ -1989,25 +1686,14 @@ abs-guide
 agrep
 atmel-firmware
 bluez-firmware
-chntpw
-dvdrtools
-figlet
-firmware-ipw3945
 firmware-iwlwifi
 firmware-qlogic
 firmware-ralink
 iozone3
-ipw3945d
-irpas
 lha
-# lmbench
 manpages-posix
 netperf
-# nttcp
 python-profiler
-rar
-sl-modem-daemon
-tth
 unrar
 zd1211-firmware
 ## }}}
@@ -2017,31 +1703,35 @@ PACKAGES aptitude I386
 
 ## general:
 grml
+perf
+
+# i386-only software
+athcool
+atitvout
+fnfx-client
+fnfxd
+s3switch
+spicctrl
+
 # use linux-kernel-headers-grml instead of linux-libc-dev?
 # linux-kernel-headers-grml
 
-## current kernel version 2.6.28-grml:
-aufs-modules-2.6.28-grml
-drbd8-2.6.28-grml
-#fglrx-kernel-2.6.28-grml
-iscsitarget-module-2.6.28-grml
-kqemu-modules-2.6.28-grml
-linux-doc-2.6.28-grml
-linux-headers-2.6.28-grml
-linux-image-2.6.28-grml
-#linux-source-2.6.28-grml
-loop-aes-modules-2.6.28-grml
-ndiswrapper-modules-2.6.28-grml
-#nvidia-kernel-2.6.28-grml
-openafs-modules-2.6.28-grml
-rt2400-modules-2.6.28-grml
-rt73-modules-2.6.28-grml
-sl-modem-modules-2.6.28-grml
-speakup-modules-2.6.28-grml
-sysprof-module-2.6.28-grml
-tp-smapi-modules-2.6.28-grml
-virtualbox-ose-guest-modules-2.6.28-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-xtables-addons-modules-2.6.28-grml
+## current kernel version 2.6.35-grml:
+#fglrx-kernel-2.6.35-grml
+iscsitarget-module-2.6.35-grml
+linux-doc-2.6.35-grml
+linux-headers-2.6.35-grml
+linux-image-2.6.35-grml
+#linux-source-2.6.35-grml
+loop-aes-modules-2.6.35-grml
+ndiswrapper-modules-2.6.35-grml
+#nvidia-kernel-2.6.35-grml
+openafs-modules-2.6.35-grml
+speakup-modules-2.6.35-grml
+sysprof-module-2.6.35-grml
+tp-smapi-modules-2.6.35-grml
+virtualbox-ose-guest-modules-2.6.35-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+xtables-addons-modules-2.6.35-grml
 ## }}}
 
 ## amd64 specific packages {{{
@@ -2049,25 +1739,24 @@ PACKAGES aptitude AMD64
 
 ## general:
 grml64
+perf
 
-## current kernel version 2.6.28-grml64:
-aufs-modules-2.6.28-grml64
-drbd8-2.6.28-grml64
-#fglrx-kernel-2.6.28-grml64
-kqemu-modules-2.6.28-grml64
-linux-doc-2.6.28-grml64
-linux-headers-2.6.28-grml64
-linux-image-2.6.28-grml64
-#linux-source-2.6.28-grml
-loop-aes-modules-2.6.28-grml64
-ndiswrapper-modules-2.6.28-grml64
-#nvidia-kernel-2.6.28-grml64
-openafs-modules-2.6.28-grml64
-rt2400-modules-2.6.28-grml64
-speakup-modules-2.6.28-grml64
-sysprof-module-2.6.28-grml64
-xtables-addons-modules-2.6.28-grml64
-#virtualbox-ose-guest-modules-2.6.28-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+## current kernel version 2.6.35-grml64:
+#fglrx-kernel-2.6.35-grml64
+iscsitarget-module-2.6.35-grml64
+linux-doc-2.6.35-grml64
+linux-headers-2.6.35-grml64
+linux-image-2.6.35-grml64
+#linux-source-2.6.35-grml
+loop-aes-modules-2.6.35-grml64
+ndiswrapper-modules-2.6.35-grml64
+#nvidia-kernel-2.6.35-grml64
+openafs-modules-2.6.35-grml64
+speakup-modules-2.6.35-grml64
+sysprof-module-2.6.35-grml64
+tp-smapi-modules-2.6.35-grml64
+xtables-addons-modules-2.6.35-grml64
+virtualbox-ose-guest-modules-2.6.35-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 ## }}}
 
 # vim: foldmethod=marker