[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-1-21-g3f08112
The following commit has been merged in the master branch:
commit f0026bb9a3edd967bfaeea1aec485eb3ee697bcb
Author: Rene Engelhard <rene@debian.org>
Date: Mon Sep 12 23:24:43 2011 +0200
add Breaks: on incompatible -cores on -common (basis-link symlink)
diff --git a/changelog b/changelog
index 6860bb6..84e4b16 100644
--- a/changelog
+++ b/changelog
@@ -9,7 +9,10 @@ libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
* debian/patches/update-sdbc-postgresql.diff: update SDBC PostgreSQL
driver to Lionels new LibreOffice version.
- * debian/control.in: remove obsolete Pre-Depends on debconf in ure
+ * debian/control.in:
+ - remove obsolete Pre-Depends on debconf in ure
+ - add Breaks: on incompatible -cores on -common (basis-link symlink)
+ (closes: #641357)
* debian/control.postgresql.in: add (>= 8,4) to postgresql suggests to make
more visible that we need >= 8.4 of PostgreSQL. Update Homepage for new
LibreOffice location
@@ -20,7 +23,7 @@ libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
[ Lionel Elie Mamane ]
* debian/rules: we need translate-toolkit (>= 1.9.0)
- -- Rene Engelhard <rene@debian.org> Thu, 08 Sep 2011 21:08:20 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 12 Sep 2011 23:23:06 +0200
libreoffice (1:3.4.3-1) unstable; urgency=low
diff --git a/control b/control
index 282b1b4..9843521 100644
--- a/control
+++ b/control
@@ -115,11 +115,13 @@ Breaks: libreoffice-style-crystal (<< 1:${basis-version}~),
libreoffice-style-hicontrast (<< 1:${basis-version}~),
libreoffice-style-galaxy (<< 1:${basis-version}~),
libreoffice-style-andromeda (<< 1:${basis-version}~),
+ libreoffice-core (<< 1:${basis-version}~),
libreoffice-style-crystal (>= 1:${next-basis-version}~),
libreoffice-style-oxygen (>= 1:${next-basis-version}~),
libreoffice-style-tango (>= 1:${next-basis-version}~),
libreoffice-style-hicontrast (>= 1:${next-basis-version}~),
libreoffice-style-galaxy (>= 1:${next-basis-version}~),
+ libreoffice-core (>= 1:${next-basis-version}~)
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 4c9b1e2..b64c91b 100644
--- a/control.in
+++ b/control.in
@@ -225,11 +225,13 @@ Breaks: libreofficeVER-style-crystal (<< 1:${basis-version}~),
libreofficeVER-style-hicontrast (<< 1:${basis-version}~),
libreofficeVER-style-galaxy (<< 1:${basis-version}~),
libreofficeVER-style-andromeda (<< 1:${basis-version}~),
+ libreofficeVER-core (<< 1:${basis-version}~),
libreofficeVER-style-crystal (>= 1:${next-basis-version}~),
libreofficeVER-style-oxygen (>= 1:${next-basis-version}~),
libreofficeVER-style-tango (>= 1:${next-basis-version}~),
libreofficeVER-style-hicontrast (>= 1:${next-basis-version}~),
libreofficeVER-style-galaxy (>= 1:${next-basis-version}~),
+ libreofficeVER-core (>= 1:${next-basis-version}~)
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: