[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-32-gfaeb50c
The following commit has been merged in the debian-experimental-4.0 branch:
commit 32a498f7dcaefc7e14542b66b3126e55e74a1089
Author: Benjamin Drung <bdrung@debian.org>
Date: Thu Mar 7 22:20:24 2013 +0100
Replace Conflicts with version by Breaks.
Refer to Debian Policy Manual section 7.4 for details.
diff --git a/control.evolution.in b/control.evolution.in
index 54c1a25..b7583ca 100644
--- a/control.evolution.in
+++ b/control.evolution.in
@@ -8,7 +8,7 @@ Depends: libreofficeVER-base,
${misc:Depends},
${shlibs:Depends}
Recommends: evolution
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Breaks: ure (<< 1.5.1+OOo3.1.1-15)
Replaces: libreofficeVER-common (<< 1:3.3.3-2~)
Description: office productivity suite -- Evolution addressbook support
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.in b/control.in
index 8e12566..cfcd3a8 100644
--- a/control.in
+++ b/control.in
@@ -194,31 +194,8 @@ Depends: fontconfig,
libreofficeVER-common (>> ${base-version}),
${misc:Depends},
${shlibs:Depends}
-Conflicts: cacao-oj6-jre,
- cli-uno-bridge (<< 1:3.0.0~dev300m22),
- libcairo2 (= 1.4.8-1),
- libicu38 (= 3.8~d01-1),
- libreoffice-filter-binfilter,
- libreoffice-style-andromeda (<< 1:3.3.0-1),
- libreoffice-style-crystal (<< 1:3.3.0-1),
- libreoffice-style-galaxy (<< 1:3.3.0-1),
- libreoffice-style-hicontrast (<< 1:3.3.0-1),
- libreoffice-style-oxygen (<< 1:3.3.0-1),
- libreoffice-style-tango (<< 1:3.3.0-1),
- libreofficeVER-base (<< ${binary:Version}),
- libreofficeVER-calc (<< ${binary:Version}),
- libreofficeVER-dev (<< ${binary:Version}),
- libreofficeVER-draw (<< ${binary:Version}),
- libreofficeVER-evolution (<< ${binary:Version}),
- libreofficeVER-gnome (<< ${binary:Version}),
- libreofficeVER-gtk (<< ${binary:Version}),
- libreofficeVER-impress (<< ${binary:Version}),
- libreofficeVER-kde (<< ${binary:Version}),
- libreofficeVER-officebean (<< ${binary:Version}),
- libreofficeVER-unbundled,
- libreofficeVER-writer (<< ${binary:Version}),
- mozilla-plugin-vlc (<< 1.0)
-Breaks: hunspell-ar (<< 0.0.0+20080110-1.1),
+Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
+ hunspell-ar (<< 0.0.0+20080110-1.1),
hunspell-da (<< 1:3.1.0-3),
hunspell-de-at (<< 20071211-2),
hunspell-de-ch (<< 20071211-2),
@@ -236,11 +213,31 @@ Breaks: hunspell-ar (<< 0.0.0+20080110-1.1),
hunspell-sr (<< 1:3.1.0-3),
hunspell-uz (<< 0.6-3.1),
hunspell-vi (<< 1:3.1.0-3),
+ libcairo2 (= 1.4.8-1),
+ libicu38 (= 3.8~d01-1),
libreoffice-common (<< 1:3.6.1~rc1),
libreoffice-evolution (<< 1:3.4.1~),
libreoffice-kab (<< 1:3.4.1~),
libreoffice-sdbc-postgresql (<< 0.8.1~),
+ libreoffice-style-andromeda (<< 1:3.3.0-1),
+ libreoffice-style-crystal (<< 1:3.3.0-1),
+ libreoffice-style-galaxy (<< 1:3.3.0-1),
+ libreoffice-style-hicontrast (<< 1:3.3.0-1),
+ libreoffice-style-oxygen (<< 1:3.3.0-1),
+ libreoffice-style-tango (<< 1:3.3.0-1),
+ libreofficeVER-base (<< ${binary:Version}),
+ libreofficeVER-calc (<< ${binary:Version}),
+ libreofficeVER-dev (<< ${binary:Version}),
+ libreofficeVER-draw (<< ${binary:Version}),
+ libreofficeVER-evolution (<< ${binary:Version}),
+ libreofficeVER-gnome (<< ${binary:Version}),
+ libreofficeVER-gtk (<< ${binary:Version}),
+ libreofficeVER-impress (<< ${binary:Version}),
+ libreofficeVER-kde (<< ${binary:Version}),
+ libreofficeVER-officebean (<< ${binary:Version}),
+ libreofficeVER-writer (<< ${binary:Version}),
mozilla-libreoffice (<< 1:3.5.0~beta~),
+ mozilla-plugin-vlc (<< 1.0),
myspell-af (<< 1:3.1.0-3),
myspell-ca (<< 0.6-8),
myspell-cs-cz (<< 20040229-4.1),
@@ -284,6 +281,7 @@ Breaks: hunspell-ar (<< 0.0.0+20080110-1.1),
myspell-sw (<< 1:3.1.0-3),
myspell-th (<< 1:3.1.0-3),
myspell-tl (<< 0.4-0-5)
+Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreofficeVER-unbundled
Provides: libreofficeVER-bundled
Replaces: libreofficeVER-calc (<< 1:3.3.2-5),
libreofficeVER-common (<= 1:4.0.0~beta2-1),
@@ -307,11 +305,7 @@ Suggests: libreofficeVER-style-crystal,
libreofficeVER-style-oxygen,
libreofficeVER-style-tango
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
-Conflicts: broffice,
- libreoffice-l10n-3.5,
- libreoffice-l10n-3.6,
- libtextcat-data (<< 2.2-8),
- openoffice.org-common (<< 1:3.3.0~)
+Conflicts: broffice, libreoffice-l10n-3.5, libreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreofficeVER-core (<< 1:${oover}~),
libreofficeVER-core (>= 1:${next-oover}~),
@@ -325,7 +319,9 @@ Breaks: libreofficeVER-core (<< 1:${oover}~),
libreofficeVER-style-oxygen (<< 1:${oover}~),
libreofficeVER-style-oxygen (>= 1:${next-oover}~),
libreofficeVER-style-tango (<< 1:${oover}~),
- libreofficeVER-style-tango (>= 1:${next-oover}~)
+ libreofficeVER-style-tango (>= 1:${next-oover}~),
+ libtextcat-data (<< 2.2-8),
+ openoffice.org-common (<< 1:3.3.0~)
Replaces: openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
@@ -589,8 +585,8 @@ Depends: libreofficeVER-core,
${python:Depends},
${pyuno-depends}
Enhances: libreofficeVER-writer
+Breaks: ure (<< 1.5.1+OOo3.1.1-15)
Replaces: python-uno (<< 1:2.4.1-5)
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Description: office productivity suite -- email mail merge
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -608,9 +604,8 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
-Conflicts: libreoffice-common (<< 1:3.5~),
- libreoffice-core (<< 1:3.5~),
- python3-uno (>= 4.0~)
+Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
+Conflicts: python3-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@ -692,8 +687,8 @@ Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
${misc:Depends},
${python:Depends},
${pyuno-depends}
+Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
-Conflicts: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
Description: Python script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -751,7 +746,7 @@ Section: misc
Priority: extra
Architecture: %OOO_ARCHS%
Depends: libreofficeVER-core, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
+Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
Description: PDF Import component for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.mozilla.in b/control.mozilla.in
index 4f45c7a..b0a1dde 100644
--- a/control.mozilla.in
+++ b/control.mozilla.in
@@ -49,8 +49,9 @@ Xb-Npp-MimeType: application/vnd.oasis.opendocument.formula,
application/vnd.sun.xml.writer,
application/vnd.sun.xml.writer.global,
application/vnd.sun.xml.writer.template
-Conflicts: mozilla-libreoffice, mozilla-openoffice.org (<< 1:3.3.0~)
-Replaces: mozilla-libreoffice, mozilla-openoffice.org
+Breaks: mozilla-openoffice.org (<< 1:3.3.0~)
+Conflicts: mozilla-libreoffice
+Replaces: mozilla-libreoffice, mozilla-openoffice.org (<< 1:3.3.0~)
Provides: mozilla-libreoffice
Description: office productivity suite -- Mozilla plugin
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.ogltrans.in b/control.ogltrans.in
index 047fdba..e0acbd1 100644
--- a/control.ogltrans.in
+++ b/control.ogltrans.in
@@ -8,7 +8,7 @@ Depends: libreofficeVER-common,
${misc:Depends},
${shlibs:Depends}
Enhances: libreofficeVER-impress
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Breaks: 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
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.postgresql.in b/control.postgresql.in
index cb956ed..a812832 100644
--- a/control.postgresql.in
+++ b/control.postgresql.in
@@ -4,8 +4,8 @@ Architecture: %OOO_BASE_ARCHS%
Depends: libreofficeVER-core (>= 1:3.5.0~beta),
${misc:Depends},
${shlibs:Depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql (>= 8.4)
+Breaks: ure (<< 1.5.1+OOo3.1.1-15)
Description: PostgreSQL SDBC driver for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
--
LibreOffice packaging repository
Reply to: