Ubuntu
casper package

Merge lp:~arky/ubuntu/maverick/casper/fixes-621561 into lp:ubuntu/natty/casper

  1. Maverick (10.10)
  2. fixes-621561
  3. Merge into natty
Proposed by Colin Watson
Status: Merged
Merged at revision: 842
Proposed branch: lp:~arky/ubuntu/maverick/casper/fixes-621561
Merge into: lp:ubuntu/natty/casper
Diff against target: 106 lines (+13/-2)
2 files modified
scripts/casper-bottom/30accessibility (+7/-2)
ubiquity-hooks/30accessibility (+6/-0)
To merge this branch: bzr merge lp:~arky/ubuntu/maverick/casper/fixes-621561
Reviewer Review Type Date Requested Status
Colin Watson Approve
Luke Yelavich Pending
Ubuntu Development Team Pending
Review via email: mp+42098@code.launchpad.net

This proposal supersedes a proposal from 2010-08-21.

Description of the change

Fixes bug 621561

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote : Posted in a previous version of this proposal

Thanks for your patch! I've resubmitted your merge against the natty branch, since this probably doesn't qualify for a stable release update but should be fine for merging into the development release.

Revision history for this message
Colin Watson (cjwatson) wrote :

Thanks! This looks sensible. I've adjusted trivial whitespace details and added a debian/changelog entry, but otherwise will merge this directly.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/casper-bottom/30accessibility'
2--- scripts/casper-bottom/30accessibility 2010-09-15 23:37:41 +0000
3+++ scripts/casper-bottom/30accessibility 2010-11-29 12:26:49 +0000
4@@ -76,6 +76,7 @@
5 gct -s -t string /desktop/gnome/background/color_shading_type solid
6 gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
7 gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
8+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
9
10 kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
11 if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]; then
12@@ -96,6 +97,7 @@
13 fi
14 gct -s -t bool /apps/gksu/disable-grab true
15 gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
16+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
17 add_sudoers_file
18 kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
19 ;;
20@@ -106,7 +108,8 @@
21 gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
22 gct -s -t bool /desktop/gnome/applications/at/visual/startup true
23 gct -s -t string /desktop/gnome/applications/at/visual/exec orca
24- gct -s -t string /apps/empathy/conversation/theme classic
25+ gct -s -t string /apps/empathy/conversation/theme classic
26+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
27 remove_applet fast_user_switch
28 add_sudoers_file
29 if [ -x /root/usr/bin/orca ]; then
30@@ -119,6 +122,7 @@
31 gct -s -t bool /desktop/gnome/interface/accessibility true
32 gct -s -t bool /desktop/gnome/applications/at/visual/startup true
33 gct -s -t string /desktop/gnome/applications/at/visual/exec orca
34+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
35 if [ -x /root/usr/bin/orca ]; then
36 mkdir -p /root/home/$USERNAME/.local/share/orca
37 echo "import orca.settings" >> /root/home/$USERNAME/.local/share/orca/user-settings.py
38@@ -143,6 +147,7 @@
39 gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
40 gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
41 gct -s -t bool /apps/gksu/disable-grab true
42+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
43 kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
44 if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
45 sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
46@@ -157,7 +162,7 @@
47 gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
48 gct -s -t bool /desktop/gnome/applications/at/mobility/startup true
49 gct -s -t string /desktop/gnome/applications/at/mobility/exec onboard
50-
51+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
52 kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
53 if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
54 sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
55
56=== modified file 'ubiquity-hooks/30accessibility'
57--- ubiquity-hooks/30accessibility 2010-10-05 11:20:33 +0000
58+++ ubiquity-hooks/30accessibility 2010-11-29 12:26:49 +0000
59@@ -64,6 +64,7 @@
60 gct -s -t string /desktop/gnome/background/color_shading_type solid
61 gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
62 gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
63+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
64 kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
65 if [ -d /target/usr/share/xubuntu-default-settings/accessibility ]; then
66 cp -a /target/usr/share/xubuntu-default-settings/accessibility/* /target/etc/xdg/
67@@ -76,6 +77,7 @@
68 gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
69 gct -s -t bool /desktop/gnome/applications/at/visual/startup true
70 gct -s -t string /desktop/gnome/applications/at/visual/exec orca
71+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
72
73 if [ -d /usr/share/xubuntu-default-settings ]; then
74 apt-install gnome-orca gnome-mag
75@@ -110,6 +112,7 @@
76 gct_gdm -s -t bool /desktop/gnome/applications/at/visual/startup true
77 gct_gdm -s -t string /desktop/gnome/applications/at/visual/exec orca
78 gct_gdm -s -t bool /desktop/gnome/applications/at/screen_reader_enabled true
79+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
80 remove_applet fast_user_switch
81 add_sudoers_file
82 if [ -x /target/usr/bin/orca ]; then
83@@ -161,6 +164,7 @@
84 gct_gdm -s -t bool /desktop/gnome/applications/at/visual/startup true
85 gct_gdm -s -t string /desktop/gnome/applications/at/visual/exec orca
86 gct_gdm -s -t bool /desktop/gnome/applications/at/screen_reader_enabled true
87+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
88 remove_applet fast_user_switch
89 add_sudoers_file
90 ;;
91@@ -174,6 +178,7 @@
92 gct -s -t bool /desktop/gnome/peripherals/keyboard/repeat true
93 gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
94 gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
95+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
96 gct -s -t bool /apps/gksu/disable-grab true
97 kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
98 if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
99@@ -189,6 +194,7 @@
100 gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
101 gct -s -t bool /desktop/gnome/applications/at/mobility/startup true
102 gct -s -t string /desktop/gnome/applications/at/mobility/exec onboard
103+ gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
104 kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
105 if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
106 sed -i '/Sticky/ s/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml

Subscribers

People subscribed via source and target branches

to all changes: