./packages/openofficeorg/3.3.0/experimental r2122: merge 3.2.1 branch
------------------------------------------------------------
revno: 2122 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sat 2011-01-01 21:38:04 +0100
message:
merge 3.2.1 branch
added:
patches/set-correct-default-formula-syntax.diff
patches/slideshow-clipfix.diff
po/da.po
templates/
templates/debian-presentation-background.xcf
templates/debian-presentation.otp
modified:
changelog
copyright
patches/series
rules
=== modified file 'changelog'
--- a/changelog 2010-10-12 21:46:46 +0000
+++ b/changelog 2011-01-01 20:38:04 +0000
@@ -60,6 +60,41 @@
* debian/udk*in, debian/xmerge-javadoc.in: Sun Microsystems, Inc -> Oracle
-- Rene Engelhard <rene@debian.org> Tue, 12 Oct 2010 23:46:24 +0200
+
+openoffice.org (1:3.2.1-11) unstable; urgency=medium
+
+ * use dpkg -s instead of apt-cache show (closes: #607873)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 27 Dec 2010 12:59:29 +0100
+
+openoffice.org (1:3.2.1-10) unstable; urgency=medium
+
+ * debian/patches/slideshow-clipfix.diff: add patch from ooo-build-3-2-1
+ branch to fix clipping in slideshow (closes: #605120)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 29 Nov 2010 21:27:31 +0000
+
+openoffice.org (1:3.2.1-9) unstable; urgency=low
+
+ * debian/rules: actually install debian-presentation.odp to -common...
+ (really closes: #602043)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 14 Nov 2010 23:31:19 +0100
+
+openoffice.org (1:3.2.1-8) unstable; urgency=medium
+
+ * debian/patches/set-correct-default-formula-syntax.diff: backport
+ from LibreOffice: Set correct default formula syntax value in case
+ it's not explicitly set (closes: #572535)
+
+ * debian/po/da.po: add Danish translation of the debconf templates,
+ thanks Joe Hansen (closes: #599429)
+ * debian/templates/debian-presentation*: add Debian presentation template,
+ thanks Raphael Hertzog (closes: #602043)
+ * debian/rules: fix some more spanish calc functions (FIND/SEARCH), thanks
+ Manuel María Pérez Ayal
+
+ -- Rene Engelhard <rene@debian.org> Tue, 09 Nov 2010 22:21:27 +0100
openoffice.org (1:3.2.1-7) unstable; urgency=low
=== modified file 'copyright'
--- a/copyright 2010-06-29 19:25:13 +0000
+++ b/copyright 2011-01-01 20:38:04 +0000
@@ -14,6 +14,14 @@
(These files are checked out from http://hg.services.openoffice.org/re/DEV300_next/file/c3ffaa0d55a2/sysui/desktop/icons/hicolor (3.3 tree) to have a
matching startcenter icon, not the old one which is in the 3.2 tree)
+File: debian/templates/debian-presentation.otp
+Copyright: Copyright (C) 2010 Raphaël Hertzog
+License: GPL-2+
+
+File: debian/templates/debian-presentation-background.xcf
+Copyright: Copyright Alexis Younes "ayo"
+License: GPL-2+
+
Files: ooo-build-*/*
Copyright: (c) 2002-2010 ooo-build/Go-OO Team
License: LGPL-3
=== modified file 'patches/series'
--- a/patches/series 2010-09-26 16:27:23 +0000
+++ b/patches/series 2011-01-01 20:38:04 +0000
@@ -3,3 +3,5 @@
regcomp-fix-spelling.diff
shift-translations.diff
pdf-link-export-fix.diff
+set-correct-default-formula-syntax.diff
+slideshow-clipfix.diff
=== added file 'patches/set-correct-default-formula-syntax.diff'
--- a/patches/set-correct-default-formula-syntax.diff 1970-01-01 00:00:00 +0000
+++ b/patches/set-correct-default-formula-syntax.diff 2010-11-03 21:44:53 +0000
@@ -0,0 +1,30 @@
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/calc-formula-variable-separators-sc.diff-old 2010-11-03 21:14:08.000000000 +0100
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/calc-formula-variable-separators-sc.diff 2010-11-03 21:16:03.000000000 +0100
+@@ -319,7 +319,7 @@
+ aLayoutItem( OUString::createFromAscii( CFGPATH_DOCLAYOUT ) )
+ {
+ sal_Int32 nIntVal = 0;
+-@@ -328,6 +423,69 @@ ScDocCfg::ScDocCfg() :
++@@ -328,6 +423,72 @@ ScDocCfg::ScDocCfg() :
+
+ SetDate( nDateDay, nDateMonth, nDateYear );
+
+@@ -335,7 +335,8 @@
+ + {
+ + case SCFORMULAOPT_GRAMMAR:
+ + {
+-+ ::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
+++ // Get default value in case this option is not set.
+++ ::formula::FormulaGrammar::Grammar eGram = GetFormulaSyntax();
+ +
+ + do
+ + {
+@@ -354,6 +355,8 @@
+ + case 2: // Excel R1C1
+ + eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1;
+ + break;
+++ default:
+++ ;
+ + }
+ + }
+ + while (false);
=== added file 'patches/slideshow-clipfix.diff'
--- a/patches/slideshow-clipfix.diff 1970-01-01 00:00:00 +0000
+++ b/patches/slideshow-clipfix.diff 2010-11-29 21:36:32 +0000
@@ -0,0 +1,48 @@
+--- /dev/null 2010-11-28 22:07:38.738975693 +0100
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/slideshow-clipfix.diff 2010-11-29 22:06:10.000000000 +0100
+@@ -0,0 +1,33 @@
++Fix for slideshow clipping bug i#112422
++
++From: Thorsten Behrens <tbehrens@novell.com>
++
++
++---
++
++ slideshow/source/engine/slide/layer.cxx | 4 ++++
++ 1 files changed, 4 insertions(+), 0 deletions(-)
++
++
++diff --git slideshow/source/engine/slide/layer.cxx slideshow/source/engine/slide/layer.cxx
++index f9d35b6..34a46b8 100644
++--- slideshow/source/engine/slide/layer.cxx
+++++ slideshow/source/engine/slide/layer.cxx
++@@ -39,6 +39,8 @@
++ #include <basegfx/range/b2dpolyrange.hxx>
++ #include <basegfx/matrix/b2dhommatrix.hxx>
++ #include <basegfx/polygon/b2dpolypolygon.hxx>
+++#include <basegfx/polygon/b2dpolypolygontools.hxx>
+++#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
++
++ #include "layer.hxx"
++
++@@ -291,6 +293,8 @@ namespace slideshow
++ // clipping, and render each shape that intersects with
++ // the calculated update area
++ ::basegfx::B2DPolyPolygon aClip( maUpdateAreas.solveCrossovers() );
+++ aClip = ::basegfx::tools::stripNeutralPolygons(aClip);
+++ aClip = ::basegfx::tools::stripDispensablePolygons(aClip, false);
++
++ // actually, if there happen to be shapes with zero
++ // update area in the maUpdateAreas vector, the
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 9095210..664e419 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
+@@ -4017,6 +4017,7 @@ sfx2-add-to-recently-used-after-save.diff, rodo
+ basegfx-boxclipper.diff, i#72418, thorsten
+ basegfx-clipstate.diff, i#72418, thorsten
+ slideshow-clipstate.diff, i#72418, thorsten
++slideshow-clipfix.diff, i#112422, thorsten
+
+ [ Fixes <= ooo320-m16 ]
+ svtools-wmf-clipperf-m16.diff, n#535304, thorsten
=== added file 'po/da.po'
--- a/po/da.po 1970-01-01 00:00:00 +0000
+++ b/po/da.po 2010-10-13 13:26:08 +0000
@@ -0,0 +1,49 @@
+# Danish translation openoffice.org.
+# Copyright (C) 2010 openoffice.org & Joe Hansen.
+# This file is distributed under the same license as the openoffice.org package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openoffice.org\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2010-02-01 00:29+0100\n"
+"PO-Revision-Date: 2010-10-07 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../ure.templates.in:2001
+msgid "Component registries might be corrupted"
+msgstr "Komponentregistreringer kan være ødelagte"
+
+#. Type: note
+#. Description
+#: ../ure.templates.in:2001
+msgid ""
+"You are upgrading from a version which might have corrupted service/"
+"component registry files (*.rdb), especially /var/lib/openoffice/basis3.1/"
+"program/services.rdb and the rdb files in /var/spool/openoffice/uno_packages/"
+"cache for installed extensions."
+msgstr ""
+"Du opgraderer fra en version som måske har ødelagte tjeneste-/komponentregistreringsfiler "
+"(*.rdb), specielt /var/lib/openoffice/basis3.1/program/services.rdb og rdb-filerne "
+"i /var/spool/openoffice/uno_packages/cache for installerede filendelser."
+
+#. Type: note
+#. Description
+#: ../ure.templates.in:2001
+msgid ""
+"If you experience problems with the component manager or segmentation faults "
+"involving libstore in either unopkg or OpenOffice.org, please check these "
+"files. Try cleanly reinstalling the packages and/or using a clean user "
+"profile."
+msgstr ""
+"Hvis du oplever problemer med komponenthåndteringen eller segmenteringsfejl, "
+"der indbefatter libstore i enten unopkg eller OpenOffice.org, så tjek venligst "
+"disse filer. Prøv en ren geninstallation af pakkerne og/eller brug en ren "
+"brugerprofil."
=== modified file 'rules'
--- a/rules 2010-10-12 21:44:43 +0000
+++ b/rules 2011-01-01 20:38:04 +0000
@@ -721,7 +721,7 @@
endif
BUILD_DEPS += , libdb-dev
- DBG_DBG_SUGGESTS += , $(shell apt-cache show libdb-dev | grep Depends | awk '{ print $$2 }' | sed -e s/dev/dbg/)
+ DBG_DBG_SUGGESTS += , $(shell dpkg -s libdb-dev | grep Depends | awk '{ print $$2 }' | sed -e s/dev/dbg/)
ifneq "$(BUILD_DBG_PACKAGE)" "y"
# build with small symbols anyway
@@ -937,10 +937,10 @@
BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-apache-commons --with-commons-codec-jar=/usr/share/java/commons-codec.jar --with-commons-lang-jar=/usr/share/java/commons-lang.jar --with-commons-httpclient-jar=/usr/share/java/commons-httpclient.jar --with-commons-logging-jar=/usr/share/java/commons-logging.jar
ifeq "$(LENNY_BACKPORT)" "y"
- CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
+ CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
else
- CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
- BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
+ BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
endif
endif
@@ -957,10 +957,10 @@
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
CONFIGURE_FLAGS += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
ifeq "$(LENNY_BACKPORT)" "y"
- CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
+ CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
else
- CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
- BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
+ BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
endif
CONFIGURE_FLAGS += --enable-report-builder
@@ -2027,6 +2027,11 @@
ifeq (es,$(findstring es,$(LANGPACKISOS)))
if [ -f $(OOO_BUILD_TREE)/src/GSI_es.sdf ]; then \
perl -pi -e 's/(.*SC_OPCODE_SUBSTITUTE.*)REEMPLAZAR(.*)/\1SUSTITUIR\2/' $(OOO_BUILD_TREE)/src/GSI_es.sdf; \
+ perl -pi -e 's/(.*SC_OPCODE_FIND.*)BUSCAR(.*)/\1ENCONTRAR\2/' $(OOO_BUILD_TREE)/src/GSI_es.sdf; \
+ perl -pi -e 's/(.*par_id3156375.*)BUSCAR(.*)/\1ENCONTRAR\2/' $(OOO_BUILD_TREE)/src/GSI_es.sdf; \
+ perl -pi -e 's/(.*SC_OPCODE_SEARCH.*)BUSCAR(.*)/\1HALLAR\2/' $(OOO_BUILD_TREE)/src/GSI_es.sdf; \
+ perl -pi -e 's/(.*hd_id3151005.*)BUSCAR(.*)/\1HALLAR\2/' $(OOO_BUILD_TREE)/src/GSI_es.sdf; \
+ perl -pi -e 's/(.*par_id3154564.*)BUSCAR(.*)/\1HALLAR\2/' $(OOO_BUILD_TREE)/src/GSI_es.sdf; \
fi
endif
endif
@@ -2415,6 +2420,20 @@
> $$TMP && \
debian/scripts/cleandupes --base=openoffice.org$(VER) --prefix=debian < $$TMP && rm -f $$TMP
+ifeq "$(DIST)" "Debian"
+ # install Debian presentation template
+ otps=`cd debian/templates; echo *.otp`; \
+ for iso in $(LANGPACKISOS); do \
+ [ "$$iso" = "en-US" ] && continue; \
+ pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
+ mkdir -p $(PKGDIR)-l10n-$$pkgiso/$(OODIR)/share/template/$$iso/presnt; \
+ for otp in $$otps; do \
+ ln -sf ../../en-US/presnt/$$otp \
+ $(PKGDIR)-l10n-$$pkgiso/$(OODIR)/share/template/$$iso/presnt/$$odt; \
+ done; \
+ done
+endif
+
touch $@
native-jars: $(STAMP_NATIVE_JARS)
@@ -3401,6 +3420,12 @@
| sed -e "s,\@OOBASISDIR\@,$(OOBASISDIR)," \
> $(PKGDIR)-dtd-officedocument1.0.xmlcatalogs
+ifeq "$(DIST)" "Debian"
+ # install Debian presentation template
+ mkdir -p $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt
+ install -m644 debian/templates/*.otp $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt/
+endif
+
# add "openoffice.org" symlink
cd $(PKGDIR)-common/usr/bin && ln -s ooffice openoffice.org$(VER)
=== added directory 'templates'
=== added file 'templates/debian-presentation-background.xcf'
Binary files a/templates/debian-presentation-background.xcf 1970-01-01 00:00:00 +0000 and b/templates/debian-presentation-background.xcf 2010-11-03 20:41:12 +0000 differ
=== added file 'templates/debian-presentation.otp'
Binary files a/templates/debian-presentation.otp 1970-01-01 00:00:00 +0000 and b/templates/debian-presentation.otp 2010-11-03 20:41:12 +0000 differ
Reply to: