[libreoffice] 03/03: update -l10n conflicts in -common, remove 3.5/3.6, add 4.3/4.4
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 28a9f68d5b88f7ade7bb4bd7399268e5b231935a
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jul 30 17:41:46 2015 +0200
update -l10n conflicts in -common, remove 3.5/3.6, add 4.3/4.4
---
changelog | 5 ++++-
control | 4 ++--
control.in | 4 ++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index 8349bd9..ea954d0 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,11 @@ libreoffice (1:5.0.0~rc4-2) UNRELEASED; urgency=medium
- ENABLE_MERGELIBS=n on kfreebsd-* for now ("Argument list too long")
- ENABLE_COLLADA=y (for i386/amd64) now that the libs finally are in
Debian
+ * debian/control.in:
+ - update -l10n conflicts in -common, remove 3.5/3.6, add 4.3/4.4
+ (closes: #794024)
- -- Rene Engelhard <rene@debian.org> Tue, 28 Jul 2015 00:27:08 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 30 Jul 2015 17:40:45 +0200
libreoffice (1:5.0.0~rc4-1) experimental; urgency=medium
diff --git a/control b/control
index cbdd30c..1a87a15 100644
--- a/control
+++ b/control
@@ -443,8 +443,8 @@ Suggests: libreoffice-style-crystal,
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
Conflicts: broffice,
libreoffice-filter-mobiledev,
- libreoffice-l10n-3.5,
- libreoffice-l10n-3.6
+ libreoffice-l10n-4.3,
+ libreoffice-l10n-4.4
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
diff --git a/control.in b/control.in
index f00032c..4cfddd9 100644
--- a/control.in
+++ b/control.in
@@ -276,8 +276,8 @@ Suggests: libreoffice-style-crystal,
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
Conflicts: broffice,
libreoffice-filter-mobiledev,
- libreoffice-l10n-3.5,
- libreoffice-l10n-3.6
+ libreoffice-l10n-4.3,
+ libreoffice-l10n-4.4
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: