------------------------------------------------------------
revno: 1824
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Mon 2010-02-22 15:31:35 +0100
message:
backport fix from i109407
added:
patches/i109407-fix-duplicate-spanish-translation-of-formulas.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-02-22 12:46:06 +0000
+++ b/changelog 2010-02-22 14:31:35 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.2.0-2) UNRELEASED; urgency=low
+openoffice.org (1:3.2.0-2) experimental; urgency=low
* ooo-build:
- update (3.2.0.6)
@@ -13,8 +13,10 @@
* debian/patches/work-around-HelpLinker-miscompile-with-gcc-4.3.diff: work
around HelpLinker miscompile with gcc 4.3 by using O0, thanks
Phillip Matthias Hahn (see #555026)
+ * debian/patches/i109407-fix-duplicate-spanish-translation-of-formulas.diff:
+ add patch from issue 109407
- -- Rene Engelhard <r...@debian.org> Sun, 21 Feb 2010 12:45:17 +0100
+ -- Rene Engelhard <r...@debian.org> Mon, 22 Feb 2010 15:20:49 +0100
openoffice.org (1:3.2.0-1) experimental; urgency=low
=== added file
'patches/i109407-fix-duplicate-spanish-translation-of-formulas.diff'
--- a/patches/i109407-fix-duplicate-spanish-translation-of-formulas.diff
1970-01-01 00:00:00 +0000
+++ b/patches/i109407-fix-duplicate-spanish-translation-of-formulas.diff
2010-02-22 14:31:35 +0000
@@ -0,0 +1,41 @@
+Description: Remove duplicate function name of formulas in ES translation
+Author: Eike Rathke <e...@openoffice.org>
+Origin: upstream,
http://www.openoffice.org/nonav/issues/showattachment.cgi/67975/i109407_BUSCAR.diff
+Bug: http://qa.openoffice.org/issues/show_bug.cgi?id=109407
+Forwarded: not-needed
+Last-Update: 2010-02-22
+
+--- /dev/null
++++ openoffice.org-3.2.0/ooo-build-3-2-0-6/patches/dev300/i109407_BUSCAR.diff
+@@ -0,0 +1,20 @@
++--- OOO320/ooo.m12/l10n/source/es/localize.sdf 2009-12-14
15:38:04.000000000 +0100
+++++ localize.sdf 2010-02-22 11:55:19.000000000 +0100
++@@ -3232,7 +3232,7 @@
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_EXP_DIST 0
es DISTR.EXP 2002-02-02 02:02:02
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_FACT 0 es
FACT 2002-02-02 02:02:02
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_FALSE 0 es
FALSO 2002-02-02 02:02:02
++-formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_FIND 0 es
BUSCAR 2002-02-02 02:02:02
+++formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_FIND 0 es
ENCONTRAR 2002-02-02 02:02:02
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_FISHER 0
es FISHER 2002-02-02 02:02:02
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_FISHER_INV 0
es PRUEBA.FISHER.INV 2002-02-02 02:02:02
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_FIXED 0 es
FIJO 2002-02-02 02:02:02
++@@ -3374,7 +3374,7 @@
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_ROWS 0 es
FILAS 2002-02-02 02:02:02
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_RSQ 0 es
COEFICIENTE.R2 2002-02-02 02:02:02
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_SCHIEFE 0
es COEFICIENTE.ASIMETRIA 2002-02-02 02:02:02
++-formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_SEARCH 0
es BUSCAR 2002-02-02 02:02:02
+++formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_SEARCH 0
es HALLAR 2002-02-02 02:02:02
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_SIN 0 es
SENO 2002-02-02 02:02:02
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_SIN_HYP 0
es SENOH 2002-02-02 02:02:02
++ formula source\core\resource\core_resource.src 0 string
RID_STRLIST_FUNCTION_NAMES SC_OPCODE_SLOPE 0 es
PENDIENTE 2002-02-02 02:02:02
+--- openoffice.org-3.2.0.orig/ooo-build-3-2-0-6/patches/dev300/apply
++++ openoffice.org-3.2.0/ooo-build-3-2-0-6/patches/dev300/apply
+@@ -2927,6 +2927,8 @@ sc-autofilter-l10n-es.diff, i#103840, pm
+ # pack only selected languages in the l10n module
+ l10n-build-only-selected-langs.diff, i#106185, pmladek
+
++i109407_BUSCAR.diff
++
+ [ PieceBits ]
+ # zipintro is not kind to us ...
+ piece-desktop.diff
=== modified file 'patches/series'
--- a/patches/series 2010-02-21 11:50:51 +0000
+++ b/patches/series 2010-02-22 14:31:35 +0000
@@ -1,1 +1,2 @@
work-around-HelpLinker-miscompile-with-gcc-4.3.diff
+i109407-fix-duplicate-spanish-translation-of-formulas.diff
