From a59c2dd88a38c7b4c97c188c0f93d502d24b1d37 Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Tue, 1 Mar 2011 15:23:46 +0100 Subject: applied changes from Kano --- auto/config | 14 ++++--- config/chroot_local-hooks/02-skype | 5 +-- config/lists/acritox | 1 - config/lists/base | 9 ++++- config/lists/base.amd64 | 3 +- config/lists/firmware | 15 +------- config/lists/kde | 6 +++ config/lists/office | 75 +++++++++++++++++++++++++++++++------- 8 files changed, 90 insertions(+), 38 deletions(-) diff --git a/auto/config b/auto/config index 8e0bbdd..c8da5ec 100755 --- a/auto/config +++ b/auto/config @@ -22,7 +22,7 @@ lb config noauto \ --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 wine-ppa" \ + --repositories "live.debian.net acritox excalibur hellfire lo wine-ppa" \ --security true \ --checksums md5 \ --bootloader syslinux \ @@ -49,13 +49,17 @@ lb config noauto \ case $LB_ARCHITECTURE in "amd64") lb config noauto \ - --linux-flavours amd64 \ - --linux-packages "linux-image-2.6 linux-headers-2.6" + --linux-flavours generic \ + --linux-packages "linux-image linux-headers" + #--linux-flavours amd64 \ + #--linux-packages "linux-image-2.6 linux-headers-2.6" ;; "i386") lb config noauto \ - --linux-flavours 686-bigmem \ - --linux-packages "linux-image-2.6 linux-headers-2.6" + --linux-flavours generic \ + --linux-packages "linux-image linux-headers" + #--linux-flavours 686-bigmem \ + #--linux-packages "linux-image-2.6 linux-headers-2.6" ;; esac diff --git a/config/chroot_local-hooks/02-skype b/config/chroot_local-hooks/02-skype index 1ce5ee9..1477593 100755 --- a/config/chroot_local-hooks/02-skype +++ b/config/chroot_local-hooks/02-skype @@ -1,6 +1,5 @@ #!/bin/sh 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 + sed -i 's|\(Exec\)=.*|\1=XLIB_SKIP_ARGB_VISUALS=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=XLIB_SKIP_ARGB_VISUALS=1 LD_PRELOAD=/usr/lib32/libv4l/v4l1compat.so skype|' /usr/share/applications/skype.desktop || true fi diff --git a/config/lists/acritox b/config/lists/acritox index 7e9c994..c73f296 100644 --- a/config/lists/acritox +++ b/config/lists/acritox @@ -16,7 +16,6 @@ r-bioc-biostrings # system curlftpfs -smbfs beep # hardware diff --git a/config/lists/base b/config/lists/base index 6fa3cc3..f1569e6 100644 --- a/config/lists/base +++ b/config/lists/base @@ -60,6 +60,7 @@ zip unp # tools +bc mc most less @@ -86,6 +87,7 @@ alsa-oss smartmontools user-setup whois +zsync # themes gtk2-engines @@ -94,8 +96,10 @@ gtk2-engines pcmciautils openssh-client sshfs +smbfs pppoeconf nfs-common +ncpfs bluez-audio ethtool vpnc @@ -128,6 +132,7 @@ pbuilder # system cpufrequtils +hddtemp acpi acpid xdg-utils @@ -143,7 +148,8 @@ libgl1-mesa-dri dd-rhelp testdisk gpart -partitionmanager +gparted +gksu # filesystems ntfs-3g @@ -165,6 +171,7 @@ hfsplus hfsutils jfsutils xfsprogs +btrfs-tools # firmware ndiswrapper-utils-1.9 diff --git a/config/lists/base.amd64 b/config/lists/base.amd64 index 30b5c74..f8fb947 100644 --- a/config/lists/base.amd64 +++ b/config/lists/base.amd64 @@ -1,3 +1,2 @@ # packages for 64bit systems -lib32v4l-0 - +lib32v4l-0 diff --git a/config/lists/firmware b/config/lists/firmware index b14a864..74795fa 100644 --- a/config/lists/firmware +++ b/config/lists/firmware @@ -1,13 +1,2 @@ -firmware-atheros -firmware-bnx2 -firmware-bnx2x -firmware-intelwimax -firmware-ipw2x00 -firmware-ivtv -firmware-iwlwifi -firmware-linux -firmware-linux-free -firmware-linux-nonfree -firmware-qlogic -firmware-ralink -firmware-realtek +linux-firmware +linux-firmware-nonfree diff --git a/config/lists/kde b/config/lists/kde index 48e643e..0f25793 100644 --- a/config/lists/kde +++ b/config/lists/kde @@ -34,6 +34,8 @@ ksnapshot kcalc kuser gdebi-kde +update-notifier-kde +kvkbd # kde kdebase @@ -51,6 +53,10 @@ kde-config-gtk-style # network network-manager-kde +# updates +update-manager-core +update-notifier-kde + # other hardware kde-config-touchpad kde-config-tablet diff --git a/config/lists/office b/config/lists/office index e380c77..7d458a1 100644 --- a/config/lists/office +++ b/config/lists/office @@ -1,13 +1,62 @@ -# openoffice -openoffice.org-calc -openoffice.org-common -openoffice.org-core -openoffice.org-draw -openoffice.org-impress -openoffice.org-java-common -openoffice.org-kde -openoffice.org-math -openoffice.org-writer -openoffice.org-l10n-de -openoffice.org-thesaurus-de -myspell-de-de \ No newline at end of file +# Libre Office +libobasis3.3-base +libobasis3.3-binfilter +libobasis3.3-calc +libobasis3.3-core01 +libobasis3.3-core02 +libobasis3.3-core03 +libobasis3.3-core04 +libobasis3.3-core05 +libobasis3.3-core06 +libobasis3.3-core07 +libobasis3.3-de +libobasis3.3-de-base +libobasis3.3-de-binfilter +libobasis3.3-de-calc +libobasis3.3-de-help +libobasis3.3-de-math +libobasis3.3-de-res +libobasis3.3-de-writer +libobasis3.3-draw +libobasis3.3-en-us +libobasis3.3-en-us-base +libobasis3.3-en-us-binfilter +libobasis3.3-en-us-calc +libobasis3.3-en-us-math +libobasis3.3-en-us-res +libobasis3.3-en-us-writer +libobasis3.3-extension-mediawiki-publisher +libobasis3.3-extension-nlpsolver +libobasis3.3-extension-pdf-import +libobasis3.3-extension-presentation-minimizer +libobasis3.3-extension-presenter-screen +libobasis3.3-extension-report-builder +libobasis3.3-gnome-integration +libobasis3.3-graphicfilter +libobasis3.3-images +libobasis3.3-impress +libobasis3.3-javafilter +libobasis3.3-kde-integration +libobasis3.3-math +libobasis3.3-ogltrans +libobasis3.3-ooofonts +libobasis3.3-ooolinguistic +libobasis3.3-pyuno +libobasis3.3-testtool +libobasis3.3-writer +libobasis3.3-xsltfilter +libreoffice3 +libreoffice3-base +libreoffice3-calc +libreoffice3-de +libreoffice3-dict-de-de +libreoffice3-dict-en +libreoffice3-dict-es +libreoffice3-dict-fr +libreoffice3-draw +libreoffice3-en-us +libreoffice3-impress +libreoffice3-math +libreoffice3-ure +libreoffice3-writer +libreoffice-debian-menus -- cgit v1.0