./packages/openofficeorg/3.0/experimental r1302: make -common conflict against older broffice.orgs
------------------------------------------------------------
revno: 1302
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-10-30 15:57:32 +0100
message:
make -common conflict against older broffice.orgs
modified:
control
control.in
=== modified file 'control'
--- a/control 2008-10-21 21:26:04 +0000
+++ b/control 2008-10-30 14:57:32 +0000
@@ -117,7 +117,7 @@
Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, openoffice.org-style-galaxy
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
-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})
+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})
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)
Description: OpenOffice.org office suite architecture independent files
=== modified file 'control.in'
--- a/control.in 2008-10-12 13:33:42 +0000
+++ b/control.in 2008-10-30 14:57:32 +0000
@@ -274,7 +274,8 @@
openoffice.org-calc (<< ${base-version}),
openoffice.org-impress (<< ${base-version}),
openoffice.org-draw (<< ${base-version}),
- openoffice.org-math (<< ${base-version})
+ openoffice.org-math (<< ${base-version}),
+ broffice.org (<< ${base-version})
Provides: openoffice.org2-common,
openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files,
Reply to: