Update of /cvs/debian-openoffice/oo-debian-files/bin
In directory gluck:/tmp/cvs-serv8066/bin
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
oooprelink openoffice
Log Message:
merge 1.1.2-4+1 and -5+1
Index: openoffice
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/bin/openoffice,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -u -d -r1.29.2.1 -r1.29.2.2
--- openoffice 12 Aug 2004 13:20:20 -0000 1.29.2.1
+++ openoffice 14 Oct 2004 20:32:59 -0000 1.29.2.2
@@ -6,6 +6,7 @@
# (C) Martin 'empty' Quinson, 2002.
# Modifications by Chris Halls
# Modifications by Lucien Saviot
+# Modifications by Rene Engelhard
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -303,7 +304,7 @@
else
## Change locale of OOo
LD_LIBRARY_PATH="/usr/lib/openoffice/program/:$LD_LIBRARY_PATH" \
- /usr/lib/openoffice/program/setofficelang.bin "$LOCALEOO"
+ /usr/lib/openoffice/program/setofficelang.bin -f "$LOCALEOO"
fi
##
@@ -314,6 +315,10 @@
exec "/usr/lib/openoffice/program/soffice" "$@"
## Changelog
+# 2004/10/14 rene
+# * run setofficelang.bin with -
+# 2004/08/12 rene
+# * Version 1.1.3
# 2004/07/20 rene
# * use setofficelang.bin instead of importing locale config with
# ooconfigimport
Index: oooprelink
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/bin/oooprelink,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -u -d -r1.11 -r1.11.4.1
--- oooprelink 16 Apr 2004 21:50:12 -0000 1.11
+++ oooprelink 14 Oct 2004 20:32:59 -0000 1.11.4.1
@@ -15,7 +15,7 @@
echo "-----------------------------------------------"
echo "How this script can be called:"
echo "oooprelink -- determines whether to do prelinking"
- echo " from /etc/openoffice/openoffice.conf"
+ echo " from /etc/openoffice/settings.debconf"
echo "oooprelink -u|--unprelink -- force unprelinking"
echo "oooprelink -f|--force -- force prelinking"
echo "oooprelink -h|--help -- show this help"
