Merging casper 1.166.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index b3a58a9..9056345 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,28 @@
+casper (1.166) jaunty; urgency=low
+
+  [ Emmet Hikory ]
+  * Show the ubiquity icon in kourou (LP: #338730)
+
+  [ Timo Jyrinki ]
+  * Move examples.desktop to Desktop/ if it exists, as an alternative to
+    Examples (LP: #45489).
+
+  [ Luke Yelavich ]
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Make the special case disabling of pulseaudio per user, and not system
+      wide.
+    - Also disable PulseAudio for the Braille profile.
+    - Fix incorrect paths when chowning files.
+    - Don't use /root for the ubiquity hook accessibility script, /target is
+      where the installed system is located.
+    - Remove laptop detect code. Its not currently working, and getting it to
+      work requires invasive changes.
+    - Only set pulseaudio settings and create the .orca directory if sed
+      packages are installed on the live filesystem and installed system.
+  * ubiquity-hooks/30accessibility: Copy orca settings to the installed system.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Fri, 27 Mar 2009 14:38:20 +1100
+
 casper (1.165) jaunty; urgency=low
 
   * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index bdb972c..c7adad2 100755 (executable)
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -117,6 +117,11 @@ then
        mv /root/home/${USERNAME}/Examples /root/home/${USERNAME}/Desktop/
 fi
 
+if [ -f /root/home/$USERNAME/examples.desktop ]; then
+    chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/
+    mv /root/home/$USERNAME/examples.desktop /root/home/$USERNAME/Desktop/
+fi
+
 if [ -e /root/usr/share/applications/live-installer-launcher.desktop ]
 then
        chroot /root install -D -o ${USERNAME} -g ${USERNAME} /usr/share/applications/live-installer-launcher.desktop /home/${USERNAME}/Desktop/live-installer-launcher.desktop

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index ba9c23d..3c51fa0 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -47,19 +47,6 @@ gct ()
        fi
 }
 
-laptop_detect ()
-{
-       if [ -x /root/usr/bin/orca ]
-       then
-               if chroot /root /usr/sbin/laptop-detect
-               then
-                       mkdir -p /root/home/$USERNAME/.orca
-                       echo "orca.settings.orcaModifierKeys = orca.settings.LAPTOP_MODIFIER_KEYS" >> /root/home/$USERNAME/.orca/user-settings.py
-                       echo "orca.settings.keyboardLayout = orca.settings.GENERAL_KEYBOARD_LAYOUT_LAPTOP" >> /root/home/$USERNAME/.orca/user-settings.py
-               fi
-       fi
-}
-
 remove_applet ()
 {
        # Code to remove an applet from the default panel setup
@@ -110,7 +97,6 @@ case ${ACCESS} in
                        echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/user-settings.py
-                       laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi
                ;;
@@ -127,11 +113,19 @@ case ${ACCESS} in
                sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
                remove_applet fast_user_switch
-               laptop_detect
-               touch /root/etc/pulse/a11y_nostart
-               sed -i -e 's/autospawn = yes/autospawn = no/g' /root/etc/pulse/client.conf
-               mkdir -p /root/home/$USERNAME/.orca
-               chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.orca
+               if [ -x /root/usr/bin/pulse-session ]
+               then
+                       touch /root/home/$USERNAME/.pulse_a11y_nostart
+                       chroot /root chown $USERNAME.$USERNAME /home/$USERNAME/.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
+               fi
+               if [ -x /root/usr/bin/orca ]
+               then
+                       mkdir -p /root/home/$USERNAME/.orca
+                       chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.orca
+               fi
                ;;
 
        braille=ask)
@@ -153,6 +147,15 @@ case ${ACCESS} in
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
                fi
 
+               if [ -x /root/usr/bin/pulse-session ]
+               then
+                       touch /root/home/$USERNAME/.pulse_a11y_nostart
+                       chroot /root chown $USERNAME.$USERNAME /home/$USERNAME/.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
+               fi
+
                remove_applet fast_user_switch
                ;;