[libreoffice] 01/02: lp#1443667: add replaces from -core against -common
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit a6b543ed89c5066a8a25fc3d62b33be288323df8
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Apr 22 16:33:07 2015 +0100
lp#1443667: add replaces from -core against -common
Conflicts:
changelog
---
changelog | 5 ++++-
control | 2 +-
control.in | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index a13f2bc..010e4b0 100644
--- a/changelog
+++ b/changelog
@@ -8,7 +8,10 @@ libreoffice (1:4.4.3-1) unstable; urgency=medium
* New upstream release
- -- Rene Engelhard <rene@debian.org> Fri, 01 May 2015 17:26:38 +0200
+ * merge from Ubuntu:
+ - add missing Replaces: (LP: #1443667)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 04 May 2015 12:23:05 +0200
libreoffice (1:4.4.2-1) unstable; urgency=low
diff --git a/control b/control
index 7d27765..833bb5b 100644
--- a/control
+++ b/control
@@ -417,7 +417,7 @@ Conflicts: cacao-oj6-jre,
libreoffice-unbundled
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5),
- libreoffice-common (<= 1:4.0.0~beta2-1),
+ libreoffice-common (<< 1:4.4.0~rc3-1),
uno-libs3 (<< 1:3.6.1-2),
ure (<< 1:3.6.1-2)
Description: office productivity suite -- arch-dependent files
diff --git a/control.in b/control.in
index 87f662b..bea504d 100644
--- a/control.in
+++ b/control.in
@@ -254,7 +254,7 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled, libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64]
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5),
- libreoffice-common (<= 1:4.0.0~beta2-1),
+ libreoffice-common (<< 1:4.4.0~rc3-1),
uno-libs3 (<< 1:3.6.1-2),
ure (<< 1:3.6.1-2)
Description: office productivity suite -- arch-dependent files
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: