./packages/openofficeorg/3.2/experimental r1717: also conflict against openoffice.org-help-2.4.1
------------------------------------------------------------
revno: 1717
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2009-11-29 23:04:53 +0100
message:
also conflict against openoffice.org-help-2.4.1
modified:
control
control.in
=== modified file 'control'
--- a/control 2009-11-29 14:50:49 +0000
+++ b/control 2009-11-29 22:04:53 +0000
@@ -102,7 +102,7 @@
Package: openoffice.org-core
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
-Conflicts: openoffice.org-thesaurus, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-help-3.1.1, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-core (<< ${binary:Version}), openoffice.org-calc (<< ${binary:Version}), openoffice.org-writer (<< ${binary:
Version}), openoffice.org-impress (<< ${binary:Version}), openoffice.org-draw (<< ${binary:Version}), openoffice.org-base (<< ${binary:Version}), openoffice.org-gtk (<< ${binary:Version}), openoffice.org-gnome (<< ${binary:Version}), openoffice.org-kde (<< ${binary:Version}), openoffice.org-evolution (<< ${binary:Version}), openoffice.org-filter-so52 (<< ${binary:Version}), openoffice.org-officebean (<< ${binary:Version}), openoffice.org-dev (<< ${binary:Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
+Conflicts: openoffice.org-thesaurus, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-help-2.4.1, openoffice.org-help-3.1.1, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-core (<< ${binary:Version}), openoffice.org-calc (<< ${binary:Version}), openoffi
ce.org-writer (<< ${binary:Version}), openoffice.org-impress (<< ${binary:Version}), openoffice.org-draw (<< ${binary:Version}), openoffice.org-base (<< ${binary:Version}), openoffice.org-gtk (<< ${binary:Version}), openoffice.org-gnome (<< ${binary:Version}), openoffice.org-kde (<< ${binary:Version}), openoffice.org-evolution (<< ${binary:Version}), openoffice.org-filter-so52 (<< ${binary:Version}), openoffice.org-officebean (<< ${binary:Version}), openoffice.org-dev (<< ${binary:Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), openoffice.org-hyphenation-hr (<< 20060617-2), openoffice.org-hyphenation-pl (<< 1:3
.0a-3), openoffice.org-hyphenation-sh (<< 1:3.1.0-3), openoffice.org-hyphenation-sr (<< 1:3.1.0-3), openoffice.org-hyphenation-de (<< 1:3.1.0-3), openoffice.org-hyphenation-hu (<< 1:3.1.0-3), openoffice.org-hyphenation-it (<< 1:3.1.0-3), openoffice.org-hyphenation-sl (<< 1:3.1.0-3), openoffice.org-hyphenation-af (<< 1:3.1.0-3), openoffice.org-hyphenation-zu (<< 1:3.1.0-3), openoffice.org-hyphenation-fr (<< 1:3.1.0-3), openoffice.org-thesaurus-it (<< 2.0.7.gh.deb1-1.1), openoffice.org-thesaurus-en-au (<< 2.1-5), openoffice.org-thesaurus-pl (<< 1.5-3), openoffice.org-thesaurus-en-us (<< 1:3.1.0-3), openoffice.org-thesaurus-cs (<< 1:3.1.0-3), openoffice.org-thesaurus-sk (<< 1:3.1.0-3), openoffice.org-thesaurus-ru (<< 1:3.1.0-3), openoffice.org-thesaurus-ne (<< 1:3.1.0-3), openoffice.org-thesaurus-hu (<< 1:3.1.0-3), openoffice.org-thesaurus-fr (<< 1:3.1.0-3)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-headless
Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<< 2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<< 1:3.0.1~rc1-2), openoffice.org-calc (<< 2.2.1~oof680m15-2), openoffice.org-headless (<< 1:3.0.0~dev300m26), openoffice.org-filter-binfilter (<< 1:3.1.0-5)
=== modified file 'control.in'
--- a/control.in 2009-11-28 21:28:38 +0000
+++ b/control.in 2009-11-29 22:04:53 +0000
@@ -211,6 +211,7 @@
openoffice.org-help-2.0.1,
openoffice.org-help-2.0.2,
openoffice.org-help-2.0.3,
+ openoffice.org-help-2.4.1,
openoffice.org-help-3.1.1,
openoffice.org-bin,
openoffice.org2-core,
Reply to: