./packages/openofficeorg/3.1.1/unstable r1832: also conflict against openoffice.org-coooder using openoffice.org/running
------------------------------------------------------------
revno: 1832
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2010-01-27 00:35:16 +0100
message:
also conflict against openoffice.org-coooder using openoffice.org/running
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2010-01-26 23:30:53 +0000
+++ b/changelog 2010-01-26 23:35:16 +0000
@@ -16,7 +16,7 @@
* debian/openoffice.org-common.tenplates,in, debian/rules, debian/po*: Move
debconf template to shared/openofficeorg-running (see #566644); Unfuzzy.
- -- Rene Engelhard <rene@debian.org> Tue, 26 Jan 2010 22:37:19 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 27 Jan 2010 00:35:10 +0100
openoffice.org (1:3.1.1-14) unstable; urgency=medium
=== modified file 'control'
--- a/control 2010-01-24 20:06:59 +0000
+++ b/control 2010-01-26 23:35:16 +0000
@@ -115,7 +115,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-24 20:06:59 +0000
+++ b/control.in 2010-01-26 23:35:16 +0000
@@ -287,7 +287,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,
Reply to: