[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-35-gee2e1c6
The following commit has been merged in the debian-experimental-3.5 branch:
commit fe0b8a1d3ce5c697327412c9c12c33604b1e75ac
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 29 22:47:37 2012 +0100
stricten dependencies for mozilla-libreoffice 3.5, thanks Mario Holbe for the observation
diff --git a/changelog b/changelog
index d6ed580..93292d1 100644
--- a/changelog
+++ b/changelog
@@ -25,8 +25,10 @@ libreoffice (1:3.5.1~rc1-1) UNRELEASED; urgency=low
OOO_REPORTDESIGN_ARCHS
* debian/control.in: build-conflict against
libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64]
+ * debian/control.mozilla.in: stricten dependencies to 3.5, thanks
+ Mario Holbe for the observation
- -- Rene Engelhard <rene@debian.org> Wed, 29 Feb 2012 12:53:09 +0000
+ -- Rene Engelhard <rene@debian.org> Wed, 29 Feb 2012 22:40:38 +0100
libreoffice (1:3.5.0-2) experimental; urgency=low
diff --git a/control b/control
index 4ddd711..bd31ad9 100644
--- a/control
+++ b/control
@@ -3118,10 +3118,11 @@ Enhances: iceape-browser,
firefox,
libreoffice,
libreoffice-core
-Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
+Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.5.0~beta~), ${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
+Breaks: mozilla-libreoffice (<< 1:3.5.0~beta~)
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 39e90a4..02f3e8d 100644
--- a/control.mozilla.in
+++ b/control.mozilla.in
@@ -8,7 +8,7 @@ Enhances: iceape-browser,
libreofficeVER,
libreofficeVER-core
Depends: ${shlibs:Depends},
- libreofficeVER-core,
+ libreofficeVER-core (>= 1:3.5.0~beta~),
${misc:Depends}
Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins,
libreoffice-writer,
@@ -19,6 +19,7 @@ Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins,
libreoffice-base
Conflicts: mozilla-openoffice.org (<< 1:3.3.0~)
Replaces: mozilla-openoffice.org
+Breaks: mozilla-libreoffice (<< 1:3.5.0~beta~)
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: