summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-02-26 12:34:11 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:31:06 +0100
commitcafc3175ce0d72a3f78160194d293be85f7c1d56 (patch)
tree292f02924f9e129e7173f4875fcf0d2ebbb0e537
parentb9bc3ab4738fae21ea7eeb25a6504b3d6429564e (diff)
downloadlive-boot-cafc3175ce0d72a3f78160194d293be85f7c1d56.tar.gz
live-boot-cafc3175ce0d72a3f78160194d293be85f7c1d56.zip
Merging casper 1.116.
-rw-r--r--docs/ChangeLog.casper9
-rwxr-xr-xscripts/live-bottom/30accessibility12
2 files changed, 17 insertions, 4 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 66cd12d..b440737 100644
--- 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
--- 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
;;