------------------------------------------------------------
revno: 1782 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Wed 2010-01-27 00:36:49 +0100
message:
update ooo-build; merge
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2010-01-26 15:52:19 +0000
+++ b/changelog 2010-01-26 23:36:49 +0000
@@ -3,7 +3,7 @@
* OpenOffice.org 3.2.0 release candidate 4 (OOO320_m11)
* ooo-build:
- - update (4c3db7b08f45929d478bf563a2e2a6b5a04a47ef)
+ - update (3bf5f22210833d97e3ea0093c2210c5adf800958)
- src: add fixed es GSI from issue 108563
* debian/rules:
@@ -23,7 +23,7 @@
* debian/control.presenter.in: depend on (our) OOo 3.2
* debian/control.in: Breaks: openoffice.org-presenter-console (<< 1.0.3~)
- -- Rene Engelhard <r...@debian.org> Tue, 26 Jan 2010 16:51:33 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 27 Jan 2010 00:20:52 +0100
openoffice.org (1:3.2.0~rc3-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2010-01-26 14:06:37 +0000
+++ b/control 2010-01-26 23:36: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), openoffice.org-writer2latex (<< 1.0-5)
+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),
openoffice.org-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8)
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 2010-01-26 14:06:37 +0000
+++ b/control.in 2010-01-26 23:36:49 +0000
@@ -291,7 +291,8 @@
dictionaries-common (<< 0.98.14),
openoffice.orgVER-core (<< 1:${basis-version}),
openoffice.orgVER-core (>= 1:${basis-version}.99),
- openoffice.org-writer2latex (<< 1.0-5)
+ openoffice.org-writer2latex (<< 1.0-5),
+ openoffice.org-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8)
Provides: openoffice.org2-common,
openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files,
