From f2ac76aedcba41e749082a2fb77eec4175e7a6e9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 9 Mar 2008 21:27:25 +0100
Subject: [PATCH 1/1] Merging casper 1.119.

---
 docs/ChangeLog.casper               | 16 ++++++++++++++++
 scripts/live-bottom/14locales       |  5 ++---
 scripts/live-bottom/30accessibility |  2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 88245c9..da4cef2 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,19 @@
+casper (1.119) hardy; urgency=low
+
+  [ Luke Yelavich ]
+  * scripts/casper-bottom/30accessibility &
+    ubiquity-hooks/30accessibility:
+    - Disable compiz for screen reader and braille terminal accessibility
+      profiles. It is currently not possible to get feedback about open
+      windows when cycling through them using ALT + Tab with Compiz.
+  * ubiquity-hooks/30accessibility: Add braille terminal profile.
+
+  [ Colin Watson ]
+  * Always set language in both /etc/default/locale and /etc/environment
+    (thanks, Sebastien Bacher).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 03 Mar 2008 10:21:42 +0000
+
 casper (1.118) hardy; urgency=low
 
   [ Julian Andres Klode, Colin Watson ]
diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index 3cb58dd..db26f0b 100755
--- a/scripts/live-bottom/14locales
+++ b/scripts/live-bottom/14locales
@@ -44,8 +44,6 @@ if [ -n "${grep_file}" ]
 then
 	# use rootfs configured locale
 	locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
-else
-	grep_file=/root/etc/default/locale
 fi
 
 if [ -n "${LOCALE}" ]
@@ -102,7 +100,8 @@ EOF
 
 	really_export LANG
 
-	printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
+	printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale
+	printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment
 	printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
 	chroot /root /usr/sbin/locale-gen
 fi
diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index eaf3a50..6b61db1 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -79,6 +79,7 @@ case ${ACCESS} in
 		gct -s -t bool /desktop/gnome/interface/accessibility true
 		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
 		gct -s -t bool /apps/gksu/disable-grab true
+		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 		;;
 
 	braille=ask)
@@ -86,6 +87,7 @@ case ${ACCESS} in
 		gct -s -t bool /desktop/gnome/interface/accessibility true
 		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
 		gct -s -t bool /apps/gksu/disable-grab true
+		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
 		if type orca > /dev/null 2>&1
 		then
-- 
2.1.4