./packages/openofficeorg/3.2/experimental r1829: update to ooo-build 3.2.0.7
------------------------------------------------------------
revno: 1829
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2010-02-24 19:12:58 +0100
message:
update to ooo-build 3.2.0.7
removed:
patches/i109407-fix-duplicate-spanish-translation-of-formulas.diff
patches/series
patches/work-around-HelpLinker-miscompile-with-gcc-4.3.diff
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-02-24 13:44:32 +0000
+++ b/changelog 2010-02-24 18:12:58 +0000
@@ -1,8 +1,10 @@
openoffice.org (1:3.2.0-2) UNRELEASED; urgency=low
* ooo-build:
- - update (3.2.0.6)
+ - update (3.2.0.7)
- really localize the layout dialogs (closes: #570378)
+ - gcc-HelpLinker.diff: work around HelpLinker miscompile with gcc 4.3
+ by using -O0, thanks Phillip Matthias Hahn (see #555026)
* debian/control.in:
- make -base depend on -java-common (>= 1:3.2.0~) (closes: #570335). Also
@@ -12,14 +14,9 @@
* debian/rules, debian/source/*: migrate to "3.0 (quilt)" with bzip2
compression
- * 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
* debian/po: add sk.po, thanks Ivan Masár (closes: #571225)
- -- Rene Engelhard <rene@debian.org> Wed, 24 Feb 2010 12:53:50 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 24 Feb 2010 19:12:13 +0100
openoffice.org (1:3.2.0-1) experimental; urgency=low
=== removed file 'patches/i109407-fix-duplicate-spanish-translation-of-formulas.diff'
--- a/patches/i109407-fix-duplicate-spanish-translation-of-formulas.diff 2010-02-22 14:40:25 +0000
+++ b/patches/i109407-fix-duplicate-spanish-translation-of-formulas.diff 1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-Description: Remove duplicate function name of formulas in ES translation
-Author: Eike Rathke <er@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
-++++ l10n/source/es/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
=== removed file 'patches/series'
--- a/patches/series 2010-02-22 14:31:35 +0000
+++ b/patches/series 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-work-around-HelpLinker-miscompile-with-gcc-4.3.diff
-i109407-fix-duplicate-spanish-translation-of-formulas.diff
=== removed file 'patches/work-around-HelpLinker-miscompile-with-gcc-4.3.diff'
--- a/patches/work-around-HelpLinker-miscompile-with-gcc-4.3.diff 2010-02-22 14:30:52 +0000
+++ b/patches/work-around-HelpLinker-miscompile-with-gcc-4.3.diff 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-Description: fix HelpLinker miscompile with gcc 4.3
- About the problem of the HelpLinker crash: g++-4.3 seems to miscompile
- HelpLinker with -O2. Just changeing that to -O0 for the two directories
- transex3/source/{,help/} solved that problem for us.
-Author: Phillip Mattias Hahn <pmhahn@debian.org>
-Forwarded: no
-Last-Update: 2010-02-21
-Origin: vendor
-Reviewed-by: Rene Engelhard <rene@debian.org>
-
---- openoffice.org-3.2.0.o/ooo-build-3-2-0-6/patches/dev300/apply 2010-01-25 14:48:36.000000000 +0100
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-6/patches/dev300/apply 2010-01-25 15:07:23.000000000 +0100
-@@ -293,6 +293,9 @@
- # it helps to avoid some crashes
- jvmfwk-sunjavaplugin-default-stack-size.diff, n#572372, pmladek
-
-+# don't let HelpLinker be miscompiled with g++ 4.3
-+gcc-HelpLinker.diff
-+
- [ TemporaryHacks and not MacOSXOnly ]
-
- # don't lstat() that much while creating absolute URLs - breaks unopkg
---- openoffice.org-3.2.0.o/ooo-build-3-2-0-6/patches/dev300/gcc-HelpLinker.diff 1970-01-01 01:00:00.000000000 +0100
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-6/patches/dev300/gcc-HelpLinker.diff 2010-02-19 16:18:32.000000000 +0200
-@@ -0,0 +1,20 @@
-+--- transex3/source/makefile.mk.orig 2010-02-19 12:20:48.000000000 +0100
-++++ transex3/source/makefile.mk 2010-02-18 19:49:58.000000000 +0100
-+@@ -43,6 +43,7 @@
-+ .INCLUDE : settings.mk
-+ CDEFS+= -DYY_NEVER_INTERACTIVE=1
-+ #CDEFS+= -pg
-++CDEFS+= -O0
-+
-+ .IF "$(SYSTEM_EXPAT)" == "YES"
-+ CFLAGS+=-DSYSTEM_EXPAT
-+--- transex3/source/help/makefile.mk.orig 2010-02-19 12:20:52.000000000 +0100
-++++ transex3/source/help/makefile.mk 2010-02-19 11:45:26.000000000 +0100
-+@@ -40,6 +40,7 @@
-+
-+ .INCLUDE : settings.mk
-+ .INCLUDE : helplinker.pmk
-++CDEFS+= -O0
-+
-+ .IF "$(SYSTEM_LIBXSLT)" == "YES"
-+ CFLAGS+= $(LIBXSLT_CFLAGS)
=== modified file 'rules'
--- a/rules 2010-02-20 17:51:47 +0000
+++ b/rules 2010-02-24 18:12:58 +0000
@@ -68,8 +68,8 @@
#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=ooo-build-3-2
-OOO_BUILD_VERSION=3.2.0.6
-OOO_BUILD_TAG=OOO_BUILD_3_2_0_6
+OOO_BUILD_VERSION=3.2.0.7
+OOO_BUILD_TAG=OOO_BUILD_3_2_0_7
OOO_BUILD_TREE=ooo-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/$(TAG)
STAMP_DIR=debian/stampdir
Reply to: