Merging casper 1.116.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 66cd12d..b440737 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,12 @@
+casper (1.116) hardy; urgency=low
+
+  * Fix setting orca options in 30accessibility.
+  * Remove gdm and kdm from init when using automatic-ubiquity and
+    only-ubiquity.  The ubiquity initscript will take care of spawning
+    these.
+
+ -- Evan Dandrea <evand@ubuntu.com>  Mon, 11 Feb 2008 12:19:39 -0500
+
 casper (1.115) hardy; urgency=low
 
   * Add the user to the groups specified by user-setup-udeb.

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 9c20265..314496d 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -64,9 +64,11 @@ case ${ACCESS} in
                gct -s -t bool /desktop/gnome/applications/at/visual/startup true
                gct -s -t bool /apps/gksu/disable-grab true
 
-               if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]
+               if type orca > /dev/null 2>&1
                then
-                       sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py
+                       mkdir -p /root/home/${USERNAME}/.orca
+                       echo "orca.settings.enableSpeech = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
+                       echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
                fi
                ;;
 
@@ -85,9 +87,11 @@ case ${ACCESS} in
                gct -s -t bool /desktop/gnome/applications/at/visual/startup true
                gct -s -t bool /apps/gksu/disable-grab true
 
-               if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]
+               if type orca > /dev/null 2>&1
                then
-                       sed -i '/^enableSpeech\W/ s/True/False/;/^enableBraille/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py
+                       mkdir -p /root/home/${USERNAME}/.orca
+                       echo "orca.settings.enableSpeech = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
+                       echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
                fi
                ;;