CVS:oo-debian-files/bin openoffice,1.21,1.22
Update of /cvs/debian-openoffice/oo-debian-files/bin
In directory gluck:/tmp/cvs-serv20358/bin
Modified Files:
openoffice
Log Message:
* Override LC_CTYPE with LANG to work around OOo's inability to
have a separate UI language and locale (closes:#208733)
Index: openoffice
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/bin/openoffice,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- openoffice 8 Oct 2003 10:25:18 -0000 1.21
+++ openoffice 8 Oct 2003 16:22:18 -0000 1.22
@@ -175,6 +175,10 @@
# Set locale to en_US if locale is C
if [ "x$LOCALE" = "xC" ] ; then LOCALE="en_US"; fi
+# LC_CTYPE is taken in preference to LANG. OOo doesn't understand
+# two values, so clobber LC_CTYPE instead
+LC_CTYPE="$LOCALE"
+
# Change _ to - and remove part after '@' character
LOCALEOO=`echo $LOCALE | sed 's/_/-/;s/@.*//'`
@@ -270,6 +274,8 @@
exec "/usr/lib/openoffice/program/soffice" "$@"
## Changelog
+# 2003/10/08 halls
+# * Override LC_CTYPE with LANG to workaround limitation of OOo locales
# 2003/08/15 halls
# * Move the destination of the softlinks if created by 1.1 packaging
# * Call /usr/lib/openoffice/program/soffice directly instead of via the link
Reply to: