From 6de9b252426ecf1100a5a0f1ec2ec2576168978b Mon Sep 17 00:00:00 2001
From: Holger Paradies <retabell@gmx.de>
Date: Thu, 10 Jan 2013 18:53:00 +0100
Subject: update kanotix-lxde-base kanotix-lxde-master

---
 config/lists/kanotix-lxde-base   | 68 ++++++++++++++++++++++++++++++++++++++--
 config/lists/kanotix-lxde-master |  8 ++---
 2 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/config/lists/kanotix-lxde-base b/config/lists/kanotix-lxde-base
index 9abdbbd..44ac816 100644
--- a/config/lists/kanotix-lxde-base
+++ b/config/lists/kanotix-lxde-base
@@ -1,13 +1,32 @@
-# Kanotix with LXDE (minimal)
+# Kanotix with LXDE (CD-minimal)
 
 #include <base>
 #include <desktop>
 
 # Kanotix
 etcskel-kanotix-lxde
+kmenu-icon-kanotix
 
 # 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
+xarchiver
+
+geeqie
+#endif
 gvfs-backends
 menu
 menu-xdg
@@ -29,14 +48,36 @@ xfce4-power-manager
 xfce4-power-manager-plugins
 
 # office
-evince
+evince-gtk
+gnumeric
+abiword
 
 # package tool
 synaptic
 apt-xapian-index
 
+# audio
+# xterm is needed by lxpanel to use alsamixer
+#if DISTRIBUTION squeeze
+alsa-utils
+xterm
+#endif
+
+#nif DISTRIBUTION squeeze
+#include <wheezy-pulseaudio>
+#endif
+
 # multimedia
 gecko-mediaplayer
+me-tv
+exaile
+#gstreamer0.10-fluendo-mp3
+gstreamer0.10-plugins-ugly
+gstreamer0.10-ffmpeg
+vlc
+#nif DISTRIBUTION squeeze
+vlc-plugin-pulse
+#endif
 
 # skype
 pidgin-skype
@@ -49,5 +90,28 @@ skype
 
 # other hardware
 modemmanager
+mobile-broadband-provider-info
 blueman
+xfburn
+eject
+
+# 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-master b/config/lists/kanotix-lxde-master
index 5354a02..346734d 100644
--- a/config/lists/kanotix-lxde-master
+++ b/config/lists/kanotix-lxde-master
@@ -4,14 +4,14 @@
 #include <office>
 
 # email
-icedove-l10n-de
+#icedove-l10n-de
 
 # irc
-xchat
+#xchat
 
 # multimedia
-exaile
-xfburn
+#exaile
+#xfburn
 
 # graphics
 gimp
-- 
cgit v1.0