------------------------------------------------------------
revno: 1410
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Sat 2009-02-21 14:59:11 +0100
message:
make -common also conflict against openoffice.orgVER-core (<<
${Source-Version})
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-02-20 17:43:28 +0000
+++ b/changelog 2009-02-21 13:59:11 +0000
@@ -1,13 +1,16 @@
openoffice.org (1:3.0.1-2.3pre) unstable; urgency=low
* ooo-build:
- - update (r15380)
+ - update (r15395)
* debian/rules:
- build with boost 1.37
- add libdbX.Y-dbg to DBG_DBG_SUGGESTS
- @ICONVERSION@ is 3 and not 30 (closes: #516257)
+ * debian/control.in:
+ - add Conflicts: openoffice.org-core (<< ${Source-Version}) for
+ openoffice.org-common (closes: #516090)
- -- Rene Engelhard <r...@debian.org> Thu, 19 Feb 2009 23:16:45 +0100
+ -- Rene Engelhard <r...@debian.org> Sat, 21 Feb 2009 14:09:31 +0100
openoffice.org (1:3.0.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-02-19 21:41:40 +0000
+++ b/control 2009-02-21 13:59:11 +0000
@@ -102,7 +102,7 @@
Package: openoffice.org-core
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol,
${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
-Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled,
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-bin, openoffice.org2-core,
openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell,
openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<<
${Source-Version}), openoffice.org-impress (<< ${Source-Version}),
openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<<
${Source-Version}), openoffice.org-gtk (<< ${Source-Version}),
openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<<
${Source-Version}), openoffice.org-evolution (<< ${Source-Version}),
openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean
(<< ${Source-Version}), openoffice.org-dev (<< ${Source-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
+Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled,
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-bin, openoffice.org2-core,
openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell,
openoffice.org-core (<< ${Source-Version}), openoffice.org-calc (<<
${Source-Version}), openoffice.org-writer (<< ${Source-Version}),
openoffice.org-impress (<< ${Source-Version}), openoffice.org-draw (<<
${Source-Version}), openoffice.org-base (<< ${Source-Version}),
openoffice.org-gtk (<< ${Source-Version}), openoffice.org-gnome (<<
${Source-Version}), openoffice.org-kde (<< ${Source-Version}),
openoffice.org-evolution (<< ${Source-Version}), openoffice.org-filter-so52 (<<
${Source-Version}), openoffice.org-officebean (<< ${Source-Version}),
openoffice.org-dev (<< ${Source-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
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell
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)
Description: OpenOffice.org office suite architecture dependent files
=== modified file 'control.in'
--- a/control.in 2009-02-05 23:21:46 +0000
+++ b/control.in 2009-02-21 13:59:11 +0000
@@ -214,6 +214,7 @@
openoffice.org-crashrep,
openoffice.org2-hunspell,
openoffice.org-hunspell,
+ openoffice.orgVER-core (<< ${Source-Version}),
openoffice.orgVER-calc (<< ${Source-Version}),
openoffice.orgVER-writer (<< ${Source-Version}),
openoffice.orgVER-impress (<< ${Source-Version}),
