./packages/openofficeorg/3.0.1/experimental r1381: Breaks: -> Conflicts:
------------------------------------------------------------
revno: 1381
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-01-20 10:07:51 +0100
message:
Breaks: -> Conflicts:
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-01-19 15:50:30 +0000
+++ b/changelog 2009-01-20 09:07:51 +0000
@@ -7,10 +7,12 @@
- update xulrunner build-dep in MOZILLA=libxul case for current reality
* debian/control.in:
- make -common conflict against dictionaries-common (<< 0.98.14)
+ - move from Breaks: to Conflicts: as otherwise the experimental buildds
+ fail to install -common...
* merge from Ubuntu:
- make ure only Suggest a JRE
- -- Rene Engelhard <rene@debian.org> Mon, 19 Jan 2009 16:13:35 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 20 Jan 2009 09:49:31 +0100
openoffice.org (1:3.0.1~rc2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2009-01-19 01:32:14 +0000
+++ b/control 2009-01-20 09:07:51 +0000
@@ -117,8 +117,7 @@
Depends: openoffice.org-style-galaxy
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
-Breaks: openclipart-openoffice.org (<= 0.18+dfsg-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-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}), dictionaries-common (<< 0.98.14)
+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-5), dictionaries-common (<< 0.98.14)
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: OpenOffice.org office suite architecture independent files
=== modified file 'control.in'
--- a/control.in 2009-01-19 01:32:14 +0000
+++ b/control.in 2009-01-20 09:07:51 +0000
@@ -261,7 +261,6 @@
openoffice.orgVER-style-hicontrast
Recommends: openoffice.orgVER-style-tango,
openoffice.orgVER-style-crystal
-Breaks: openclipart-openoffice.org (<= 0.18+dfsg-5)
Conflicts: openoffice.org-debian-files,
openoffice.org-mimelnk,
openoffice.org2-common,
@@ -276,6 +275,7 @@
openoffice.org-draw (<< ${base-version}),
openoffice.org-math (<< ${base-version}),
broffice.org (<< ${base-version}),
+ openclipart-openoffice.org (<= 0.18+dfsg-5),
dictionaries-common (<< 0.98.14)
Provides: openoffice.org2-common,
openoffice.org-l10n-en-us
Reply to: