[SCM] LibreOffice packaging repository branch, master, updated. dd32885a133cf3c9c0a1336f938169c6188a0469
The following commit has been merged in the master branch:
commit dd32885a133cf3c9c0a1336f938169c6188a0469
Author: Rene Engelhard <rene@debian.org>
Date: Wed Mar 16 15:32:07 2011 +0000
add replaces and (versioned) conflicts against mozilla-openoffice.org
diff --git a/changelog b/changelog
index d01461d..4b40f7c 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,9 @@ libreoffice (1:3.3.2~rc2-1) UNRELEASED; urgency=low
- make -wiki-publisher depend on -java-common
* debian/rules:
- use dh_python2 (closes: #616871)
+ * debian/control.in:
+ - add replaces and (versioned) conflicts against mozilla-openoffice.org
+ (closes: #618550)
* merge from Ubuntu:
- added ppc fixes (LP: #727118)
diff --git a/control b/control
index 6f02245..c55534d 100644
--- a/control
+++ b/control
@@ -3217,6 +3217,8 @@ Enhances: iceape-browser,
libreoffice-core
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins, libreoffice-writer, libreoffice-calc, libreoffice-draw, libreoffice-impress, libreoffice-math, libreoffice-base
+Conflicts: mozilla-openoffice.org (<< 1:3.3.0~)
+Replaces: mozilla-openoffice.org
Description: office productivity suite -- Mozilla plugin
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 9446d25..39e90a4 100644
--- a/control.mozilla.in
+++ b/control.mozilla.in
@@ -17,6 +17,8 @@ Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins,
libreoffice-impress,
libreoffice-math,
libreoffice-base
+Conflicts: mozilla-openoffice.org (<< 1:3.3.0~)
+Replaces: mozilla-openoffice.org
Description: office productivity suite -- Mozilla plugin
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
--
LibreOffice packaging repository
Reply to: