The following commit has been merged in the debian-experimental-3.5 branch:
commit 183ed87fb0fefe38493a78f9676707f31ba18918
Author: Rene Engelhard <[email protected]>
Date: Mon Nov 26 21:14:13 2012 +0100
remove duplicate conflicts/peplaces...
diff --git a/control.mozilla.in b/control.mozilla.in
index 765c71d..fcd1ba5 100644
--- a/control.mozilla.in
+++ b/control.mozilla.in
@@ -17,14 +17,12 @@ Recommends: iceweasel | firefox | iceape-browser |
konqueror-nsplugins,
libreoffice-impress,
libreoffice-math,
libreoffice-base
-Conflicts: mozilla-libreoffice
-Replaces: mozilla-libreoffice
-Provides: mozilla-libreoffice
Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384,
92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
Xb-Npp-Name: LibreOffice Plug-in
Xb-Npp-MimeType: application/vnd.stardivision.calc,
application/vnd.stardivision.chart, application/vnd.stardivision.draw,
application/vnd.stardivision.impress,
application/vnd.stardivision.impress-packed, application/vnd.stardivision.math,
application/vnd.stardivision.writer,
application/vnd.stardivision.writer-global, application/vnd.staroffice.writer,
application/vnd.sun.xml.calc, application/vnd.sun.xml.calc.template,
application/vnd.sun.xml.draw, application/vnd.sun.xml.draw.template,
application/vnd.sun.xml.impress, application/vnd.sun.xml.impress.template,
application/vnd.sun.xml.math, application/vnd.sun.xml.writer,
application/vnd.sun.xml.writer.global, application/vnd.sun.xml.writer.template,
application/vnd.oasis.opendocument.text,
application/vnd.oasis.opendocument.text-template,
application/vnd.oasis.opendocument.text-master,
application/vnd.oasis.opendocument.text-web,
application/vnd.oasis.opendocument.spreadsheet,
application/vnd.oasis.opendocument.spreadshee
t-template, application/vnd.oasis.opendocument.graphics,
application/vnd.oasis.opendocument.graphics-template,
application/vnd.oasis.opendocument.presentation,
application/vnd.oasis.opendocument.presentation-template,
application/vnd.oasis.opendocument.formula
-Conflicts: mozilla-openoffice.org (<< 1:3.3.0~)
-Replaces: mozilla-openoffice.org
+Conflicts: mozilla-openoffice.org (<< 1:3.3.0~), mozilla-libreoffice
+Replaces: mozilla-openoffice.org, mozilla-libreoffice
+Provides: mozilla-libreoffice
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
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
