------------------------------------------------------------
revno: 2104
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2010-09-17 11:48:13 +0200
message:
update/add Breaks: for industrial (which is gone)
modified:
control
control.in
=== modified file 'control'
--- a/control 2010-09-16 21:55:59 +0000
+++ b/control 2010-09-17 09:48:13 +0000
@@ -19,7 +19,7 @@
Conflicts: openoffice.org2 (<< ${binary:Version}), openoffice.org-java-common
(<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${binary:Version}), openoffice.org-debian-files
Provides: openoffice.org2
-Breaks: openoffice.org-style-crystal (<< 1:3.2.0~beta),
openoffice.org-style-oxygen (<< 1:3.2.0~beta), openoffice.org-style-industrial
(<< 1:3.2.0~beta), openoffice.org-style-tango (<< 1:3.2.0~beta),
openoffice.org-style-hicontrast (<< 1:3.2.0~beta), openoffice.org-style-galaxy
(<< 1:3.2.0~beta), openoffice.org-style-andromeda (<< 1:3.2.0~beta)
+Breaks: openoffice.org-style-crystal (<< 1:3.2.0~beta),
openoffice.org-style-oxygen (<< 1:3.2.0~beta), openoffice.org-style-industrial,
openoffice.org-style-tango (<< 1:3.2.0~beta), openoffice.org-style-hicontrast
(<< 1:3.2.0~beta), openoffice.org-style-galaxy (<< 1:3.2.0~beta),
openoffice.org-style-andromeda (<< 1:3.2.0~beta)
Description: office productivity suite
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -106,6 +106,7 @@
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)
+Breaks: openoffice.org-style-industrial
Description: office productivity suite -- arch-dependent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -123,14 +124,13 @@
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)
Breaks: openoffice.org-style-crystal (<< 1:${basis-version}~),
openoffice.org-style-oxygen (<< 1:${basis-version}~),
- openoffice.org-style-industrial (<< 1:${basis-version}~),
+ openoffice.org-style-industrial,
openoffice.org-style-tango (<< 1:${basis-version}~),
openoffice.org-style-hicontrast (<< 1:${basis-version}~),
openoffice.org-style-galaxy (<< 1:${basis-version}~),
openoffice.org-style-andromeda (<< 1:${basis-version}~),
openoffice.org-style-crystal (>= 1:${next-basis-version}~),
openoffice.org-style-oxygen (>= 1:${next-basis-version}~),
- openoffice.org-style-industrial (>= 1:${next-basis-version}~),
openoffice.org-style-tango (>= 1:${next-basis-version}~),
openoffice.org-style-hicontrast (>= 1:${next-basis-version}~),
openoffice.org-style-galaxy (>= 1:${next-basis-version}~),
=== modified file 'control.in'
--- a/control.in 2010-09-16 20:43:33 +0000
+++ b/control.in 2010-09-17 09:48:13 +0000
@@ -97,7 +97,7 @@
Conflicts: openoffice.org2 (<< ${binary:Version}),
openoffice.orgVER-java-common (<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${binary:Version}), openoffice.org-debian-files
Provides: openoffice.org2
-Breaks: openoffice.org-style-crystal (<< 1:3.2.0~beta),
openoffice.org-style-oxygen (<< 1:3.2.0~beta), openoffice.org-style-industrial
(<< 1:3.2.0~beta), openoffice.org-style-tango (<< 1:3.2.0~beta),
openoffice.org-style-hicontrast (<< 1:3.2.0~beta), openoffice.org-style-galaxy
(<< 1:3.2.0~beta), openoffice.org-style-andromeda (<< 1:3.2.0~beta)
+Breaks: openoffice.org-style-crystal (<< 1:3.2.0~beta),
openoffice.org-style-oxygen (<< 1:3.2.0~beta), openoffice.org-style-industrial,
openoffice.org-style-tango (<< 1:3.2.0~beta), openoffice.org-style-hicontrast
(<< 1:3.2.0~beta), openoffice.org-style-galaxy (<< 1:3.2.0~beta),
openoffice.org-style-andromeda (<< 1:3.2.0~beta)
Description: office productivity suite
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -256,6 +256,7 @@
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)
+Breaks: openoffice.org-style-industrial
Description: office productivity suite -- arch-dependent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -309,14 +310,13 @@
openoffice.org-core (<< 1:3.0.1~rc1-3)
Breaks: openoffice.orgVER-style-crystal (<< 1:${basis-version}~),
openoffice.orgVER-style-oxygen (<< 1:${basis-version}~),
- openoffice.orgVER-style-industrial (<< 1:${basis-version}~),
+ openoffice.orgVER-style-industrial,
openoffice.orgVER-style-tango (<< 1:${basis-version}~),
openoffice.orgVER-style-hicontrast (<< 1:${basis-version}~),
openoffice.orgVER-style-galaxy (<< 1:${basis-version}~),
openoffice.orgVER-style-andromeda (<< 1:${basis-version}~),
openoffice.orgVER-style-crystal (>= 1:${next-basis-version}~),
openoffice.orgVER-style-oxygen (>= 1:${next-basis-version}~),
- openoffice.orgVER-style-industrial (>= 1:${next-basis-version}~),
openoffice.orgVER-style-tango (>= 1:${next-basis-version}~),
openoffice.orgVER-style-hicontrast (>= 1:${next-basis-version}~),
openoffice.orgVER-style-galaxy (>= 1:${next-basis-version}~),
