------------------------------------------------------------
revno: 1775 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Sun 2010-01-24 21:33:49 +0100
message:
merge
modified:
changelog
control
control.in
openoffice.org-common.templates.in
po/es.po
po/eu.po
po/fr.po
po/gl.po
po/it.po
shell-lib-components.sh
shell-lib-extensions.sh
=== modified file 'changelog'
--- a/changelog 2010-01-23 17:32:39 +0000
+++ b/changelog 2010-01-24 20:33:49 +0000
@@ -15,8 +15,10 @@
* debian/shell-lib-{extensions,components}.sh: add echos instead of debconf
message on DEBIAN_FRONTEND = noninteractive so that people in that case
also
know what goes on
+ * debian/openoffice.org-common.tenplates,in, debian/rules, debian/po*: Move
+ debconf template to shared/openofficeorg-running (see #566644(; Unfuzzy.
- -- Rene Engelhard <r...@debian.org> Fri, 22 Jan 2010 16:28:37 +0100
+ -- Rene Engelhard <r...@debian.org> Sun, 24 Jan 2010 21:00:28 +0100
openoffice.org (1:3.2.0~rc3-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2010-01-20 23:40:48 +0000
+++ b/control 2010-01-24 20:33:49 +0000
@@ -118,7 +118,7 @@
Depends: openoffice.org-style-default | openoffice.org-style, ${misc:Depends},
ure
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast,
openoffice.org-style-tango, openoffice.org-style-crystal,
openoffice.org-style-oxygen
Recommends: xfonts-mathml
-Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk,
openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-base (<<
${base-version}), openoffice.org-writer (<< ${base-version}),
openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<<
${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math
(<< ${base-version}), broffice.org (<< ${base-version}),
openclipart-openoffice.org (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14),
openoffice.org-core (<< 1:${basis-version}), openoffice.org-core (>=
1:${basis-version}.99)
+Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk,
openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-base (<<
${base-version}), openoffice.org-writer (<< ${base-version}),
openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<<
${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math
(<< ${base-version}), broffice.org (<< ${base-version}),
openclipart-openoffice.org (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14),
openoffice.org-core (<< 1:${basis-version}), openoffice.org-core (>=
1:${basis-version}.99), openoffice.org-writer2latex (<< 1.0-5)
Provides: openoffice.org2-common, openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org
(<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us,
openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base
(<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<<
2.2.1~rc1-1), openoffice.org-core (<< 1:3.0.1~rc1-3)
Description: full-featured office productivity suite -- arch-independent files
=== modified file 'control.in'
--- a/control.in 2009-12-27 21:55:16 +0000
+++ b/control.in 2010-01-24 20:33:49 +0000
@@ -290,7 +290,8 @@
openclipart-openoffice.org (<= 0.18+dfsg-7),
dictionaries-common (<< 0.98.14),
openoffice.orgVER-core (<< 1:${basis-version}),
- openoffice.orgVER-core (>= 1:${basis-version}.99)
+ openoffice.orgVER-core (>= 1:${basis-version}.99),
+ openoffice.org-writer2latex (<< 1.0-5)
Provides: openoffice.org2-common,
openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files,
=== modified file 'openoffice.org-common.templates.in'
--- a/openoffice.org-common.templates.in 2009-10-31 17:05:15 +0000
+++ b/openoffice.org-common.templates.in 2010-01-24 20:33:49 +0000
@@ -7,7 +7,7 @@
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
-Template: openoffice.org/running
+Template: shared/openofficeorg-running
Type: error
_Description: OpenOffice.org running
OpenOffice.org is running right now. This can cause problems with
=== modified file 'po/es.po'
--- a/po/es.po 2009-11-06 10:08:24 +0000
+++ b/po/es.po 2010-01-24 20:06:59 +0000
@@ -45,10 +45,6 @@
#. Type: error
#. Description
#: ../openoffice.org-common.templates.in:2001
-#, fuzzy
-#| msgid ""
-#| "OpenOffice.org is running right now. This can cause problems with (de-)"
-#| "regstration of components and extensions."
msgid ""
"OpenOffice.org is running right now. This can cause problems with (de-)"
"registration of components and extensions."
=== modified file 'po/eu.po'
--- a/po/eu.po 2009-10-31 12:05:40 +0000
+++ b/po/eu.po 2010-01-24 20:06:59 +0000
@@ -27,10 +27,6 @@
#. Type: error
#. Description
#: ../openoffice.org-common.templates.in:2001
-#, fuzzy
-#| msgid ""
-#| "OpenOffice.org is running right now. This can cause problems with (de-)"
-#| "regstration of components and extensions."
msgid ""
"OpenOffice.org is running right now. This can cause problems with (de-)"
"registration of components and extensions."
=== modified file 'po/fr.po'
--- a/po/fr.po 2009-11-05 08:20:59 +0000
+++ b/po/fr.po 2010-01-24 20:06:59 +0000
@@ -42,8 +42,3 @@
"Vous devriez fermer toutes les instances d'OpenOffice.org actuellement "
"ouvertes (y compris les Quickstarter) avant de mettre à jour le paquet."
-#~ msgid ""
-#~ "Please close OpenOffice.org (including an eventually running "
-#~ "Quickstarter)."
-#~ msgstr ""
-#~ "Merci de fermer OpenOffice.org (y compris Quickstarter s'il est lancé)."
=== modified file 'po/gl.po'
--- a/po/gl.po 2009-11-09 04:31:35 +0000
+++ b/po/gl.po 2010-01-24 20:06:59 +0000
@@ -25,10 +25,6 @@
#. Type: error
#. Description
#: ../openoffice.org-common.templates.in:2001
-#, fuzzy
-#| msgid ""
-#| "OpenOffice.org is running right now. This can cause problems with (de-)"
-#| "regstration of components and extensions."
msgid ""
"OpenOffice.org is running right now. This can cause problems with (de-)"
"registration of components and extensions."
=== modified file 'po/it.po'
--- a/po/it.po 2009-11-13 16:31:08 +0000
+++ b/po/it.po 2010-01-24 20:06:59 +0000
@@ -25,10 +25,6 @@
#. Type: error
#. Description
#: ../openoffice.org-common.templates.in:2001
-#, fuzzy
-#| msgid ""
-#| "OpenOffice.org is running right now. This can cause problems with (de-)"
-#| "regstration of components and extensions."
msgid ""
"OpenOffice.org is running right now. This can cause problems with (de-)"
"registration of components and extensions."
=== modified file 'shell-lib-components.sh'
--- a/shell-lib-components.sh 2010-01-23 17:32:17 +0000
+++ b/shell-lib-components.sh 2010-01-24 20:06:59 +0000
@@ -16,7 +16,7 @@
echo "upgrade." >&2
exit 1
else
- db_input high openoffice.org/running
+ db_input high shared/openofficeorg-running
db_go
# try again in case OOo got closed before
hitting OK
PID=`pgrep soffice.bin | head -n 1`
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2010-01-23 17:31:47 +0000
+++ b/shell-lib-extensions.sh 2010-01-24 20:06:59 +0000
@@ -16,7 +16,7 @@
echo "upgrade." >&2
exit 1
else
- db_input high openoffice.org/running
+ db_input high shared/openofficeorg-running
db_go
# try again in case OOo got closed before
hitting OK
PID=`pgrep soffice.bin | head -n 1`
