From 24f1b4f4142699534a3d26e8c24effc75b2158f5 Mon Sep 17 00:00:00 2001 From: Holger Paradies <retabell@gmx.de> Date: Sun, 15 Sep 2013 15:16:51 +0200 Subject: enable lxde-full on amd64 add openvpn --- config/lists/kanotix-lxde-base | 11 +++++++---- config/lists/kanotix-lxde-full | 10 +++++----- config/lists/kanotix-lxde-master | 13 +++++++++---- config/lists/kanotix-lxde-min | 11 +++++++---- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/config/lists/kanotix-lxde-base b/config/lists/kanotix-lxde-base index 9eaf2f0..ff4a0d3 100644 --- a/config/lists/kanotix-lxde-base +++ b/config/lists/kanotix-lxde-base @@ -27,9 +27,15 @@ menu-xdg lxtask zenity lxpolkit -network-manager-gnome desktop-base +# network +network-manager-gnome +modemmanager +mobile-broadband-provider-info +gnome-keyring +network-manager-openvpn + #if DISTRIBUTION squeeze gdm #endif @@ -53,9 +59,6 @@ xterm #endif # other hardware -modemmanager -mobile-broadband-provider-info -gnome-keyring # irc xchat diff --git a/config/lists/kanotix-lxde-full b/config/lists/kanotix-lxde-full index ee71e92..63ba0fb 100644 --- a/config/lists/kanotix-lxde-full +++ b/config/lists/kanotix-lxde-full @@ -1,10 +1,12 @@ # Kanotix with LXDE (full) -# not used yet - -#include <kanotix-lxde-master> +# enhandeced List only for amd64 used +# office #include <office> +# multimedia +me-tv + # graphics gimp gimp-gutenprint @@ -14,8 +16,6 @@ sane-utils sane # network -openvpn -network-manager-openvpn # email icedove-l10n-de diff --git a/config/lists/kanotix-lxde-master b/config/lists/kanotix-lxde-master index 2ec32c5..3bf34ea 100644 --- a/config/lists/kanotix-lxde-master +++ b/config/lists/kanotix-lxde-master @@ -1,6 +1,11 @@ # Kanotix with LXDE (Master CD-Version) #include <kanotix-lxde-base> + +#if ARCHITECTURE amd64 +#include <kanotix-lxde-full> +#endif + #include <compiz-gtk> compton @@ -8,9 +13,6 @@ compton evince-gtk simple-scan geany -#if ARCHITECTURE amd64 -#include <office> -#endif # package tool synaptic @@ -37,6 +39,10 @@ w-scan # email +#if ARCHITECTURE i386 +sylpheed-i18n +#endif + # grafik qtqr simple-scan @@ -64,6 +70,5 @@ fonts-droid # isofiller xpad guvcview -sylpheed-i18n gst123 xskat diff --git a/config/lists/kanotix-lxde-min b/config/lists/kanotix-lxde-min index 13572ca..dba4261 100644 --- a/config/lists/kanotix-lxde-min +++ b/config/lists/kanotix-lxde-min @@ -31,16 +31,21 @@ kanotix-lxde-extra # LXDE lxde lxappearance-obconf - gvfs-backends menu menu-xdg lxtask zenity lxpolkit -network-manager-gnome desktop-base +# network +network-manager-gnome +modemmanager +mobile-broadband-provider-info +gnome-keyring +network-manager-openvpn + #if DISTRIBUTION squeeze gdm #endif @@ -64,8 +69,6 @@ xterm #endif # other hardware -modemmanager -mobile-broadband-provider-info # irc xchat -- cgit v1.0