reorganized packageslists; added trinity

10 files changed, 117 insertions, 15 deletions

diff --git a/config/lists/base b/config/lists/base
index 6589486..bd554cf 100644
--- a/config/lists/base
+++ b/config/lists/base
@@ -11,8 +11,7 @@
 #include <firmware>
 #include <standard-x11>
 
-#include <kanotix-base>
-#include <kanotix-extra>
+#include <base.kanotix>
 
 # bootloader
 #if BOOTLOADER burg
@@ -187,7 +186,6 @@ libv4l-0
 # other hardware
 bluez
 bluez-compat
-bluedevil
 pm-utils
 vbetool
 radeontool
diff --git a/config/lists/kanotix-base b/config/lists/base.kanotix
index 36f3d25..68af90b 100644
--- a/config/lists/kanotix-base
+++ b/config/lists/base.kanotix
@@ -1,18 +1,18 @@
 # kanotix base
 etcskel-kanotix
 user-profile-kanotix
-kanotix-plasma-script
-badge-icon-kanotix
 
-kdm-theme-kanotix-starrise
-kmenu-icon-kanotix
-ksplash-theme-kanotix-starrise
+kanotix-starrise-base
 plymouth-theme-kanotix-logo
 
-kanotix-menu
-
 acritoxinstaller-kanotix
+kanotix-menu
+kanotix-scripts
+kanotix-toolkit
+kanotix-irc
+infobash
 
+# bootloader
 #if BOOTLOADER burg
 burg-themes
 #endif
diff --git a/config/lists/kanotix-extra b/config/lists/kanotix-extra
deleted file mode 100644
index fc800e5..0000000
--- a/config/lists/kanotix-extra
+++ /dev/null
@@ -1,5 +0,0 @@
-# kanotix extra
-kanotix-scripts
-kanotix-toolkit
-kanotix-irc
-infobash
diff --git a/config/lists/kanotix-lite b/config/lists/kanotix-lite
index 733f6c6..5e4eb0b 100644
--- a/config/lists/kanotix-lite
+++ b/config/lists/kanotix-lite
@@ -2,3 +2,5 @@
 
 #include <base>
 #include <kde> 
+#include <kde.kanotix>
+
diff --git a/config/lists/kanotix-master b/config/lists/kanotix-master
index c0e0588..665817f 100644
--- a/config/lists/kanotix-master
+++ b/config/lists/kanotix-master
@@ -2,6 +2,7 @@
 
 #include <base>
 #include <kde>
+#include <kde.kanotix>
 #include <office>
 
 # email
diff --git a/config/lists/kanotix-trinity b/config/lists/kanotix-trinity
new file mode 100644
index 0000000..f9b5742
--- /dev/null
+++ b/config/lists/kanotix-trinity
@@ -0,0 +1,25 @@
+# Kanotix Trinity
+
+#include <base>
+#include <trinity>
+#include <office>
+
+# base
+etcskel-kanotix-trinity
+
+# email
+icedove-l10n-de
+
+# package tool
+synaptic
+
+# multimedia
+amarok-trinity
+gecko-mediaplayer
+
+# trinity
+khelpcenter-trinity
+
+# wine
+wine1.3
+wine1.3-gecko
diff --git a/config/lists/kde b/config/lists/kde
index 0f25793..db38a2b 100644
--- a/config/lists/kde
+++ b/config/lists/kde
@@ -61,3 +61,4 @@ update-notifier-kde
 kde-config-touchpad
 kde-config-tablet
 system-config-printer-kde 
+bluedevil
diff --git a/config/lists/kde.kanotix b/config/lists/kde.kanotix
new file mode 100644
index 0000000..c6a933d
--- /dev/null
+++ b/config/lists/kde.kanotix
@@ -0,0 +1,6 @@
+# Kanotix KDE
+kanotix-plasma-script
+badge-icon-kanotix
+kdm-theme-kanotix-starrise
+kmenu-icon-kanotix
+ksplash-theme-kanotix-starrise
diff --git a/config/lists/minimal b/config/lists/minimal
new file mode 100644
index 0000000..6f08aa9
--- /dev/null
+++ b/config/lists/minimal
@@ -0,0 +1,9 @@
+eject file user-setup sudo-trinity
+
+#if MODE ubuntu
+gnupg
+#endif
+
+#if DISTRIBUTION wheezy
+live-config
+#endif
diff --git a/config/lists/trinity b/config/lists/trinity
new file mode 100644
index 0000000..d1a3468
--- /dev/null
+++ b/config/lists/trinity
@@ -0,0 +1,65 @@
+# Kanotix additional packages list for trinity
+
+# trinity base
+desktop-base-trinity
+
+# office
+kpdf-trinity
+
+# plugins
+konqueror-nsplugins-trinity
+
+# multimedia
+kaffeine-trinity
+libsdl1.2debian-alsa
+kdemultimedia-kio-plugins-trinity
+kamera-trinity
+
+# burn
+k3b-trinity
+#k3b-i18n
+libk3b3-extracodecs-trinity
+
+# chat, irc
+konversation-trinity
+
+# graphics
+gwenview-trinity
+
+# editors
+kate-trinity
+
+# archive
+ark-trinity
+
+# tools
+ksnapshot-trinity
+kcalc-trinity
+kuser-trinity
+#gdebi-kde
+kvkbd-trinity
+
+# kde
+kdebase-trinity
+kdm-trinity
+kde-i18n-de-trinity
+kwalletmanager-trinity
+kmix-trinity
+
+# kde plasma
+#plasma-widgets-addons
+
+# themes
+kde-config-gtk-style
+
+# network
+network-manager-kde-trinity
+
+# updates
+update-manager-core
+update-notifier-kde
+
+# other hardware
+#kde-config-touchpad
+#kde-config-tablet
+#system-config-printer-kde