From 457078f273cf9045a6b4feda3a58e489372a26a5 Mon Sep 17 00:00:00 2001 From: Andreas Loibl <andreas@andreas-loibl.de> Date: Tue, 29 May 2012 17:24:11 +0200 Subject: restructured packageslists for Kanotix 2012-05 releases --- config/lists/base | 1 + config/lists/desktop | 8 ------ config/lists/dragonfire | 2 -- config/lists/kanotix-full | 4 --- config/lists/kanotix-kde-base | 20 +++++++++++++++ config/lists/kanotix-kde-full | 4 +++ config/lists/kanotix-kde-master | 49 +++++++++++++++++++++++++++++++++++++ config/lists/kanotix-lite | 8 ------ config/lists/kanotix-master | 46 +--------------------------------- config/lists/kanotix-trinity | 32 ------------------------ config/lists/kanotix-trinity-base | 8 ++++++ config/lists/kanotix-trinity-master | 28 +++++++++++++++++++++ config/lists/kde | 10 -------- 13 files changed, 111 insertions(+), 109 deletions(-) delete mode 100644 config/lists/dragonfire delete mode 100644 config/lists/kanotix-full create mode 100644 config/lists/kanotix-kde-base create mode 100644 config/lists/kanotix-kde-full create mode 100644 config/lists/kanotix-kde-master delete mode 100644 config/lists/kanotix-lite delete mode 100644 config/lists/kanotix-trinity create mode 100644 config/lists/kanotix-trinity-base create mode 100644 config/lists/kanotix-trinity-master diff --git a/config/lists/base b/config/lists/base index 8c6acb4..d982dbf 100644 --- a/config/lists/base +++ b/config/lists/base @@ -163,6 +163,7 @@ btrfs-tools # firmware ndiswrapper-utils-1.9 +ndiswrapper-dkms libv4l-0 # other hardware diff --git a/config/lists/desktop b/config/lists/desktop index 2c67a55..7b2a9cc 100644 --- a/config/lists/desktop +++ b/config/lists/desktop @@ -20,14 +20,6 @@ gstreamer0.10-plugins-base gstreamer0.10-plugins-good gstreamer0.10-alsa -# graphics -gimp -gimp-gutenprint -xsane -libsane-extras -sane-utils -sane - # tools joystick diff --git a/config/lists/dragonfire b/config/lists/dragonfire deleted file mode 100644 index c8c002d..0000000 --- a/config/lists/dragonfire +++ /dev/null @@ -1,2 +0,0 @@ -# extra packages for Kanotix Dragonfire -ndiswrapper-dkms diff --git a/config/lists/kanotix-full b/config/lists/kanotix-full deleted file mode 100644 index 939959e..0000000 --- a/config/lists/kanotix-full +++ /dev/null @@ -1,4 +0,0 @@ -# Kanotix Full - -#include <kanotix-master> -#include <acritox> \ No newline at end of file diff --git a/config/lists/kanotix-kde-base b/config/lists/kanotix-kde-base new file mode 100644 index 0000000..a732a50 --- /dev/null +++ b/config/lists/kanotix-kde-base @@ -0,0 +1,20 @@ +# Kanotix with KDE (minimal) + +#include <base> +#include <kde> +#include <kde.kanotix> + +# package tool +synaptic +apt-xapian-index + +# multimedia +gecko-mediaplayer + +# skype +skype +pidgin-skype + +# other hardware +modemmanager + diff --git a/config/lists/kanotix-kde-full b/config/lists/kanotix-kde-full new file mode 100644 index 0000000..9270987 --- /dev/null +++ b/config/lists/kanotix-kde-full @@ -0,0 +1,4 @@ +# Kanotix with KDE and additional packages (Full) + +#include <kanotix-kde-master> +#include <acritox> diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master new file mode 100644 index 0000000..d41b033 --- /dev/null +++ b/config/lists/kanotix-kde-master @@ -0,0 +1,49 @@ +# Kanotix with KDE (Master) + +#include <kanotix-kde-base> +#include <office> + +# email +icedove-l10n-de + +# multimedia +amarok +kaffeine + +# graphics +gimp +gimp-gutenprint +xsane +libsane-extras +sane-utils +sane +gwenview + +# network +openvpn +network-manager-openvpn + +# kde +khelpcenter4 + +# tools +kuser + +# updates +update-manager-core +update-notifier-kde + +# wine +wine1.3 +wine1.3-gecko +winetricks + +# games +armagetronad +foobillard +neverball +neverputt +kmahjongg + +# benchmark +gl2benchmark diff --git a/config/lists/kanotix-lite b/config/lists/kanotix-lite deleted file mode 100644 index cfc8c17..0000000 --- a/config/lists/kanotix-lite +++ /dev/null @@ -1,8 +0,0 @@ -# Kanotix Lite - -#include <base> -#include <trinity> - -# base -etcskel-kanotix-trinity - diff --git a/config/lists/kanotix-master b/config/lists/kanotix-master index 371ab69..ee1bc35 100644 --- a/config/lists/kanotix-master +++ b/config/lists/kanotix-master @@ -1,46 +1,2 @@ -# Kanotix +#include <kanotix-kde-master> -#include <base> -#include <kde> -#include <kde.kanotix> -#include <office> - -# email -icedove-l10n-de - -# package tool -synaptic -apt-xapian-index - -# multimedia -amarok -gecko-mediaplayer - -# skype -skype -pidgin-skype - -# network -openvpn -network-manager-openvpn - -# kde -khelpcenter4 - -# wine -wine1.3 -wine1.3-gecko -winetricks - -# other hardware -modemmanager - -# games -armagetronad -foobillard -neverball -neverputt -kmahjongg - -# benchmark -gl2benchmark diff --git a/config/lists/kanotix-trinity b/config/lists/kanotix-trinity deleted file mode 100644 index 57e8c86..0000000 --- a/config/lists/kanotix-trinity +++ /dev/null @@ -1,32 +0,0 @@ -# Kanotix Trinity - -#include <base> -#include <trinity> -#include <office> - -# base -etcskel-kanotix-trinity - -# email -icedove-l10n-de - -# package tool -synaptic - -# multimedia -amarok-trinity -gecko-mediaplayer - -# skype -skype -pidgin-skype - -# trinity -khelpcenter-trinity - -# wine -wine1.3 -wine1.3-gecko - -# other hardware -modemmanager diff --git a/config/lists/kanotix-trinity-base b/config/lists/kanotix-trinity-base new file mode 100644 index 0000000..8343c5f --- /dev/null +++ b/config/lists/kanotix-trinity-base @@ -0,0 +1,8 @@ +# Kanotix with Trinity (base) + +#include <base> +#include <trinity> + +# base +etcskel-kanotix-trinity + diff --git a/config/lists/kanotix-trinity-master b/config/lists/kanotix-trinity-master new file mode 100644 index 0000000..723727c --- /dev/null +++ b/config/lists/kanotix-trinity-master @@ -0,0 +1,28 @@ +# Kanotix with Trinity (Master) + +#include <kanotix-trinity-base> +#include <office> + +# email +icedove-l10n-de + +# package tool +synaptic + +# multimedia +amarok-trinity +gecko-mediaplayer + +# skype +skype +pidgin-skype + +# trinity +khelpcenter-trinity + +# wine +wine1.3 +wine1.3-gecko + +# other hardware +modemmanager diff --git a/config/lists/kde b/config/lists/kde index f09ba38..3ad3297 100644 --- a/config/lists/kde +++ b/config/lists/kde @@ -11,7 +11,6 @@ okularplugin konqueror-nsplugins # multimedia -kaffeine libsdl1.2debian kdemultimedia-kio-plugins kamera @@ -24,9 +23,6 @@ libk3b6-extracodecs # chat, irc konversation -# graphics -gwenview - # editors kate @@ -36,9 +32,7 @@ ark # tools ksnapshot kcalc -kuser gdebi-kde -update-notifier-kde kvkbd # kde @@ -61,10 +55,6 @@ gnome-icon-theme # network network-manager-kde -# updates -update-manager-core -update-notifier-kde - # other hardware kde-config-touchpad kde-config-tablet -- cgit v1.0