applied changes from Kano

17 files changed, 58 insertions, 74 deletions

diff --git a/config/binary_syslinux/splash.png b/config/binary_syslinux/splash.png
index 96f6127..c89dd8e 100644
--- a/config/binary_syslinux/splash.png
+++ b/config/binary_syslinux/splash.png
diff --git a/config/chroot_local-hooks/02-skype b/config/chroot_local-hooks/02-skype
index 6f46433..1ce5ee9 100755
--- a/config/chroot_local-hooks/02-skype
+++ b/config/chroot_local-hooks/02-skype
@@ -2,4 +2,5 @@
 if [ -f /usr/share/applications/skype.desktop ]; then
 sed -i 's|\(Exec\)=.*|\1=LD_PRELOAD=/usr/lib/libv4l/v4l1compat.so skype|' /usr/share/applications/skype.desktop || true
 [ -r /usr/lib32/libv4l/v4l1compat.so ] && sed -i 's|\(Exec\)=.*|\1=LD_PRELOAD=/usr/lib32/libv4l/v4l1compat.so skype|' /usr/share/applications/skype.desktop || true
+[ -r /usr/lib32/libpulse.so.0.8.0 ] && chmod a-r /usr/lib32/libpulse.so.0.8.0
 fi
diff --git a/config/chroot_local-hooks/03-distro b/config/chroot_local-hooks/03-distro
index ef7ff98..7ccb5d9 100755
--- a/config/chroot_local-hooks/03-distro
+++ b/config/chroot_local-hooks/03-distro
@@ -1,12 +1,18 @@
 #!/bin/sh
 sed -i 's/^\(FLL_DISTRO_MODE=\).*/\1"live"/' /etc/default/distro||true
+
 rsync -Ha --ignore-existing /usr/share/kanotix/profile/ /etc/skel/
-sed -i 's|^\(exclude=media/cdrom_unmounted\).*|\1,media/hdd_unmounted|' /etc/skel/.kde/share/config/kdesktoprc||true
-rm -f /etc/skel/.kde4/share/config/kxkbrc
+#sed -i 's|^\(exclude=media/cdrom_unmounted\).*|\1,media/hdd_unmounted|' /etc/skel/.kde/share/config/kdesktoprc||true
+#rm -f /etc/skel/.kde4/share/config/kxkbrc
 #rm -f /etc/skel/.kde/share/config/kdeglobals.tmp
 #mv /etc/skel/.kde/share/config/kdeglobals /etc/skel/.kde/share/config/kdeglobals.tmp
 #sed -ne '/\[Locale\]/ { n; :c; /^\[/! { n; b c; }; }; p;' /etc/skel/.kde/share/config/kdeglobals.tmp > /etc/skel/.kde/share/config/kdeglobals
 #rm -f /etc/skel/.kde/share/config/kdeglobals.tmp
+
+perl -pi -e 's/^(GRUB_DISTRIBUTOR)=.*/\1=`[ "\$\(uname -m\)" = "x86_64" ] && echo Kanotix64 || echo Kanotix`/' /etc/default/grub
+perl -pi -e 's/.*(GRUB_DISABLE_LINUX_RECOVERY)=.*/\1="true"/' /etc/default/grub
+perl -pi -e 's/^(GRUB_CMDLINE_LINUX_DEFAULT)=.*/\1="quiet"/' /etc/default/grub
+
 rm -f /etc/skel/Desktop/kanotix-irc.desktop.tmp
 if [ -f /etc/skel/Desktop/kanotix-irc.desktop ]; then
  echo '#!/usr/bin/env xdg-open' > /etc/skel/Desktop/kanotix-irc.desktop.tmp
diff --git a/config/chroot_local-preseed/user-setup.cfg b/config/chroot_local-preseed/user-setup.cfg
index b9029fb..67f62c0 100644
--- a/config/chroot_local-preseed/user-setup.cfg
+++ b/config/chroot_local-preseed/user-setup.cfg
@@ -1 +1 @@
-user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse dialout
+user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse dialout lp
diff --git a/config/lists/acritox b/config/lists/acritox
index ceff1d3..7e9c994 100644
--- a/config/lists/acritox
+++ b/config/lists/acritox
@@ -44,7 +44,7 @@ pdftk
 pdfjam
 psutils
 imagemagick
-cups-pdf
+cupspdf
 
 # graphics
 inkscape
@@ -65,5 +65,4 @@ gtk-recordmydesktop
 mplayerthumbs
 kdeplasma-addons
 google-gadgets-qt
-plasma-scriptengine-googlegadgets
-
+plasma-scriptengine-googlegadgets 
diff --git a/config/lists/base b/config/lists/base
index 1f4cff2..6fa3cc3 100644
--- a/config/lists/base
+++ b/config/lists/base
@@ -11,8 +11,8 @@
 #include <firmware>
 #include <standard-x11>
 
-# office
-myspell-de-de
+#include <kanotix-base>
+#include <kanotix-extra>
 
 # java, plugins
 sun-java6-plugin
@@ -27,17 +27,15 @@ dvdauthor
 normalize-audio
 dvd+rw-tools
 
-# browser, email
+# browser
 iceweasel-l10n-de
-icedove-l10n-de
 
 # chat, irc
 pidgin
 gstreamer0.10-plugins-base
 gstreamer0.10-plugins-good
 gstreamer0.10-alsa
-weechat
-kanotix-irc
+weechat 
 
 # skype
 skype
@@ -88,11 +86,6 @@ alsa-oss
 smartmontools
 user-setup
 whois
-infobash
-
-# tools (GUI)
-synaptic
-screentube
 
 # themes
 gtk2-engines
@@ -119,7 +112,7 @@ foomatic-filters-ppds
 foomatic-db-gutenprint
 cups-driver-gutenprint
 foo2zjs
-printconf
+#printconf
 hplip-gui
 
 # build
@@ -133,13 +126,6 @@ dkms
 devscripts
 pbuilder
 
-# kanotix
-user-profile-kanotix
-#kanotix-graphics
-grub2-splashimage-kanotix-penguins
-kanotix-scripts
-kanotix-toolkit
-
 # system
 cpufrequtils
 acpi
@@ -150,10 +136,6 @@ console-setup
 # xorg
 xserver-xorg-video-all
 xserver-xorg-input-all
-xserver-xorg-input-wacom
-xserver-xorg-video-radeonhd
-xserver-xorg-video-openchrome
-xserver-xorg-video-geode
 mesa-utils
 libgl1-mesa-dri
 
@@ -171,6 +153,7 @@ dmraid
 kpartx
 dosfstools
 lvm2
+hfsprogs
 
 # filesystem tools
 parted
@@ -191,12 +174,7 @@ libv4l-0
 bluez
 bluez-compat
 bluedevil
-kppp
-ndiswrapper-utils-1.9
 pm-utils
 vbetool
 radeontool
-modemmanager
-umtsmon
-wacom-tools
-
+modemmanager 
diff --git a/config/lists/branding b/config/lists/branding
deleted file mode 100644
index 98a1f4e..0000000
--- a/config/lists/branding
+++ /dev/null
@@ -1,7 +0,0 @@
-# branding
-kanotix-starrise-base
-kdm-theme-kanotix-starrise
-ksplash-theme-kanotix-starrise
-plymouth-theme-kanotix-logo
-grub2-splashimage-kanotix
-
diff --git a/config/lists/kanotix-base b/config/lists/kanotix-base
new file mode 100644
index 0000000..a8b215d
--- /dev/null
+++ b/config/lists/kanotix-base
@@ -0,0 +1,14 @@
+# kanotix base
+etcskel-kanotix
+user-profile-kanotix
+kanotix-plasma-script
+
+grub2-splashimage-kanotix-logo
+kdm-theme-kanotix-starrise
+kmenu-icon-kanotix
+ksplash-theme-kanotix-starrise
+plymouth-theme-kanotix-logo
+
+kanotix-menu
+
+acritoxinstaller-kanotix
diff --git a/config/lists/kanotix-extra b/config/lists/kanotix-extra
new file mode 100644
index 0000000..fc800e5
--- /dev/null
+++ b/config/lists/kanotix-extra
@@ -0,0 +1,5 @@
+# kanotix extra
+kanotix-scripts
+kanotix-toolkit
+kanotix-irc
+infobash
diff --git a/config/lists/kanotix-full b/config/lists/kanotix-full
index 86e1e60..939959e 100644
--- a/config/lists/kanotix-full
+++ b/config/lists/kanotix-full
@@ -1,12 +1,4 @@
 # Kanotix Full
 
 #include <kanotix-master>
-#include <acritox>
-
-# multimedia
-amarok
-smplayer
-
-# kde
-khelpcenter4
-
+#include <acritox>
\ No newline at end of file
diff --git a/config/lists/kanotix-lite b/config/lists/kanotix-lite
index 22f7bef..733f6c6 100644
--- a/config/lists/kanotix-lite
+++ b/config/lists/kanotix-lite
@@ -1,5 +1,4 @@
 # Kanotix Lite
 
 #include <base>
-#include <kde>
-
+#include <kde> 
diff --git a/config/lists/kanotix-master b/config/lists/kanotix-master
index d7bbb98..c0e0588 100644
--- a/config/lists/kanotix-master
+++ b/config/lists/kanotix-master
@@ -4,20 +4,19 @@
 #include <kde>
 #include <office>
 
+# email
+icedove-l10n-de
+
+# package tool
+synaptic
+
 # multimedia
+amarok
 gecko-mediaplayer
-tunapie
-audacious
-streamripper
+
+# kde
+khelpcenter4
 
 # wine
 wine1.3
 wine1.3-gecko
-
-# plymouth
-plymouth
-plymouth-themes-solar
-
-# plasma widgets addons
-plasma-widgets-addons
-
diff --git a/config/lists/kde b/config/lists/kde
index e170fe0..48e643e 100644
--- a/config/lists/kde
+++ b/config/lists/kde
@@ -42,20 +42,16 @@ kde-i18n-de
 kwalletmanager
 kmix
 
+# kde plasma
+plasma-widgets-addons
+
 # themes
 kde-config-gtk-style
 
 # network
 network-manager-kde
 
-# kanotix
-kanotix-menu
-etcskel-kanotix
-#kanotix-graphics
-acritoxinstaller-kanotix
-
 # other hardware
 kde-config-touchpad
 kde-config-tablet
-system-config-printer-kde
-
+system-config-printer-kde 
diff --git a/config/lists/office b/config/lists/office
index e998500..e380c77 100644
--- a/config/lists/office
+++ b/config/lists/office
@@ -10,3 +10,4 @@ openoffice.org-math
 openoffice.org-writer
 openoffice.org-l10n-de
 openoffice.org-thesaurus-de
+myspell-de-de
\ No newline at end of file
diff --git a/config/repositories/wine-ppa b/config/repositories/wine-ppa
new file mode 100644
index 0000000..81dd0ad
--- /dev/null
+++ b/config/repositories/wine-ppa
@@ -0,0 +1,3 @@
+# PPA for Wine
+deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu lucid main
+deb-src http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu lucid main
diff --git a/config/repositories/wine13.gpg b/config/repositories/wine-ppa.gpg
index 033032b..033032b 100644
--- a/config/repositories/wine13.gpg
+++ b/config/repositories/wine-ppa.gpg
diff --git a/config/repositories/wine13 b/config/repositories/wine13
deleted file mode 100644
index 00c3b82..0000000
--- a/config/repositories/wine13
+++ /dev/null
@@ -1,2 +0,0 @@
-# Wine 1.3
-deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu lucid main