------------------------------------------------------------
revno: 1554
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2009-05-18 23:50:39 +0200
message:
remove oobsolete conflicts
modified:
control
control.in
=== modified file 'control'
--- a/control 2009-05-17 11:18:55 +0000
+++ b/control 2009-05-18 21:50:39 +0000
@@ -116,7 +116,7 @@
Depends: openoffice.org-style-galaxy, ${misc:Depends}
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal,
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-core (=
2.0.4~rc3-1), 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)
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-05-17 11:18:55 +0000
+++ b/control.in 2009-05-18 21:50:39 +0000
@@ -273,7 +273,6 @@
openclipart-openoffice.org (<= 0.17+dfsg-4),
openoffice.org-l10n-en-us,
openoffice.org-debian-menus,
- openoffice.org-core (= 2.0.4~rc3-1),
openoffice.org-base (<< ${base-version}),
openoffice.org-writer (<< ${base-version}),
openoffice.org-calc (<< ${base-version}),
