From 845dee811a0159b75422eb7e4cfb6c860d39690b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 18 Apr 2010 20:41:49 +0200 Subject: [PATCH] Adding upstream version 1.119.1. --- docs/ChangeLog.casper | 16 ++++++++++++++++ scripts/live | 5 ----- scripts/live-bottom/14locales | 5 ++--- scripts/live-bottom/23networking | 31 ++++++++++++++++-------------- scripts/live-bottom/30accessibility | 2 ++ scripts/live-bottom/34disable_kwallet | 36 ----------------------------------- scripts/live-bottom/99hook | 6 +++++- 7 files changed, 42 insertions(+), 59 deletions(-) delete mode 100755 scripts/live-bottom/34disable_kwallet diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 88245c9..da4cef2 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,19 @@ +casper (1.119) hardy; urgency=low + + [ Luke Yelavich ] + * scripts/casper-bottom/30accessibility & + ubiquity-hooks/30accessibility: + - Disable compiz for screen reader and braille terminal accessibility + profiles. It is currently not possible to get feedback about open + windows when cycling through them using ALT + Tab with Compiz. + * ubiquity-hooks/30accessibility: Add braille terminal profile. + + [ Colin Watson ] + * Always set language in both /etc/default/locale and /etc/environment + (thanks, Sebastien Bacher). + + -- Colin Watson Mon, 03 Mar 2008 10:21:42 +0000 + casper (1.118) hardy; urgency=low [ Julian Andres Klode, Colin Watson ] diff --git a/scripts/live b/scripts/live index 0ed7675..6494234 100755 --- a/scripts/live +++ b/scripts/live @@ -234,11 +234,6 @@ Arguments () export NOKPERSONALIZER ;; - nokwallet) - NOKWALLET="Yes" - export NOKWALLET - ;; - nolanguageselector) NOLANGUAGESELECTOR="Yes" export NOLANGUAGESELECTOR diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales index 3cb58dd..db26f0b 100755 --- a/scripts/live-bottom/14locales +++ b/scripts/live-bottom/14locales @@ -44,8 +44,6 @@ if [ -n "${grep_file}" ] then # use rootfs configured locale locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' ) -else - grep_file=/root/etc/default/locale fi if [ -n "${LOCALE}" ] @@ -102,7 +100,8 @@ EOF really_export LANG - printf 'LANG=%s\n' "${LANG}" > "${grep_file}" + printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale + printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen chroot /root /usr/sbin/locale-gen fi diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking index 603116f..6c726c6 100755 --- a/scripts/live-bottom/23networking +++ b/scripts/live-bottom/23networking @@ -98,22 +98,24 @@ EOF done fi - if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ] + if [ ! -f /root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf)" ] then - # create a resolv.conf if it is not present - cp /netboot.config /root/var/log/netboot.config + if [ -f /netboot.config ] + then + # create a resolv.conf if it is not present or empty + cp /netboot.config /root/var/log/netboot.config - rc_search=$(cat netboot.config | awk '/domain/{print $3}') - rc_server0=$(cat netboot.config | awk '/dns0/{print $5}') - rc_server1=$(cat netboot.config | awk '/dns0/{print $8}') - rc_server0="nameserver ${rc_server0}" + rc_search=$(cat netboot.config | awk '/domain/{print $3}') + rc_server0=$(cat netboot.config | awk '/dns0/{print $5}') + rc_server1=$(cat netboot.config | awk '/dns0/{print $8}') + rc_server0="nameserver ${rc_server0}" - if [ "${rc_server1}" = "0.0.0.0" ] - then - rc_server1="" - else - rc_server1="nameserver ${rc_server1}" - fi + if [ "${rc_server1}" = "0.0.0.0" ] + then + rc_server1="" + else + rc_server1="nameserver ${rc_server1}" + fi cat > /root/etc/resolv.conf << EOF # /etc/resolv.conf @@ -124,7 +126,8 @@ ${rc_server0} ${rc_server1} EOF - cat /root/etc/resolv.conf >> /root/var/log/netboot.config + cat /root/etc/resolv.conf >> /root/var/log/netboot.config + fi fi fi diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility index eaf3a50..6b61db1 100755 --- a/scripts/live-bottom/30accessibility +++ b/scripts/live-bottom/30accessibility @@ -79,6 +79,7 @@ case ${ACCESS} in gct -s -t bool /desktop/gnome/interface/accessibility true gct -s -t bool /desktop/gnome/applications/at/visual/startup true gct -s -t bool /apps/gksu/disable-grab true + gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity ;; braille=ask) @@ -86,6 +87,7 @@ case ${ACCESS} in gct -s -t bool /desktop/gnome/interface/accessibility true gct -s -t bool /desktop/gnome/applications/at/visual/startup true gct -s -t bool /apps/gksu/disable-grab true + gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity if type orca > /dev/null 2>&1 then diff --git a/scripts/live-bottom/34disable_kwallet b/scripts/live-bottom/34disable_kwallet deleted file mode 100755 index 79c895a..0000000 --- a/scripts/live-bottom/34disable_kwallet +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -#set -e - -# initramfs-tools header - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -# live-initramfs header - -if [ -n "${NOKWALLET}" ] -then - exit 0 -fi - -. /scripts/live-functions - -log_begin_msg "Disabling kwallet..." - -# live-initramfs script - -rm -f /root/usr/share/services/kded/kwalletd.desktop - -log_end_msg diff --git a/scripts/live-bottom/99hook b/scripts/live-bottom/99hook index 0341026..dd027ab 100755 --- a/scripts/live-bottom/99hook +++ b/scripts/live-bottom/99hook @@ -34,6 +34,10 @@ log_begin_msg "Executing custom hook script..." cd /root wget "${HOOK}" -./$(basename ${HOOK}) +FILE="$(basename ${HOOK})" + +chmod 0755 "${FILE}" +./"${FILE}" +rm -f "${FILE}" log_end_msg -- 2.1.4