------------------------------------------------------------
revno: 2232
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Mon 2010-12-13 19:28:31 +0100
message:
remove libreoffice-core conflicts against itself
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2010-12-08 21:32:15 +0000
+++ b/changelog 2010-12-13 18:28:31 +0000
@@ -4,8 +4,11 @@
- re-enable sdbc-postgresql
- add conditional for squeeze-backports (Daniel Baumann)
(closes: #606368)
+ * debian/control.in:
+ - remove libreoffice-core conflicts against itself, thanks Julian
+ Andres Klode (closes: #606480)
- -- Rene Engelhard <[email protected]> Tue, 07 Dec 2010 10:10:55 +0100
+ -- Rene Engelhard <[email protected]> Mon, 13 Dec 2010 19:26:30 +0100
libreoffice (1:3.3.0~rc1-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2010-12-07 13:47:02 +0000
+++ b/control 2010-12-13 18:28:31 +0000
@@ -106,7 +106,7 @@
Package: libreoffice-core
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
Depends: libreoffice-common (>> ${base-version}), ttf-opensymbol (>= 1:3.0),
${shlibs:Depends}, ure (>= 1.5.1+OOo3.1.1-15), fontconfig,
${mozilla-nss-depends}, ${misc:Depends}
-Conflicts: libreoffice-thesaurus, libreoffice-l10n-1.9.108,
libreoffice-l10n-1.9.114, libreoffice-l10n-1.9.121, libreoffice-1.9.125,
oooqs-kde, ooqstart-gnome, libreoffice-help-de (<< 2.0), libreoffice-help-en
(<< 2.0), libreoffice-help-el (<< 2.0), libreoffice-help-es (<< 2.0),
libreoffice-help-fr (<< 2.0), libreoffice-help-it (<< 2.0), libreoffice-help-ja
(<< 2.0), libreoffice-help-ko (<< 2.0), libreoffice-help-pt-br (<< 2.0),
libreoffice-help-sv (<< 2.0), libreoffice-help-tr (<< 2.0),
libreoffice-help-zh-cn (<< 2.0), libreoffice-help-zh-tw (<< 2.0),
libreoffice-help-2.0.0, libreoffice-help-2.0.1, libreoffice-help-2.0.2,
libreoffice-help-2.0.3, libreoffice-help-2.4, libreoffice-help-3.1,
libreoffice-bin, libreoffice2-core, libreoffice-crashrep,
libreoffice2-hunspell, libreoffice-hunspell, libreoffice-core (<<
${binary:Version}), libreoffice-calc (<< ${binary:Version}), libreoffice-writer
(<< ${binary:Version}), libreoffice-impress (<< ${binary:Version}),
libreoffice-draw (
<< ${binary:Version}), libreoffice-base (<< ${binary:Version}),
libreoffice-gtk (<< ${binary:Version}), libreoffice-gnome (<<
${binary:Version}), libreoffice-kde (<< ${binary:Version}),
libreoffice-evolution (<< ${binary:Version}), libreoffice-filter-so52 (<<
${binary:Version}), libreoffice-officebean (<< ${binary:Version}),
libreoffice-dev (<< ${binary:Version}), libcairo2 (= 1.4.8-1), libicu38 (=
3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), libreoffice-qa-ui-tests (<<
${base-version}), libreoffice-qa-ui-tests (>= ${base-version}.1),
cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
+Conflicts: libreoffice-thesaurus, libreoffice-l10n-1.9.108,
libreoffice-l10n-1.9.114, libreoffice-l10n-1.9.121, libreoffice-1.9.125,
oooqs-kde, ooqstart-gnome, libreoffice-help-de (<< 2.0), libreoffice-help-en
(<< 2.0), libreoffice-help-el (<< 2.0), libreoffice-help-es (<< 2.0),
libreoffice-help-fr (<< 2.0), libreoffice-help-it (<< 2.0), libreoffice-help-ja
(<< 2.0), libreoffice-help-ko (<< 2.0), libreoffice-help-pt-br (<< 2.0),
libreoffice-help-sv (<< 2.0), libreoffice-help-tr (<< 2.0),
libreoffice-help-zh-cn (<< 2.0), libreoffice-help-zh-tw (<< 2.0),
libreoffice-help-2.0.0, libreoffice-help-2.0.1, libreoffice-help-2.0.2,
libreoffice-help-2.0.3, libreoffice-help-2.4, libreoffice-help-3.1,
libreoffice-bin, libreoffice2-core, libreoffice-crashrep,
libreoffice2-hunspell, libreoffice-hunspell, libreoffice-calc (<<
${binary:Version}), libreoffice-writer (<< ${binary:Version}),
libreoffice-impress (<< ${binary:Version}), libreoffice-draw (<<
${binary:Version}), libreoffice-base (
<< ${binary:Version}), libreoffice-gtk (<< ${binary:Version}),
libreoffice-gnome (<< ${binary:Version}), libreoffice-kde (<<
${binary:Version}), libreoffice-evolution (<< ${binary:Version}),
libreoffice-filter-so52 (<< ${binary:Version}), libreoffice-officebean (<<
${binary:Version}), libreoffice-dev (<< ${binary:Version}), libcairo2 (=
1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22),
libreoffice-qa-ui-tests (<< ${base-version}), libreoffice-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), libreoffice-hyphenation-hr (<< 20060617-2),
libreoffice-hyphenation-pl (<< 1:3.0a-3)
, libreoffice-hyphenation-sh (<< 1:3.1.0-3), libreoffice-hyphenation-sr (<<
1:3.1.0-3), libreoffice-hyphenation-de (<< 1:3.1.0-3),
libreoffice-hyphenation-hu (<< 1:3.1.0-3), libreoffice-hyphenation-it (<<
1:3.1.0-3), libreoffice-hyphenation-sl (<< 1:3.1.0-3),
libreoffice-hyphenation-af (<< 1:3.1.0-3), libreoffice-hyphenation-zu (<<
1:3.1.0-3), libreoffice-hyphenation-fr (<< 1:3.1.0-3), libreoffice-thesaurus-it
(<< 2.0.7.gh.deb1-1.1), libreoffice-thesaurus-en-au (<< 2.1-5),
libreoffice-thesaurus-pl (<< 1.5-3), libreoffice-thesaurus-en-us (<<
1:3.1.0-3), libreoffice-thesaurus-cs (<< 1:3.1.0-3), libreoffice-thesaurus-sk
(<< 1:3.1.0-3), libreoffice-thesaurus-ru (<< 1:3.1.0-3),
libreoffice-thesaurus-ne (<< 1:3.1.0-3), libreoffice-thesaurus-hu (<<
1:3.1.0-3), libreoffice-thesaurus-fr (<< 1:3.1.0-3),
libreoffice-style-industrial
Provides: libreoffice-bundled, libreoffice2-core, libreoffice-java,
libreoffice2-hunspell, libreoffice-hunspell, libreoffice-headless
Replaces: libreoffice-bin, libreoffice (<< 1.9), libreoffice-gtk (<<
2.0.3+2.0.4m179), libreoffice2-core, libreoffice-java, libreoffice2-hunspell,
libreoffice-hunspell, libreoffice-common (<< 1:3.0.1~rc1-2), libreoffice-calc
(<< 2.2.1~oof680m15-2), libreoffice-headless (<< 1:3.0.0~dev300m26),
libreoffice-filter-binfilter (<< 1:3.1.0-5)
=== modified file 'control.in'
--- a/control.in 2010-11-27 21:26:00 +0000
+++ b/control.in 2010-12-13 18:28:31 +0000
@@ -222,7 +222,6 @@
libreoffice-crashrep,
libreoffice2-hunspell,
libreoffice-hunspell,
- libreofficeVER-core (<< ${binary:Version}),
libreofficeVER-calc (<< ${binary:Version}),
libreofficeVER-writer (<< ${binary:Version}),
libreofficeVER-impress (<< ${binary:Version}),
