From c2215b0188cef393bdb0909d1f43cb3ed783685f Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Mon, 13 Dec 2010 11:05:06 +0100 Subject: applied changes from Kano --- auto/clean | 3 +-- auto/config | 7 +++--- auto/kanotix | 1 - config/binary_syslinux/splash.png | Bin 175123 -> 164834 bytes config/chroot_local-hooks/02-skype | 1 + config/chroot_local-hooks/03-distro | 10 ++++++-- config/chroot_local-preseed/user-setup.cfg | 2 +- config/lists/acritox | 5 ++-- config/lists/base | 36 ++++++----------------------- config/lists/branding | 7 ------ config/lists/kanotix-base | 14 +++++++++++ config/lists/kanotix-extra | 5 ++++ config/lists/kanotix-full | 10 +------- config/lists/kanotix-lite | 3 +-- config/lists/kanotix-master | 21 ++++++++--------- config/lists/kde | 12 ++++------ config/lists/office | 1 + config/repositories/wine-ppa | 3 +++ config/repositories/wine-ppa.gpg | 12 ++++++++++ config/repositories/wine13 | 2 -- config/repositories/wine13.gpg | 12 ---------- 21 files changed, 74 insertions(+), 93 deletions(-) delete mode 100644 config/lists/branding create mode 100644 config/lists/kanotix-base create mode 100644 config/lists/kanotix-extra create mode 100644 config/repositories/wine-ppa create mode 100644 config/repositories/wine-ppa.gpg delete mode 100644 config/repositories/wine13 delete mode 100644 config/repositories/wine13.gpg diff --git a/auto/clean b/auto/clean index dfd7de9..9f7f66f 100755 --- a/auto/clean +++ b/auto/clean @@ -56,5 +56,4 @@ do shift done -exit 1 - +exit 1 diff --git a/auto/config b/auto/config index 10a58c7..8e0bbdd 100755 --- a/auto/config +++ b/auto/config @@ -17,12 +17,12 @@ lb config noauto \ --iso-publisher kanotix.com \ --chroot-filesystem squashfs \ --debian-installer false \ - --apt aptitude \ + --apt apt \ --apt-recommends false \ - --bootappend-live 'splash utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys' \ + --bootappend-live 'utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys splash' \ --distribution squeeze \ --archive-areas "main contrib non-free" \ - --repositories "live.debian.net acritox excalibur hellfire" \ + --repositories "live.debian.net acritox excalibur hellfire wine-ppa" \ --security true \ --checksums md5 \ --bootloader syslinux \ @@ -65,4 +65,3 @@ grep -oe '^[^ #]*' scripts.urls | wget -i- -N -q -P config/chroot_local-includes chmod 755 config/chroot_local-includes/usr/local/bin/*.sh exit 1 - diff --git a/auto/kanotix b/auto/kanotix index c99757b..32ebbb5 100755 --- a/auto/kanotix +++ b/auto/kanotix @@ -73,4 +73,3 @@ done set -- "${args[@]}" write_kanotix_config - diff --git a/config/binary_syslinux/splash.png b/config/binary_syslinux/splash.png index 96f6127..c89dd8e 100644 Binary files a/config/binary_syslinux/splash.png and b/config/binary_syslinux/splash.png differ 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 #include -# office -myspell-de-de +#include +#include # 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 -#include - -# multimedia -amarok -smplayer - -# kde -khelpcenter4 - +#include \ 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 -#include - +#include 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 #include +# 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/wine-ppa.gpg b/config/repositories/wine-ppa.gpg new file mode 100644 index 0000000..033032b --- /dev/null +++ b/config/repositories/wine-ppa.gpg @@ -0,0 +1,12 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.0.10 + +mI0ESXVzlQEEAN1BxiR961SiFrJ7tacrAImCmDdxs4OSifgpBAp8q0fe0iLcSeAoWdS7H+7Y +4T+/2t3XEw7+3cD831WBu8c/Pv0ldx5TyDyOQmEtUBlMqy33WdKVxscirnag8ShrNM9PtG/v +AQU/JtfQl68dXfD3BsCtrXVrjqcO2AxNYBSvd9hpABEBAAG0IkxhdW5jaHBhZCBQUEEgZm9y +IFVidW50dSBXaW5lIFRlYW2ItgQTAQIAIAUCSXVzlQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4B +AheAAAoJEFqaBq75y42wflcD/jLMihWMzRCO60S/a7SqD0QNqV/nAYEOsma/Y2C/uhQ44j0n +p+iOB6+PDRbyJ8GVgIjpaIbtl4sReXcf7bS9Dhhn5Gbe/n6VQr7xoMr1Io0PrXdmWpmsOfCu +ebWU4bV1w+YBvHFFqTu5QF2Y0Fj9bRxQdQ1M2HcnXOiLq82hKlb+ +=Z9DY +-----END PGP PUBLIC KEY BLOCK----- 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 diff --git a/config/repositories/wine13.gpg b/config/repositories/wine13.gpg deleted file mode 100644 index 033032b..0000000 --- a/config/repositories/wine13.gpg +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.0.10 - -mI0ESXVzlQEEAN1BxiR961SiFrJ7tacrAImCmDdxs4OSifgpBAp8q0fe0iLcSeAoWdS7H+7Y -4T+/2t3XEw7+3cD831WBu8c/Pv0ldx5TyDyOQmEtUBlMqy33WdKVxscirnag8ShrNM9PtG/v -AQU/JtfQl68dXfD3BsCtrXVrjqcO2AxNYBSvd9hpABEBAAG0IkxhdW5jaHBhZCBQUEEgZm9y -IFVidW50dSBXaW5lIFRlYW2ItgQTAQIAIAUCSXVzlQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4B -AheAAAoJEFqaBq75y42wflcD/jLMihWMzRCO60S/a7SqD0QNqV/nAYEOsma/Y2C/uhQ44j0n -p+iOB6+PDRbyJ8GVgIjpaIbtl4sReXcf7bS9Dhhn5Gbe/n6VQr7xoMr1Io0PrXdmWpmsOfCu -ebWU4bV1w+YBvHFFqTu5QF2Y0Fj9bRxQdQ1M2HcnXOiLq82hKlb+ -=Z9DY ------END PGP PUBLIC KEY BLOCK----- -- cgit v1.0