Hi, I'd like to upload the following to unstable:
+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/catalog.xml: move ... + * debian/catalog.xml.in: ... here and fix path to dtd + * debian/udk*in, debian/xmerge-javadoc.in: Sun Microsystems, Inc -> Oracle + * 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 Some additional comments: #572535 is a long standing ooo-build-specific bug that also manifest itself in not being able to set a print range correctly in Calc - which is why this should be fixed in sid if possible, + * debian/catalog.xml: move ... + * debian/catalog.xml.in: ... here and fix path to dtd + * debian/udk*in, debian/xmerge-javadoc.in: Sun Microsystems, Inc -> Oracle is quite minor (especially the second one) but trivial and riskless. Sorry for the file move, but I didn't want to hardcode the path there (which was the bug in the first place, otherwise it already would have been automatically adapted) + * 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) Those both admittedly are discussable, but when you're at it... (and #602043 is "just" an other data file) But if you insist I can just leave them out (which makes #599429 wontfix) Full proposed debdiff attached. OK? Grüße/Regards, René
diff -Nru openoffice.org-3.2.1/debian/catalog.xml openoffice.org-3.2.1/debian/catalog.xml --- openoffice.org-3.2.1/debian/catalog.xml 2010-05-28 20:53:28.000000000 +0200 +++ openoffice.org-3.2.1/debian/catalog.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN" - "file:///usr/share/xml/schema/xml-core/catalog.dtd"> -<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> -<public publicId="-//OpenOffice.org//DTD OfficeDocument 1.0//EN" uri="/usr/lib/openoffice/share/dtd/officedocument/1_0/office.dtd"/> -</catalog> diff -Nru openoffice.org-3.2.1/debian/catalog.xml.in openoffice.org-3.2.1/debian/catalog.xml.in --- openoffice.org-3.2.1/debian/catalog.xml.in 1970-01-01 01:00:00.000000000 +0100 +++ openoffice.org-3.2.1/debian/catalog.xml.in 2010-10-13 15:20:32.000000000 +0200 @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN" + "file:///usr/share/xml/schema/xml-core/catalog.dtd"> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> +<public publicId="-//OpenOffice.org//DTD OfficeDocument 1.0//EN" uri="/@OOBASISDIR@/share/dtd/officedocument/1_0/office.dtd"/> +</catalog> diff -Nru openoffice.org-3.2.1/debian/changelog openoffice.org-3.2.1/debian/changelog --- openoffice.org-3.2.1/debian/changelog 2010-09-22 17:58:28.000000000 +0200 +++ openoffice.org-3.2.1/debian/changelog 2010-11-09 22:21:31.000000000 +0100 @@ -1,3 +1,21 @@ +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/catalog.xml: move ... + * debian/catalog.xml.in: ... here and fix path to dtd + * debian/udk*in, debian/xmerge-javadoc.in: Sun Microsystems, Inc -> Oracle + * 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 <r...@debian.org> Tue, 09 Nov 2010 22:21:27 +0100 + openoffice.org (1:3.2.1-7) unstable; urgency=low * debian/patches/add-some-missing-german-translations.diff: as named, diff -Nru openoffice.org-3.2.1/debian/copyright openoffice.org-3.2.1/debian/copyright --- openoffice.org-3.2.1/debian/copyright 2010-06-29 00:52:16.000000000 +0200 +++ openoffice.org-3.2.1/debian/copyright 2010-11-03 21:40:19.000000000 +0100 @@ -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 diff -Nru openoffice.org-3.2.1/debian/patches/series openoffice.org-3.2.1/debian/patches/series --- openoffice.org-3.2.1/debian/patches/series 2010-09-22 17:45:44.000000000 +0200 +++ openoffice.org-3.2.1/debian/patches/series 2010-11-10 00:08:44.000000000 +0100 @@ -11,3 +11,4 @@ SA40775.diff add-some-missing-german-translations.diff pdf-link-export-fix.diff +set-correct-default-formula-syntax.diff diff -Nru openoffice.org-3.2.1/debian/patches/set-correct-default-formula-syntax.diff openoffice.org-3.2.1/debian/patches/set-correct-default-formula-syntax.diff --- openoffice.org-3.2.1/debian/patches/set-correct-default-formula-syntax.diff 1970-01-01 01:00:00.000000000 +0100 +++ openoffice.org-3.2.1/debian/patches/set-correct-default-formula-syntax.diff 2010-11-03 21:41:18.000000000 +0100 @@ -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); diff -Nru openoffice.org-3.2.1/debian/po/da.po openoffice.org-3.2.1/debian/po/da.po --- openoffice.org-3.2.1/debian/po/da.po 1970-01-01 01:00:00.000000000 +0100 +++ openoffice.org-3.2.1/debian/po/da.po 2010-10-13 15:25:34.000000000 +0200 @@ -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 <joedalt...@yahoo.dk>, 2010 +# +msgid "" +msgstr "" +"Project-Id-Version: openoffice.org\n" +"Report-Msgid-Bugs-To: openoffice....@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 <joedalt...@yahoo.dk>\n" +"Language-Team: Danish <debian-l10n-dan...@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." diff -Nru openoffice.org-3.2.1/debian/rules openoffice.org-3.2.1/debian/rules --- openoffice.org-3.2.1/debian/rules 2010-09-22 17:17:43.000000000 +0200 +++ openoffice.org-3.2.1/debian/rules 2010-11-09 22:13:12.000000000 +0100 @@ -1612,6 +1612,7 @@ rm -f debian/openoffice.org-$$i.lintian-overrides; \ done rm -f debian/*.install debian/*.dirs + rm -f debian/catalog.xml rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs rm -f download.list @@ -2012,6 +2013,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 @@ -2395,6 +2401,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) @@ -3394,7 +3414,9 @@ mkdir -p $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd mv $(PKGDIR)-common/$(OODIR)/share/dtd/officedocument \ $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd - cp debian/catalog.xml $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd/officedocument/1_0 + cat debian/catalog.xml.in \ + | sed -e "s,\...@oobasisdir\@,$(OOBASISDIR)," \ + > $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd/officedocument/1_0/catalog.xml cat $(PKGDIR)-dtd-officedocument1.0.xmlcatalogs.in \ | sed -e "s,\...@oobasisdir\@,$(OOBASISDIR)," \ > $(PKGDIR)-dtd-officedocument1.0.xmlcatalogs diff -Nru openoffice.org-3.2.1/debian/source/include-binaries openoffice.org-3.2.1/debian/source/include-binaries --- openoffice.org-3.2.1/debian/source/include-binaries 2010-06-29 14:24:35.000000000 +0200 +++ openoffice.org-3.2.1/debian/source/include-binaries 2010-11-07 12:14:44.000000000 +0100 @@ -2,3 +2,6 @@ debian/icons/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png debian/icons/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png debian/icons/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png +debian/templates/debian-presentation.otp +debian/templates/debian-presentation-background.xcf + Binärdateien /tmp/JaqMcNRjo9/openoffice.org-3.2.1/debian/templates/debian-presentation-background.xcf and /tmp/xNOXZyNnaa/openoffice.org-3.2.1/debian/templates/debian-presentation-background.xcf sind verschieden. Binärdateien /tmp/JaqMcNRjo9/openoffice.org-3.2.1/debian/templates/debian-presentation.otp and /tmp/xNOXZyNnaa/openoffice.org-3.2.1/debian/templates/debian-presentation.otp sind verschieden. diff -Nru openoffice.org-3.2.1/debian/udk-common-ref.in openoffice.org-3.2.1/debian/udk-common-ref.in --- openoffice.org-3.2.1/debian/udk-common-ref.in 2010-05-28 20:53:28.000000000 +0200 +++ openoffice.org-3.2.1/debian/udk-common-ref.in 2010-10-13 15:20:32.000000000 +0200 @@ -1,6 +1,6 @@ Document: udk-common-ref Title: UDK @udk_ma...@.@udk_mi...@.@UDK_MICRO@ IDL Reference -Author: Sun Microsystems, Inc. +Author: Oracle Section: Programming Format: HTML diff -Nru openoffice.org-3.2.1/debian/udk-cpp-ref.in openoffice.org-3.2.1/debian/udk-cpp-ref.in --- openoffice.org-3.2.1/debian/udk-cpp-ref.in 2010-05-28 20:53:28.000000000 +0200 +++ openoffice.org-3.2.1/debian/udk-cpp-ref.in 2010-10-13 15:20:32.000000000 +0200 @@ -1,6 +1,6 @@ Document: udk-cpp-ref Title: UDK @udk_ma...@.@udk_mi...@.@UDK_MICRO@ C/C++ API Reference -Author: Sun Microsystems, Inc. +Author: Oracle Section: Programming Format: HTML diff -Nru openoffice.org-3.2.1/debian/udk-java-ref.in openoffice.org-3.2.1/debian/udk-java-ref.in --- openoffice.org-3.2.1/debian/udk-java-ref.in 2010-05-28 20:53:28.000000000 +0200 +++ openoffice.org-3.2.1/debian/udk-java-ref.in 2010-10-13 15:20:32.000000000 +0200 @@ -1,6 +1,6 @@ Document: udk-java-ref Title: UDK @udk_ma...@.@udk_mi...@.@UDK_MICRO@ Java API Reference -Author: Sun Microsystems, Inc. +Author: Oracle Section: Programming Format: HTML diff -Nru openoffice.org-3.2.1/debian/xmerge-javadoc.in openoffice.org-3.2.1/debian/xmerge-javadoc.in --- openoffice.org-3.2.1/debian/xmerge-javadoc.in 2010-05-28 20:53:28.000000000 +0200 +++ openoffice.org-3.2.1/debian/xmerge-javadoc.in 2010-10-13 15:20:32.000000000 +0200 @@ -1,6 +1,6 @@ Document: xmerge-javadoc Title: OpenOffice.org XMerge API Javadoc -Author: Sun Microsystems, Inc. +Author: Oracle Section: Apps/Programming Format: HTML
