------------------------------------------------------------ revno: 2260 committer: Matthias Klose <d...@canonical.com> branch nick: experimental timestamp: Tue 2010-12-28 11:06:04 +0100 message: * debian/control*.in: - Remove obsolete OOo conflicts, replaces and provides. modified: changelog control.fonts.in control.help.in control.in control.kde.in control.lang.in control.ogltrans.in control.postgresql.in control.presenter.in control.reportdesign.in control.sdk.in control.ure.in
=== modified file 'changelog' --- a/changelog 2010-12-27 18:24:21 +0000 +++ b/changelog 2010-12-28 10:06:04 +0000 @@ -12,6 +12,8 @@ * debian/rules: - Remove leading whitespaces. - Avoid some duplicate shell calls. + * debian/control*.in: + - Remove obsolete OOo conflicts, replaces and provides. -- Rene Engelhard <r...@debian.org> Mon, 27 Dec 2010 19:21:32 +0100
=== modified file 'control.fonts.in' --- a/control.fonts.in 2010-10-12 00:40:55 +0000 +++ b/control.fonts.in 2010-12-28 10:06:04 +0000 @@ -1,7 +1,6 @@ Package: ttf-opensymbol Section: fonts Architecture: all -Replaces: libreoffice (<= 1.1.1+1.1.2rc3) Depends: ${misc:Depends} Recommends: fontconfig Description: OpenSymbol TrueType font === modified file 'control.help.in' --- a/control.help.in 2010-10-12 00:40:55 +0000 +++ b/control.help.in 2010-12-28 10:06:04 +0000 @@ -4,9 +4,7 @@ Recommends: libreofficeVER-core (>> ${base-version}) | language-support-translatio...@ccode@, ${lucene-depends}, ${java-common-depends} Depends: libreofficeVER-writer | language-support-translatio...@ccode@, libreofficever-l1...@lcode@, ${misc:Depends} -Conflicts: libreoffice-common (<< 1:3.2.0~beta-1), - libreoffice-core (<< ${base-version}), - ${lucene-conflicts} +Conflicts: ${lucene-conflicts} Provides: libreoffice-help-${help-l10n-virtual-version} Description: office productivity suite -- @LNAME@ help LibreOffice is a full-featured office productivity suite that provides === modified file 'control.in' --- a/control.in 2010-12-17 03:12:46 +0000 +++ b/control.in 2010-12-28 10:06:04 +0000 @@ -95,10 +95,6 @@ ${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep} -Conflicts: libreoffice2 (<< ${binary:Version}), libreofficeVER-java-common (<< 1:3.0.0) -Replaces: libreoffice2 (<< ${binary:Version}), libreoffice-debian-files -Provides: libreoffice2 -Breaks: libreoffice-style-crystal (<< 1:3.2.0~beta), libreoffice-style-oxygen (<< 1:3.2.0~beta), libreoffice-style-industrial, libreoffice-style-tango (<< 1:3.2.0~beta), libreoffice-style-hicontrast (<< 1:3.2.0~beta), libreoffice-style-galaxy (<< 1:3.2.0~beta), libreoffice-style-andromeda (<< 1:3.2.0~beta) Description: office productivity suite LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -175,37 +171,6 @@ ${mozilla-nss-depends}, ${misc:Depends} Conflicts: libreofficeVER-unbundled, - libreoffice-thesaurus, - libreofficeVER-l10n-1.9.108, - libreofficeVER-l10n-1.9.114, - libreofficeVER-l10n-1.9.121, - libreofficeVER-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, libreofficeVER-calc (<< ${binary:Version}), libreofficeVER-writer (<< ${binary:Version}), libreofficeVER-impress (<< ${binary:Version}), @@ -221,28 +186,10 @@ 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: libreofficeVER-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) +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) +Provides: libreofficeVER-bundled Description: office productivity suite -- arch-dependent files LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -261,42 +208,9 @@ libreofficeVER-style-oxygen Recommends: xfonts-mathml, ${textcat-data-recommends} -Conflicts: libreoffice-debian-files, - libreoffice-mimelnk, - libreoffice2-common, - openclipart-libreoffice (<= 0.17+dfsg-4), - libreoffice-l10n-en-us, - libreoffice-debian-menus, - libreoffice-base (<< ${base-version}), - libreoffice-writer (<< ${base-version}), - libreoffice-calc (<< ${base-version}), - libreoffice-impress (<< ${base-version}), - libreoffice-draw (<< ${base-version}), - libreoffice-math (<< ${base-version}), - broffice.org (<< ${base-version}), - openclipart-libreoffice (<= 0.18+dfsg-7), - dictionaries-common (<< 0.98.14), - libreofficeVER-core (<< 1:${basis-version}), - libreofficeVER-core (>= 1:${next-basis-version}~), - libreoffice-writer2latex (<< 1.0-5), - libreoffice-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8), - libtextcat-data, +Conflicts: libtextcat-data, broffice -Provides: libreoffice2-common, - libreoffice-l10n-en-us -Replaces: libreoffice-debian-files, - libreoffice-mimelnk, - libreoffice (<< 1.9), - libreoffice2-common, - libreoffice-l10n-en-us, - libreoffice-l10n-en, - libreoffice-calc (<< 2.0.4~rc1), - libreoffice-base (<< 2.0.4~rc1), - libreoffice-math (<< 2.0.4~rc1), - broffice.org (<< 2.2.1~rc1-1), - libreoffice-core (<< 1:3.0.1~rc1-3), - openoffice.org-common (<< 1:3.3.0~), - broffice (<< 1:3.3.0~rc2~) +Provides: libreoffice-l10n-en-us Breaks: libreofficeVER-style-crystal (<< 1:${basis-version}~), libreofficeVER-style-oxygen (<< 1:${basis-version}~), libreofficeVER-style-industrial, @@ -323,14 +237,6 @@ ${java-common-java-depends}, ${misc:Depends} Suggests: ${common-bsh-depends} -Replaces: libreofficeVER-common (<< 2.0.3-4), - libreoffice2-java-common -Conflicts: libreoffice2-java-common, - libreoffice-filter-mobiledev (<= 2.2.0-4), - libreoffice-base (<= 2.2.0-4), - libreoffice-writer (<= 2.2.0-4), - libreoffice-officebean (<= 2.2.0-4) -Provides: libreoffice2-java-common Description: office productivity suite -- arch-independent Java support files LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -345,15 +251,6 @@ ${shlibs:Depends}, ${misc:Depends} Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, libreofficeVER-emailmerge, libreofficeVER-math -Replaces: libreoffice (<< 1.9), - libreoffice-debian-files, - libreoffice2-writer (<< ${binary:Version}), - libreoffice-common (<< 1:2.3.1), - openoffice.org-writer (<< 1:3.3.0~) -Conflicts: libreoffice-debian-files, - libreoffice2-writer (<< ${binary:Version}), - libreoffice-java-common (<= 1:2.3.1) -Provides: libreoffice2-writer Suggests: libreofficeVER-gcj, libreofficeVER-base Description: office productivity suite -- word processor @@ -369,17 +266,7 @@ ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends} -Replaces: libreoffice2-core (<< 1.9.113-0pre1), - libreoffice (<< 1.9), - libreoffice-debian-files, - libreoffice-core (<= 2.2.0-4), - libreoffice2-calc (<< ${binary:Version}), - libreoffice-common (<< 2.0.3+2.0.4m179), - openoffice.org-calc (<< 1:3.3.0~) -Conflicts: libreoffice-bin (<< 1.9), - libreoffice-debian-files, - libreoffice2-calc (<< ${binary:Version}) -Provides: libreoffice2-calc +Replaces: openoffice.org-calc (<< 1:3.3.0~) Description: office productivity suite -- spreadsheet LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -392,15 +279,7 @@ libreofficeVER-draw (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Replaces: libreoffice (<< 1.9), - libreoffice-debian-files, - libreoffice2-impress (<< ${binary:Version}), - libreoffice-common (<< 2.0.3+2.0.4m179), - openoffice.org-impress (<< 1:3.3.0~) -Provides: libreoffice2-impress -Conflicts: libreoffice-debian-files, - libreoffice2-impress (<< ${binary:Version}) -Breaks: libreoffice-presenter-console (<< 1.0.3~) +Replaces: openoffice.org-impress (<< 1:3.3.0~) Description: office productivity suite -- presentation LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -412,15 +291,7 @@ Depends: libreofficeVER-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Replaces: libreoffice (<< 1.9), - libreoffice-debian-files, - libreoffice2-draw (<< ${binary:Version}), - libreoffice-core (<< 1:3.1.1~rc1-2), - libreoffice-common (<< 2.0.3+2.0.4m179), - openoffice.org-draw (<< 1:3.3.0~) -Conflicts: libreoffice-debian-files, - libreoffice2-draw (<< ${binary:Version}) -Provides: libreoffice2-draw +Replaces: openoffice.org-draw (<< 1:3.3.0~) Description: office productivity suite -- drawing LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -433,14 +304,7 @@ ${shlibs:Depends}, ${misc:Depends}, ttf-opensymbol (>> 2:2.4.3~) -Replaces: libreoffice (<< 1.9), - libreoffice-debian-files, - libreoffice2-math (<< ${binary:Version}), - libreoffice-common (<< 2.0.3+2.0.4m179), - openoffice.org-math (<< 1:3.3.0~) -Conflicts: libreoffice-debian-files, - libreoffice2-math (<< ${binary:Version}) -Provides: libreoffice2-math +Replaces: openoffice.org-math (<< 1:3.3.0~) Description: office productivity suite -- equation editor LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -452,7 +316,6 @@ Depends: libreofficeVER-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Replaces: libreoffice-base (<< 1:2.3.1) Suggests: libreofficeVER-base Description: office productivity suite -- shared library LibreOffice is a full-featured office productivity suite that provides @@ -479,26 +342,7 @@ libmysql-java | libpg-java | libjtds-java, libreofficeVER-gcj, libreofficeVER-report-builder -Replaces: libreofficeVER-core (<< 2.0.1), - libreofficeVER-common (<< 1.9.113-0pre1), - libreoffice-bin (<< 1.9), - libreoffice-debian-files, - libreoffice2-base (<< ${binary:Version}), - libreoffice-java, - libreoffice-java-common (= 1:2.3.1-2~bpo40+1), - libreoffice-java-common (= 1:2.4.0-4~bpo40+1), - libreoffice-java-common (= 1:2.4.1-3~bpo40+1), - libreoffice-java-common (= 2.2.0-6~bpo.1), - libreoffice-java-common (= 2.2.1-1~bpo.1), - libreoffice-java-common (= 2.2.1-9~bpo40+1), - libreoffice-calc (<< 1:3.2.0~rc1), - openoffice.org-base (<< 1:3.3.0~) -Conflicts: libreoffice-debian-files, - libreoffice2-base (<< ${binary:Version}), - libreoffice-common (= 2.0.4-4), - libreoffice-report-builder (<< 1.2.0~), - libreoffice-report-builder-bin (<< 1:3.2.0~) -Provides: libreoffice2-base +Replaces: openoffice.org-base (<< 1:3.3.0~) Description: office productivity suite -- database LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -526,7 +370,6 @@ Architecture: all Depends: ${misc:Depends}, libreofficeVER-core (>= 1:3.2.0~beta) Suggests: kde-icons-crystal, crystalcursors -Replaces: libreofficeVER-common (<< 2.1~m190) Provides: libreofficeVER-style Description: office productivity suite -- Crystal symbol style LibreOffice is a full-featured office productivity suite that provides @@ -538,7 +381,6 @@ Architecture: all Depends: ${misc:Depends}, libreofficeVER-core (>= 1:3.2.0~beta) Suggests: kde-icons-oxygen, oxygencursors -Replaces: libreofficeVER-common (<< 2.1~m190) Provides: libreofficeVER-style Description: office productivity suite -- Oxygen symbol style LibreOffice is a full-featured office productivity suite that provides @@ -550,7 +392,6 @@ Architecture: all Depends: ${misc:Depends}, libreofficeVER-core (>= 1:3.2.0~beta) Suggests: tango-icon-theme -Replaces: libreofficeVER-common (<< 2.1~m190) Provides: libreofficeVER-style Description: office productivity suite -- Tango symbol style LibreOffice is a full-featured office productivity suite that provides @@ -563,7 +404,6 @@ Architecture: all Depends: ${misc:Depends}, libreofficeVER-core (>= 1:3.2.0~beta) Suggests: gtk2-engines -Replaces: libreofficeVER-common (<< 2.1~m190) Provides: libreofficeVER-style Description: office productivity suite -- Hicontrast symbol style LibreOffice is a full-featured office productivity suite that provides @@ -575,8 +415,6 @@ Package: libreofficeVER-style-galaxy Architecture: all Depends: ${misc:Depends}, libreofficeVER-core (>= 1:3.2.0~beta) -Replaces: libreofficeVER-common (<< 2.1~m190), libreofficeVER-style-default, libreoffice-style-andromeda -Conflicts: libreofficeVER-style-default Provides: libreofficeVER-style-default, libreofficeVER-style Description: office productivity suite -- Galaxy (Default) symbol style LibreOffice is a full-featured office productivity suite that provides @@ -589,7 +427,6 @@ Package: libreofficeVER-style-andromeda Architecture: all Depends: ${misc:Depends}, libreofficeVER-core (>= 1:3.2.0~beta) -Replaces: libreofficeVER-common (<< 2.1~m190) Provides: libreofficeVER-style Description: office productivity suite -- Andromeda (Classic) symbol style LibreOffice is a full-featured office productivity suite that provides @@ -608,9 +445,7 @@ Recommends: libreofficeVER-style-tango Section: gnome Enhances: libreofficeVER -Replaces: libreoffice-gnome (<< 2.0.4~rc1-0), - libreoffice-common (<< 2.0.4~rc1-0) -Conflicts: ooqstart-gnome, oooqs-kde, libgtk2.0-0 (= 2.12.10-1) [amd64] +Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64] Description: office productivity suite -- GTK+ integration LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -629,12 +464,7 @@ Suggests: libreofficeVER-evolution Section: gnome Enhances: libreofficeVER -Conflicts: libreoffice2-gnome (<< ${binary:Version}) -Provides: libreoffice-gtk-gnome, libreoffice2-gnome -Replaces: libreoffice-gtk-gnome, - libreoffice2-gnome (<< ${binary:Version}), - libreoffice-kde (= 2.0.1-1), - libreoffice-common (<< 2.0.4~rc1-0) +Provides: libreoffice-gtk-gnome Description: office productivity suite -- GNOME integration LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -655,9 +485,7 @@ ${libebook-dep}, ${misc:Depends} Recommends: evolution -Conflicts: libreoffice2-evolution (<< ${binary:Version}), ure (<< 1.5.1+OOo3.1.1-15) -Provides: libreoffice2-evolution -Replaces: libreoffice2-evolution (<< ${binary:Version}) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15) Description: office productivity suite -- Evolution addressbook support LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -688,7 +516,6 @@ ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Replaces: libreofficeVER-common (<< 1.9.82) Description: Python-UNO bridge The Python-UNO bridge allows use of the standard LibreOffice API with the Python scripting language. It additionally allows @@ -705,9 +532,6 @@ ${java-runtime-depends}, ${java-common-depends}, ${misc:Depends} -Replaces: libreofficeVER-common (<< 1.9.113-0pre1), libreoffice2-officebean -Provides: libreoffice2-officebean -Conflicts: libreoffice2-officebean Description: office productivity suite -- Java bean LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -721,14 +545,7 @@ Depends: libreofficeVER-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Replaces: libreoffice2-core (<= 1.9.108-1), - libreofficeVER-math (<< 1.9.113-0pre1), - libreofficeVER-calc (<< 1.9.113-0pre1), - libreoffice-core (<< 1:3.1.1~rc1-2), - libreoffice2-filter-so52, - libreoffice-filter-so52 -Provides: libreoffice2-filter-so52, libreoffice-filter-so52 -Conflicts: libreoffice2-filter-so52, libreoffice-filter-so52, ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15) Description: office productivity suite -- legacy filters (e.g. StarOffice 5.2) LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -747,7 +564,6 @@ Depends: ${java-runtime-depends}, ${java-common-depends}, ${misc:Depends} -Replaces: libreoffice-java-common (<< 2.0.3+2.0.4m178), libreoffice-common (<< 2.0.3+2.0.4m178) Description: office productivity suite -- mobile devices filters LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -763,8 +579,6 @@ Depends: xml-core, ${misc:Depends} Architecture: all -Replaces: libreoffice-common (<< 2.0.4~ood680) -Conflicts: libreoffice-common (<< 2.0.4~ood680) Description: office productivity suite -- legacy 1.0 XML DTD LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. === modified file 'control.kde.in' --- a/control.kde.in 2010-11-01 22:27:15 +0000 +++ b/control.kde.in 2010-12-28 10:06:04 +0000 @@ -9,9 +9,7 @@ libreofficeVER-kab Section: kde Enhances: libreofficeVER -Conflicts: libreoffice2-kde (<< ${binary:Version}) -Provides: libreoffice2-kde -Replaces: libreoffice2-kde (<< ${binary:Version}), openoffice.org-kde (<< 1:3.3.0~) +Replaces: openoffice.org-kde (<< 1:3.3.0~) Description: office productivity suite -- KDE integration LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -29,7 +27,6 @@ ${shlibs:Depends}, ${misc:Depends} Recommends: kaddressbook -Replaces: libreoffice-kde (<= 1:3.0.0~beta2-1) Conflicts: ure (<< 1.5.1+OOo3.1.1-15) Description: office productivity suite -- KDE adressbook support LibreOffice is a full-featured office productivity suite that provides === modified file 'control.lang.in' --- a/control.lang.in 2010-10-12 00:40:55 +0000 +++ b/control.lang.in 2010-12-28 10:06:04 +0000 @@ -4,16 +4,10 @@ Depends: @LOCALES_DEPENDS@, ${misc:Depends} Recommends: libreofficeVER-core (>> ${base-version}) | language-support-translatio...@ccode@ @FONT_SUGGESTS@ -Provides: libreofficeVER-l10n-${help-l10n-virtual-version}, - libreoffice2-l1...@lcode@ +Provides: libreofficeVER-l10n-${help-l10n-virtual-version} Suggests: hunspell-dictiona...@lcode@ | myspell-dictiona...@lcode@, libreoffice-hyphenati...@lcode@, - libreoffice2-thesaur...@lcode@, libreoffice-he...@lcode@ -Conflicts: libreoffice-core (<< ${base-version}), - libreoffice-core (>= ${base-version}.1), - libreoffice2-l1...@lcode@ -Replaces: libreoffice2-l1...@lcode@ Description: office productivity suite -- @LNAME@ language package LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. === modified file 'control.ogltrans.in' --- a/control.ogltrans.in 2010-10-12 00:40:55 +0000 +++ b/control.ogltrans.in 2010-12-28 10:06:04 +0000 @@ -5,7 +5,6 @@ Depends: ${shlibs:Depends}, libreofficeVER-core (>> 1:3.1.0~), libreofficeVER-impress (>> 1:3.1.0~), libreofficeVER-common (>> 1:3.1.0~), ${misc:Depends} Enhances: libreofficeVER-impress -Replaces: libreofficeVER-impress (= 1:3.1.0~rc1-1) Conflicts: ure (<< 1.5.1+OOo3.1.1-15) Description: LibreOffice Impress extension for transitions using OpenGL LibreOffice is a full-featured office productivity suite that provide === modified file 'control.postgresql.in' --- a/control.postgresql.in 2010-12-17 03:07:01 +0000 +++ b/control.postgresql.in 2010-12-28 10:06:04 +0000 @@ -3,7 +3,7 @@ Architecture: %OOO_BASE_ARCHS% Depends: ${shlibs:Depends}, libreofficeVER-core (>> 1:3.3~), ${misc:Depends} -Conflicts: libreofficeVER-java-common (<< 2.3.0~src680m212), libreofficeVER-gcj (<< 2.3.0~src680m212), ure (<< 1.5.1+OOo3.1.1-15) +Conflicts: ure (<< 1.5.1+OOo3.1.1-15) Suggests: postgresql Description: LibreOffice extension for PostgreSQL SDBC driver LibreOffice is a full-featured office productivity suite that provides === modified file 'control.presenter.in' --- a/control.presenter.in 2010-12-17 03:12:46 +0000 +++ b/control.presenter.in 2010-12-28 10:06:04 +0000 @@ -1,9 +1,7 @@ Package: libreofficeVER-presenter-console Section: misc Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS% -Conflicts: libreofficeVER-presenter-screen, ure (<< 1.5.1+OOo3.1.1-15) -Provides: libreofficeVER-presenter-screen -Replaces: libreofficeVER-presenter-screen +Conflicts: ure (<< 1.5.1+OOo3.1.1-15) Depends: ${shlibs:Depends}, libreofficeVER-core (>= 1:3.2.0~), libreofficeVER-impress (>= 1:3.2.0~), ${misc:Depends} Enhances: libreofficeVER-impress === modified file 'control.reportdesign.in' --- a/control.reportdesign.in 2010-12-17 03:12:46 +0000 +++ b/control.reportdesign.in 2010-12-28 10:06:04 +0000 @@ -4,8 +4,7 @@ Pre-Depends: ${java-runtime-depends} Depends: ${report-builder-jar-depends}, libreofficeVER-report-builder-bin (>= 1:3.2.0~), libreoffice-core (>= 1:3.2.0~rc5), libreoffice-java-common (>= 1:3.2.0~), ${misc:Depends} -Conflicts: libreoffice-reportdesigner, libreoffice-java-common (>= ${base-version}.1), ure (<< 1.5.1+OOo3.1.1-15) -Replaces: libreoffice-reportdesigner +Conflicts: ure (<< 1.5.1+OOo3.1.1-15) Provides: libreoffice-reportdesigner Enhances: libreofficeVER-base Description: LibreOffice extension for building database reports @@ -23,7 +22,6 @@ Section: misc Architecture: %OOO_BASE_ARCHS% Depends: ${shlibs:Depends}, libreoffice-core (>> 1:2.3.0~oog680m1), libreofficeVER-base (>= 2.3.0~src680m225), ${misc:Depends} -Replaces: libreofficeVER-report-builder Description: LibreOffice extension for building database reports -- libraries LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. === modified file 'control.sdk.in' --- a/control.sdk.in 2010-10-12 00:40:55 +0000 +++ b/control.sdk.in 2010-12-28 10:06:04 +0000 @@ -12,13 +12,6 @@ Suggests: libreoffice-dev-doc, libmythes-dev, c-shell -Replaces: libreoffice2-core (<= 1.9.108-1), - libreoffice2-dev, - libreoffice-java, - libreofficeVER-common (<< 2.0.2-3), - libreoffice-dev-doc (<< 2.0.2-4) -Conflicts: libreoffice-debian-files, libreoffice2-dev -Provides: libreoffice2-dev Description: office productivity suite -- SDK LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. @@ -33,10 +26,6 @@ Depends: ${misc:Depends} Recommends: www-browser Suggests: libreofficeVER-dtd-officedocument1.0 -Replaces: libreoffice-dev (<< 2.1), - libreoffice2-dev-doc -Provides: libreoffice2-dev-doc -Conflicts: libreoffice2-dev-doc Description: office productivity suite -- SDK documentation LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. === modified file 'control.ure.in' --- a/control.ure.in 2010-11-16 21:58:34 +0000 +++ b/control.ure.in 2010-12-28 10:06:04 +0000 @@ -52,12 +52,7 @@ Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: java5-runtime, cli-uno-bridge -Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22), - libreoffice-writer2latex (<< 0.5.0.2-3), - libreoffice-writer2xhtml (<< 0.5.0.2-3), - libreoffice-report-builder (<< 1:1.0.5+3.0.1-5), - libreoffice-wiki-publisher (<< 1.0+OOo3.0.1-5), - libreoffice-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-3) +Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22) Replaces: libreoffice-java-common (<< 1:3.0.0~dev300m12) Breaks: openoffice.org-core (<< 1:3.3~) Description: LibreOffice UNO runtime environment