From de36f9d18a40d4fabf45cfd290f76f8f8c6fc555 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 18 Apr 2010 18:44:59 +0200 Subject: [PATCH] Adding upstream version 1.77+debian. --- bin/casper-preseed | 6 ++++-- scripts/casper-bottom/19keyboard | 29 +++++++++++++++++++------ scripts/casper-bottom/30accessibility | 22 +++++++++---------- scripts/casper-bottom/32disable_hibernation | 3 ++- scripts/casper-bottom/35fix_language_selector | 4 ++++ ubiquity-hooks/30accessibility | 31 ++++++++++++++++----------- 6 files changed, 63 insertions(+), 32 deletions(-) diff --git a/bin/casper-preseed b/bin/casper-preseed index 6967fe2..c0c76eb 100755 --- a/bin/casper-preseed +++ b/bin/casper-preseed @@ -5,12 +5,14 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin root="$1" question="$2" value="$3" +seen="$4" +[ "$seen" ] || seen=true -if ! (echo "SET $question $value"; echo "FSET $question seen true") | chroot "$1" debconf-communicate -fnoninteractive casper >/dev/null; then +if ! (echo "SET $question $value"; echo "FSET $question seen $seen") | chroot "$1" debconf-communicate -fnoninteractive casper >/dev/null; then chroot "$1" debconf-communicate -fnoninteractive casper >/dev/null </dev/null) || gconf_version="" +gconf_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gconf2 2>/dev/null) || gconf_version="" gct() { if [ "$gconf_version" ]; then @@ -45,8 +45,8 @@ for x in $(cat /proc/cmdline); do gct -s -t string /apps/metacity/general/theme Atlanta gct -s -t string /desktop/gnome/background/picture_filename "" gct -s -t string /desktop/gnome/background/picture_options none - gct "-s -t string /desktop/gnome/background/primary_color \#666666" - gct "-s -t string /desktop/gnome/background/secondary_color \#7F7F7F" + gct -s -t string /desktop/gnome/background/primary_color \#666666 + gct -s -t string /desktop/gnome/background/secondary_color \#7F7F7F gct -s -t string /desktop/gnome/background/color_shading_type solid gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48 gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass @@ -56,9 +56,9 @@ for x in $(cat /proc/cmdline); do # Moderate Visual Impairment access=v2) gct -s -t bool /desktop/gnome/interface/accessibility true - gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [gnopernicus] - gct -s -t bool /apps/gnopernicus/srcore/mag_active true - gct -s -t bool /apps/gnopernicus/srcore/sp_active false + gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca] + #gct -s -t bool /apps/gnopernicus/srcore/mag_active true + #gct -s -t bool /apps/gnopernicus/srcore/sp_active false kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/ ;; @@ -66,9 +66,9 @@ for x in $(cat /proc/cmdline); do access=v3) gct -s -t bool /desktop/gnome/sound/enable_esd false gct -s -t bool /desktop/gnome/interface/accessibility true - gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [gnopernicus] - gct -s -t bool /apps/gnopernicus/srcore/sp_active true - gct -s -t bool /apps/gnopernicus/srcore/mag_active false + gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca] + #gct -s -t bool /apps/gnopernicus/srcore/sp_active true + #gct -s -t bool /apps/gnopernicus/srcore/mag_active false ;; # Minor Motor Difficulties access=m1) @@ -86,11 +86,11 @@ for x in $(cat /proc/cmdline); do # Motor Difficulties - pointing devices access=m2) gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true + gct -s -t bool /desktop/gnome/interface/accessibility true gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false - gct -s -t bool /desktop/gnome/interface/accessibility true - gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats gok + gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard] kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/ ;; diff --git a/scripts/casper-bottom/32disable_hibernation b/scripts/casper-bottom/32disable_hibernation index 47344fa..e27e2c4 100755 --- a/scripts/casper-bottom/32disable_hibernation +++ b/scripts/casper-bottom/32disable_hibernation @@ -23,8 +23,9 @@ log_begin_msg "$DESCRIPTION" gpm_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-power-manager 2>/dev/null) || panel_version="" if [ -n "$gpm_version" ]; then - casper-reconfigure /root gnome-power-manager +# casper-reconfigure /root gnome-power-manager chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/can_hibernate false + chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/can_suspend false fi if [ -f /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kcmlaptoprc ]; then diff --git a/scripts/casper-bottom/35fix_language_selector b/scripts/casper-bottom/35fix_language_selector index 96a1d6c..3a22602 100755 --- a/scripts/casper-bottom/35fix_language_selector +++ b/scripts/casper-bottom/35fix_language_selector @@ -25,4 +25,8 @@ if [ -e /root/usr/share/applications/language-selector.desktop ]; then fi +if [ -x /root/usr/bin/fontconfig-voodoo ]; then + chroot /root fontconfig-voodoo --auto --quiet || true +fi + log_end_msg diff --git a/ubiquity-hooks/30accessibility b/ubiquity-hooks/30accessibility index 967c30c..80daccd 100755 --- a/ubiquity-hooks/30accessibility +++ b/ubiquity-hooks/30accessibility @@ -11,6 +11,12 @@ gct() { chroot /target sudo -u "$USERNAME" gconftool-2 "$@" } +kderc_addtoprefixes() { + if [ -e "/root/etc/kderc" ]; then + sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kderc + fi +} + for x in $(cat /proc/cmdline); do case $x in # Lesser Visual Impairment @@ -27,23 +33,24 @@ for x in $(cat /proc/cmdline); do gct -s -t string /desktop/gnome/background/color_shading_type solid gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48 gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass - sed -i s.prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/.prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/,/usr/share/kubuntu-default-settings/kde-profile/lesser-visual-imparement/. /etc/kderc + kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/ ;; # Moderate Visual Impairment access=v2) gct -s -t bool /desktop/gnome/interface/accessibility true - gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [gnopernicus] - gct -s -t bool /apps/gnopernicus/srcore/mag_active true - gct -s -t bool /apps/gnopernicus/srcore/sp_active false - sed -i s.prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/.prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/,/usr/share/kubuntu-default-settings/kde-profile/lesser-visual-imparement/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-imparement/. /etc/kderc + gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca] + #gct -s -t bool /apps/gnopernicus/srcore/mag_active true + #gct -s -t bool /apps/gnopernicus/srcore/sp_active false + kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/ + ;; # Blindness access=v3) gct -s -t bool /desktop/gnome/sound/enable_esd false gct -s -t bool /desktop/gnome/interface/accessibility true - gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [gnopernicus] - gct -s -t bool /apps/gnopernicus/srcore/sp_active true - gct -s -t bool /apps/gnopernicus/srcore/mag_active false + gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca] + #gct -s -t bool /apps/gnopernicus/srcore/sp_active true + #gct -s -t bool /apps/gnopernicus/srcore/mag_active false ;; # Minor Motor Difficulties access=m1) @@ -55,17 +62,17 @@ for x in $(cat /proc/cmdline); do gct -s -t bool /desktop/gnome/peripherals/keyboard/repeat true gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700 gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10 - sed -i s.prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/.prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/,/usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/. /etc/kderc + kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/ ;; # Motor Difficulties - pointing devices access=m2) gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true + gct -s -t bool /desktop/gnome/interface/accessibility true gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false - gct -s -t bool /desktop/gnome/interface/accessibility true - gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats gok - sed -i s.prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/.prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/,/usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/. /etc/kderc + gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard] + kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/ ;; esac done -- 2.1.4