From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 May 2010 10:13:54 +0000 (+0200)
Subject: Merging casper 1.204.
X-Git-Tag: debian/2.0.15-1~161
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=fd68eaed79f1cc8f9713f64f2b3963359c4513ae;p=live-boot-grml.git

Merging casper 1.204.
---

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index ffedac1..829e223 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,12 @@
+casper (1.204) karmic; urgency=low
+
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - .pulse_a11y_nostart -> pulse_a11y_nostart due to being in a system
+      directory, to completely match the change in pulseaudio, which I missed
+      earlier.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Wed, 14 Oct 2009 08:29:07 +1100
+
 casper (1.203) karmic; urgency=low
 
   * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 7681aef..4624077 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -117,8 +117,8 @@ case ${ACCESS} in
 		if [ -x /root/usr/bin/pulse-session ]
 		then
 			mkdir -p /root/var/lib/pulseaudio
-			touch /root/var/lib/pulseaudio/.pulse_a11y_nostart
-			chroot /root chown root.root /var/lib/pulseaudio/.pulse_a11y_nostart
+			touch /root/var/lib/pulseaudio/pulse_a11y_nostart
+			chroot /root chown root.root /var/lib/pulseaudio/pulse_a11y_nostart
 			mkdir -p /root/home/$USERNAME/.pulse
 			echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf
 			chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse
@@ -152,8 +152,8 @@ case ${ACCESS} in
 		if [ -x /root/usr/bin/pulse-session ]
 		then
 			mkdir -p /root/var/lib/pulseaudio
-			touch /root/var/lib/pulseaudio/.pulse_a11y_nostart
-			chroot /root chown root.root /var/lib/pulseaudio/.pulse_a11y_nostart
+			touch /root/var/lib/pulseaudio/pulse_a11y_nostart
+			chroot /root chown root.root /var/lib/pulseaudio/pulse_a11y_nostart
 			mkdir -p /root/home/$USERNAME/.pulse
 			echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf
 			chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse