CVS:oo-debian-files/bin openoffice,1.27,1.28
Update of /cvs/debian-openoffice/oo-debian-files/bin
In directory gluck:/tmp/cvs-serv1506/bin
Modified Files:
openoffice
Log Message:
merge OPENOFFICE_ORG_1_1_2 back to HEAD
Index: openoffice
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/bin/openoffice,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- openoffice 28 Apr 2004 20:59:45 -0000 1.27
+++ openoffice 10 Jul 2004 14:38:12 -0000 1.28
@@ -22,7 +22,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# this string should be exactly as in ~/.sversionrc
-OOVERSION="OpenOffice.org 1.1.1"
+OOVERSION="OpenOffice.org 1.1.2"
VER=
##
@@ -225,10 +225,6 @@
# 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/@.*//'`
Reply to: