4 files changed, 149 insertions, 67 deletions
diff --git a/config/lists/kanotix-lxde-base b/config/lists/kanotix-lxde-base
index 8073281..4db8f9c 100644
--- a/config/lists/kanotix-lxde-base
+++ b/config/lists/kanotix-lxde-base
@@ -1,4 +1,4 @@
-# Kanotix with LXDE (CD-minimal)
+# Kanotix with LXDE (lxde-base)
 
 #include <base>
 #include <desktop>
@@ -24,6 +24,7 @@ lxsession-edit
 lxshortcut
 lxterminal
 obconf
+lxappearance-obconf
 xarchiver
 
 geeqie
@@ -48,15 +49,6 @@ lightdm
 xfce4-power-manager
 xfce4-power-manager-plugins
 
-# office
-evince-gtk
-gnumeric
-abiword
-
-# package tool
-synaptic
-apt-xapian-index
-
 # audio
 # xterm is needed by lxpanel to use alsamixer
 #if DISTRIBUTION squeeze
@@ -64,51 +56,16 @@ alsa-utils
 xterm
 #endif
 
-# multimedia
-gecko-mediaplayer
-me-tv
-exaile
-#gstreamer0.10-fluendo-mp3
-gstreamer0.10-plugins-ugly
-gstreamer0.10-ffmpeg
-vlc
 #nif DISTRIBUTION squeeze
-#include <wheezy-pulseaudio>
-vlc-plugin-pulse
-#endif
-
-# skype
-pidgin-skype
-#if DISTRIBUTION squeeze
-#include <squeeze-skype>
-#endif
-#if DISTRIBUTION wheezy
-#include <wheezy-skype>
+#include <wheezy-pulseaudio-base>
 #endif
 
 # other hardware
 modemmanager
 mobile-broadband-provider-info
-blueman
-xfburn
-
-# dvb
-w-scan
 
 # irc
 xchat
 
-# email
-icedove-l10n-de
-
-# grafik
-qtqr
-simple-scan
-
 # other
-ncdu
 gnome-screenshot
-
-# games
-mahjongg
-gnome-sudoku
diff --git a/config/lists/kanotix-lxde-full b/config/lists/kanotix-lxde-full
index 98a079e..925b458 100644
--- a/config/lists/kanotix-lxde-full
+++ b/config/lists/kanotix-lxde-full
@@ -1,17 +1,9 @@
-# Kanotix with LXDE (Master)
+# Kanotix with LXDE (full)
+# not used yet
 
-#include <kanotix-lxde-base>
-#include <office>
-
-# email
-#icedove-l10n-de
+#include <kanotix-lxde-master>
 
-# irc
-#xchat
-
-# multimedia
-#exaile
-#xfburn
+#include <office>
 
 # graphics
 gimp
@@ -36,16 +28,8 @@ winetricks
 #endif
 
 # games
-armagetronad
-foobillard
-neverball
-neverputt
-kmahjongg
 
 # benchmark
 gl2benchmark
 
 # fonts
-xfonts-100dpi
-fonts-liberation
-fonts-droid
diff --git a/config/lists/kanotix-lxde-master b/config/lists/kanotix-lxde-master
index 352f71b..17d754b 100644
--- a/config/lists/kanotix-lxde-master
+++ b/config/lists/kanotix-lxde-master
@@ -1,7 +1,57 @@
-# Kanotix with LXDE (Master)
+# Kanotix with LXDE (Master CD-Version)
 
 #include <kanotix-lxde-base>
 
+# office
+abiword
+evince-gtk
+
+# package tool
+synaptic
+apt-xapian-index
+
+# multimedia
+me-tv
+gecko-mediaplayer
+exaile
+#gstreamer0.10-fluendo-mp3
+gstreamer0.10-plugins-ugly
+gstreamer0.10-ffmpeg
+vlc
+#nif DISTRIBUTION squeeze
+vlc-plugin-pulse
+#endif
+
+# other hardware
+blueman
+xfburn
+
+# dvb
+w-scan
+
+# email
+icedove-l10n-de
+
+# grafik
+qtqr
+simple-scan
+
+#other
+ncdu
+
+# skype
+pidgin-skype
+#if DISTRIBUTION squeeze
+#include <squeeze-skype>
+#endif
+#if DISTRIBUTION wheezy
+#include <wheezy-skype>
+#endif
+
+# games
+mahjongg
+gnome-sudoku
+
 # benchmark
 #gl2benchmark
 
diff --git a/config/lists/kanotix-lxde-min b/config/lists/kanotix-lxde-min
new file mode 100644
index 0000000..198a143
--- /dev/null
+++ b/config/lists/kanotix-lxde-min
@@ -0,0 +1,91 @@
+# Kanotix with LXDE (minimal)
+
+#include <base>
+
+## in desktop
+# needed packages from desktop list
+# tools
+gparted
+gksu
+
+# themes
+gtk2-engines
+#if DISTRIBUTION wheezy
+#include <wheezy-desktop>
+#endif
+
+# tools
+joystick
+
+# some tools or fixes
+dillo
+epdfview
+ca-certificates
+#  desktop finish
+
+# Kanotix
+etcskel-kanotix-lxde
+kmenu-icon-kanotix
+kanotix-lxde-extra
+
+# LXDE
+#if DISTRIBUTION squeeze
+lxde
+#endif
+# remove gpicview due to bug #637713 in wheezy
+#nif DISTRIBUTION squeeze
+leafpad
+lxappearance
+lxde-core
+lxde-icon-theme
+lxinput
+lxrandr
+lxsession-edit
+lxshortcut
+lxterminal
+obconf
+lxappearance-obconf
+xarchiver
+
+geeqie
+#endif
+gvfs-backends
+menu
+menu-xdg
+lxtask
+zenity
+lxpolkit
+network-manager-gnome
+desktop-base
+
+#if DISTRIBUTION squeeze
+gdm
+#endif
+#nif DISTRIBUTION squeeze
+lightdm
+#endif
+
+# power management
+xfce4-power-manager
+xfce4-power-manager-plugins
+
+# audio
+# xterm is needed by lxpanel to use alsamixer
+#if DISTRIBUTION squeeze
+alsa-utils
+xterm
+#endif
+
+#nif DISTRIBUTION squeeze
+#include <wheezy-pulseaudio-base>
+#endif
+
+# other hardware
+modemmanager
+mobile-broadband-provider-info
+
+# irc
+xchat
+
+# other
+gnome-screenshot