[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.5-1-38-gea6831a
The following commit has been merged in the debian-experimental-3.6 branch:
commit ea6831a74c02f7213604e6508b95c6e09c5c96db
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 26 22:47:29 2013 +0100
missing comma...
Conflicts:
control
control.in
diff --git a/control b/control
index 6ae236f..0faec77 100644
--- a/control
+++ b/control
@@ -125,14 +125,14 @@ Breaks: libreoffice-style-crystal (<< 1:${oover}~),
libreoffice-style-galaxy (>= 1:${next-oover}~),
libreoffice-core (>= 1:${next-oover}~)
libreoffice-pdfimport (<< 1.0.6),
- libreoffice-presenter-console (<< 1.1.1)
- libreoffice-wiki-publisher (<< 1.1.2),
+ libreoffice-presenter-console (<< 1.1.1),
libreoffice-report-builder (<< 1.2.3),
libreoffice-presentation-minimizer (<< 1.0.4),
libreoffice-mysql-connector (<< 1.0.1+LibO3.6.5-1),
libreoffice-script-provider-bsh (<< 1:3.6~),
libreoffice-script-provider-js (<< 1:3.6~),
libreoffice-script-provider-python (<< 1:3.6~)
+ libreoffice-wiki-publisher (<< 1.1.2)
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
diff --git a/control.in b/control.in
index ecacd69..2db8806 100644
--- a/control.in
+++ b/control.in
@@ -222,14 +222,14 @@ Breaks: libreofficeVER-style-crystal (<< 1:${oover}~),
libreofficeVER-style-galaxy (>= 1:${next-oover}~),
libreofficeVER-core (>= 1:${next-oover}~)
libreoffice-pdfimport (<< 1.0.6),
- libreoffice-presenter-console (<< 1.1.1)
- libreoffice-wiki-publisher (<< 1.1.2),
+ libreoffice-presenter-console (<< 1.1.1),
libreoffice-report-builder (<< 1.2.3),
libreoffice-presentation-minimizer (<< 1.0.4),
libreoffice-mysql-connector (<< 1.0.1+LibO3.6.5-1),
libreoffice-script-provider-bsh (<< 1:3.6~),
libreoffice-script-provider-js (<< 1:3.6~),
libreoffice-script-provider-python (<< 1:3.6~)
+ libreoffice-wiki-publisher (<< 1.1.2)
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
--
LibreOffice packaging repository
Reply to: