5 files changed, 128 insertions, 35 deletions
diff --git a/config/lists/acritox-server b/config/lists/acritox-server
new file mode 100644
index 0000000..2283572
--- /dev/null
+++ b/config/lists/acritox-server
@@ -0,0 +1,76 @@
+# acritox Server
+
+#include <base>
+
+# tools
+sudo
+convmv
+
+# development
+dput
+git
+cmake
+qt4-dev-tools
+
+# system
+curlftpfs
+beep
+
+# pdf tools
+pdftk
+pdfjam
+psutils
+imagemagick
+
+# graphics
+exiftran
+jhead
+
+# network
+lftp
+autossh
+fail2ban
+bridge-utils
+isc-dhcp-server
+dnsutils
+bind9
+aiccu
+radvd
+
+# webserver
+apache2
+libapache2-mod-php5
+php5
+php5-sqlite
+php5-curl
+mysql-server-5.1
+phpmyadmin
+apt-cacher-ng
+
+# fileserver
+samba
+samba-common-bin
+nfs-kernel-server
+openssh-server
+
+# email
+dovecot-imapd
+spamassassin
+spamc
+fetchmail
+procmail
+
+# phone
+asterisk
+
+# chat
+ejabberd
+pyicqt
+
+# sms
+kannel
+swatch
+
+# hardware
+apcupsd
+
diff --git a/config/lists/base b/config/lists/base
index bd554cf..65929ea 100644
--- a/config/lists/base
+++ b/config/lists/base
@@ -21,42 +21,14 @@ burg-pc
 grub-pc
 #endif
 
-# java, plugins
-sun-java6-plugin
-
 # multimedia
 sox
 alsa-oss
 aumix
-dvdauthor
-
-# burn
-normalize-audio
-dvd+rw-tools
-
-# browser
-iceweasel-l10n-de
 
 # chat, irc
-pidgin
-gstreamer0.10-plugins-base
-gstreamer0.10-plugins-good
-gstreamer0.10-alsa
 weechat 
 
-# skype
-skype
-pidgin-skype
-debconf-utils
-
-# graphics
-gimp
-gimp-gutenprint
-xsane
-libsane-extras
-sane-utils
-sane
-
 # editors
 vim
 
@@ -82,7 +54,6 @@ bash-completion
 di
 cfv
 whois
-joystick
 screen
 ntpdate
 usb-modeswitch
@@ -94,9 +65,7 @@ smartmontools
 user-setup
 whois
 zsync
-
-# themes
-gtk2-engines
+debconf-utils
 
 # network
 pcmciautils
@@ -123,7 +92,6 @@ foomatic-db-gutenprint
 cups-driver-gutenprint
 foo2zjs
 #printconf
-hplip-gui
 
 # build
 module-assistant
@@ -154,8 +122,6 @@ libgl1-mesa-dri
 dd-rhelp
 testdisk
 gpart
-gparted
-gksu
 
 # filesystems
 ntfs-3g
@@ -191,3 +157,4 @@ vbetool
 radeontool
 modemmanager 
 tp-trackpoint-scroll
+
diff --git a/config/lists/desktop b/config/lists/desktop
new file mode 100644
index 0000000..70faafa
--- /dev/null
+++ b/config/lists/desktop
@@ -0,0 +1,46 @@
+# Kanotix Desktop Packages List
+
+# java, plugins
+sun-java6-plugin
+
+# multimedia
+dvdauthor
+
+# burn
+normalize-audio
+dvd+rw-tools
+
+# browser
+iceweasel-l10n-de
+
+# chat, irc
+pidgin
+gstreamer0.10-plugins-base
+gstreamer0.10-plugins-good
+gstreamer0.10-alsa
+
+# skype
+skype
+pidgin-skype
+
+# graphics
+gimp
+gimp-gutenprint
+xsane
+libsane-extras
+sane-utils
+sane
+
+# tools
+joystick
+
+# themes
+gtk2-engines
+
+# print
+hplip-gui
+
+# tools
+gparted
+gksu
+
diff --git a/config/lists/kde b/config/lists/kde
index 83f4ba7..3b949b7 100644
--- a/config/lists/kde
+++ b/config/lists/kde
@@ -1,5 +1,7 @@
 # Kanotix additional packages list for kde
 
+#include <desktop>
+
 # office
 okular
 
diff --git a/config/lists/trinity b/config/lists/trinity
index f701154..a0bc763 100644
--- a/config/lists/trinity
+++ b/config/lists/trinity
@@ -1,5 +1,7 @@
 # Kanotix additional packages list for trinity
 
+#include <desktop>
+
 # trinity base
 desktop-base-trinity
 sudo-trinity