------------------------------------------------------------
revno: 1681 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Sat 2009-10-24 22:56:58 +0200
message:
merge
modified:
changelog
control
control.help.in
control.in
po/de.po
po/ru.po
po/templates.pot
po/tr.po
rules
templates
=== modified file 'changelog'
--- a/changelog 2009-10-24 01:01:17 +0000
+++ b/changelog 2009-10-24 20:56:58 +0000
@@ -15,7 +15,7 @@
- no duplicate shortcut in Insert Menu anymore (closes: #550510)
* ooo-build:
- - update (2297885ed31b1f0547a6d7d3360dc4f2c184c198)
+ - update (0c75f4b45a2b543670f5f4553804c7f62dcac062)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -49,7 +49,25 @@
* debian/openoffice.org-filter-binfilter.{templates,postinst.in}:
- warn against those filters being obsoleted with OOo 3.4
- -- Rene Engelhard <r...@debian.org> Fri, 23 Oct 2009 22:47:14 +0200
+ -- Rene Engelhard <r...@debian.org> Sat, 24 Oct 2009 22:55:49 +0200
+
+openoffice.org (1:3.1.1-6) UNRELEASED; urgency=low
+
+ * ooo-build
+ - update (a26eafc29fa094e14110661bbb63fd7b6d3a88e5)
+ - fixes wrong filter texts in KDE4 fpicker (closes: #551774)
+ - Correct fix for the mirrored range selection bug in RTL mode.
+ (closes: #548767)
+ * debian/templates: apply changes from debian-l10n-english review
+ * debian/po: debconf-updatepo; update de.po
+ * debian/rules:
+ - add conflict against (<< <minor version of lucene OOo was built with)
+ for -help-en-us as newer versions necessarily don't create indexes a old
+ version can read...
+ * debian/control.in:
+ - conflict against libhsqldb-java (>= 1.9~)
+
+ -- Rene Engelhard <r...@debian.org> Sat, 24 Oct 2009 22:29:13 +0200
openoffice.org (1:3.1.1-5) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-10-16 21:40:56 +0000
+++ b/control 2009-10-24 20:56:58 +0000
@@ -224,7 +224,7 @@
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends},
${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc |
mdbtools, libmysql-java | libpg-java | libjtds-java, openoffice.org-gcj,
openoffice.org-report-builder
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<<
1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-base (<< ${binary:Version}), openoffice.org-java,
openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (=
1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1),
openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (=
2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1)
-Conflicts: openoffice.org-debian-files, openoffice.org2-base (<<
${binary:Version}), openoffice.org-common (= 2.0.4-4)
+Conflicts: openoffice.org-debian-files, openoffice.org2-base (<<
${binary:Version}), openoffice.org-common (= 2.0.4-4), libhsqldb-java (>= 1.9~)
Provides: openoffice.org2-base
Description: full-featured office productivity suite -- database
OpenOffice.org is a full-featured office productivity suite that provides
@@ -503,7 +503,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-en, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-en,
${misc:Depends}
-Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<<
${base-version})
+Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<<
${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- English_american help
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.help.in'
--- a/control.help.in 2009-04-27 13:34:49 +0000
+++ b/control.help.in 2009-10-24 20:03:17 +0000
@@ -4,8 +4,9 @@
Recommends: openoffice.orgVER-core (>> ${base-version}) |
language-support-translatio...@ccode@, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.orgVER-writer | language-support-translatio...@ccode@,
openoffice.orgver-l1...@lcode@,
${misc:Depends}
-Conflicts: openoffice.org-common (<= 2.0.0-1),
- openoffice.org-core (<< ${base-version})
+Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1),
+ openoffice.org-core (<< ${base-version}),
+ ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- @LNAME@ help
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.in'
--- a/control.in 2009-10-16 21:40:56 +0000
+++ b/control.in 2009-10-24 20:56:58 +0000
@@ -476,7 +476,8 @@
openoffice.org-java-common (= 2.2.1-9~bpo40+1)
Conflicts: openoffice.org-debian-files,
openoffice.org2-base (<< ${binary:Version}),
- openoffice.org-common (= 2.0.4-4)
+ openoffice.org-common (= 2.0.4-4),
+ libhsqldb-java (>= 1.9~)
Provides: openoffice.org2-base
Description: full-featured office productivity suite -- database
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'po/de.po'
--- a/po/de.po 2009-10-02 17:33:40 +0000
+++ b/po/de.po 2009-10-24 20:56:58 +0000
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: openoffice....@packages.debian.org\n"
-"POT-Creation-Date: 2009-10-01 18:01+0200\n"
-"PO-Revision-Date: 2009-09-20 12:50+0200\n"
+"POT-Creation-Date: 2009-10-24 12:39+0200\n"
+"PO-Revision-Date: 2009-10-24 12:42+0200\n"
"Last-Translator: Rene Engelhard <r...@debian.org>\n"
"Language-Team: GERMAN <d...@li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,49 +19,27 @@
#. Type: error
#. Description
#: ../templates:1001
-msgid "OpenOffice.org running!"
-msgstr "OpenOffice.org läuft!"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid ""
-"OpenOffice.org is running right now. A running OpenOffice.org makes "
-"extension (de-)registration not possible and it causes problems with (de-)"
-"registering components."
-msgstr ""
-"OpenOffice.org läuft momentan. Ein laufendes OpenOffice.org verhindert das "
-"registrieren und entfernen von Erweiterungen und es macht Probleme beim "
-"registrieren und entfernen von Komponenten."
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid ""
-"Please close OpenOffice.org (including an eventually running Quickstarter)."
-msgstr ""
-"Bitte schliessen Sie OpenOffice.org (inkl. einem evtl. laufenden "
-"Quickstarter)"
-
-#. Type: note
-#. Description
-#: ../openoffice.org-filter-binfilter.templates.in:1001
-msgid "StarOffice 5.x filters going away soon"
-msgstr "StarOffice 5.x-Filter werden bald entfernt"
-
-#. Type: note
-#. Description
-#: ../openoffice.org-filter-binfilter.templates.in:1001
-msgid ""
-"The old StarOffice binary filters (*.sdw, *.sdc, *.sdd) are scheduled to go "
-"away with OpenOffice.org 3.4."
-msgstr ""
-"Die alten StarOffice Binär-Formate (*.sdw, *.sdc, *.sdd) werden "
-"voraussichtlich mit OpenOffice.org 3.4 entfernt."
-
-#. Type: note
-#. Description
-#: ../openoffice.org-filter-binfilter.templates.in:1001
-msgid "Please migrate your documents away from this long-obsolete format."
-msgstr ""
-"Bitte migrieren Sie ihre Dokumente von diesem lange obsoleten Format weg"
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org läuft"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"regstration of components and extensions."
+msgstr ""
+"OpenOffice.org läuft momentan. Das kann Probleme beim (De-)Registrieren von "
+"Erweiterungen und Komponenten verursachen."
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+"Sie sollten alle laufenden Instanzen von OpenOffice.org (inkl. einem "
+"laufenden Quickstarter) beenden bevor Sie mit der Paket-Aktualisierung "
+"fortfahren"
+
=== modified file 'po/ru.po'
--- a/po/ru.po 2009-10-02 10:23:26 +0000
+++ b/po/ru.po 2009-10-24 13:45:08 +0000
@@ -6,13 +6,13 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: openoffice....@packages.debian.org\n"
-"POT-Creation-Date: 2009-09-29 12:50+0200\n"
+"POT-Creation-Date: 2009-10-24 12:39+0200\n"
"PO-Revision-Date: 2009-10-02 14:20+0400\n"
"Last-Translator: Rail Aliev <r...@i-rs.ru>\n"
-"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Virtaal 0.4.0\n"
@@ -20,16 +20,22 @@
#. Type: error
#. Description
#: ../templates:1001
-msgid "OpenOffice.org running!"
+#, fuzzy
+#| msgid "OpenOffice.org running!"
+msgid "OpenOffice.org running"
msgstr "OpenOffice.org запущен!"
#. Type: error
#. Description
#: ../templates:1001
+#, fuzzy
+#| msgid ""
+#| "OpenOffice.org is running right now. A running OpenOffice.org makes "
+#| "extension (de-)registration not possible and it causes problems with (de-)"
+#| "registering components."
msgid ""
-"OpenOffice.org is running right now. A running OpenOffice.org makes "
-"extension (de-)registration not possible and it causes problems with "
-"(de-)registering components."
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"regstration of components and extensions."
msgstr ""
"OpenOffice.org в данный момент запущен. Установка и удаление расширений при "
"работающем OpenOffice.org невозможна, а регистрация компонентов может "
@@ -39,5 +45,11 @@
#. Description
#: ../templates:1001
msgid ""
-"Please close OpenOffice.org (including an eventually running Quickstarter)."
-msgstr "Завершите работу OpenOffice.org (включая Быстрый запуск)."
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+
+#~ msgid ""
+#~ "Please close OpenOffice.org (including an eventually running "
+#~ "Quickstarter)."
+#~ msgstr "Завершите работу OpenOffice.org (включая Быстрый запуск)."
=== modified file 'po/templates.pot'
--- a/po/templates.pot 2009-10-02 17:33:40 +0000
+++ b/po/templates.pot 2009-10-24 20:56:58 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: openoffice....@packages.debian.org\n"
-"POT-Creation-Date: 2009-10-01 18:01+0200\n"
+"POT-Creation-Date: 2009-10-24 12:39+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <em...@address>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -19,23 +19,23 @@
#. Type: error
#. Description
#: ../templates:1001
-msgid "OpenOffice.org running!"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid ""
-"OpenOffice.org is running right now. A running OpenOffice.org makes "
-"extension (de-)registration not possible and it causes problems with (de-)"
-"registering components."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid ""
-"Please close OpenOffice.org (including an eventually running Quickstarter)."
+msgid "OpenOffice.org running"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"regstration of components and extensions."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
msgstr ""
#. Type: note
=== modified file 'po/tr.po'
--- a/po/tr.po 2009-10-02 10:23:26 +0000
+++ b/po/tr.po 2009-10-24 13:45:08 +0000
@@ -6,29 +6,35 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: openoffice....@packages.debian.org\n"
-"POT-Creation-Date: 2009-09-29 12:50+0200\n"
+"POT-Creation-Date: 2009-10-24 12:39+0200\n"
"PO-Revision-Date: 2009-10-02 14:11+0400\n"
"Last-Translator: Rail Aliev <r...@i-rs.ru>\n"
-"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Virtaal 0.4.0\n"
#. Type: error
#. Description
#: ../templates:1001
-msgid "OpenOffice.org running!"
+#, fuzzy
+#| msgid "OpenOffice.org running!"
+msgid "OpenOffice.org running"
msgstr "OpenOffice.org çalışıyor!"
#. Type: error
#. Description
#: ../templates:1001
+#, fuzzy
+#| msgid ""
+#| "OpenOffice.org is running right now. A running OpenOffice.org makes "
+#| "extension (de-)registration not possible and it causes problems with (de-)"
+#| "registering components."
msgid ""
-"OpenOffice.org is running right now. A running OpenOffice.org makes "
-"extension (de-)registration not possible and it causes problems with "
-"(de-)registering components."
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"regstration of components and extensions."
msgstr ""
"OpenOffice.org şu anda çalışıyor. Çalışan OpenOffice.org eklentilerin "
"kurulum ve kaldırmasını imkansız kılıyor ve bileşenlerin kaydı sırasında "
@@ -38,5 +44,11 @@
#. Description
#: ../templates:1001
msgid ""
-"Please close OpenOffice.org (including an eventually running Quickstarter)."
-msgstr "Lütfen OpenOffice.org uygulamasını kapatın (hızlı başlatıcı dahil)."
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+
+#~ msgid ""
+#~ "Please close OpenOffice.org (including an eventually running "
+#~ "Quickstarter)."
+#~ msgstr "Lütfen OpenOffice.org uygulamasını kapatın (hızlı başlatıcı dahil)."
=== modified file 'rules'
--- a/rules 2009-10-24 01:01:17 +0000
+++ b/rules 2009-10-24 20:56:58 +0000
@@ -1012,6 +1012,8 @@
ifeq "$(USE_SYSTEM_LUCENE)" "y"
BUILD_DEPS += , liblucene2-java (>= 2.3.2) [$(OOO_JAVA_ARCHS)]
LUCENE_DEPENDS = liblucene2-java (>= 2.3.2)
+ # safety measure; e.g. lucene 2.9 index cannot be handled by lucene 2.4
+ LUCENE_CONFLICTS = liblucene2-java (<< $(shell dpkg -l liblucene2-java
| grep ^ii | awk '{ print $$3 }' | cut -d. -f1,2)~)
CONFIGURE_FLAGS += --with-system-lucene
--with-lucene-core-jar=/usr/share/java/lucene-core.jar
--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
endif
ifeq "$(USE_SYSTEM_HSQLDB)" "y"
@@ -3474,6 +3476,7 @@
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
-V'java-common-java-depends=$(JAVA_COMMON_JAVA_DEPENDS)' \
-V'lucene-depends=$(LUCENE_DEPENDS)' \
+ -V'lucene-conflicts=$(LUCENE_CONFLICTS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
=== modified file 'templates'
--- a/templates 2009-10-07 22:56:35 +0000
+++ b/templates 2009-10-24 20:56:58 +0000
@@ -1,9 +1,10 @@
Template: openoffice.org/running
Type: error
-_Description: OpenOffice.org running!
- OpenOffice.org is running right now. A running OpenOffice.org makes
- extension (de-)registration not possible and it causes problems with
- (de-)registering components.
+_Description: OpenOffice.org running
+ OpenOffice.org is running right now. This can cause problems with
+ (de-)regstration of components and extensions.
.
- Please close OpenOffice.org (including an eventually running Quickstarter).
+ You should close all running instances of OpenOffice.org (including
+ any currently running Quickstarter) before proceeding with the package
+ upgrade.
