[libreoffice] 02/03: readd conflicts against openoffice-unbundled
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.
commit 830d9b7323bde6b459194031aae0e4226e1bbce9
Author: Rene Engelhard <rene@debian.org>
Date: Mon Oct 5 12:08:53 2015 +0200
readd conflicts against openoffice-unbundled
Conflicts:
changelog
control
control.in
---
changelog | 6 +++++-
control.in | 3 ++-
rules | 4 ----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index bf09d0c..4aa7275 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,12 @@ libreoffice (1:5.0.2-0ubuntu2~wily1~ppa1) wily; urgency=medium
* fall back to SYSTEM_GCC_VERSION, when SYSTEM_GCJ_VERSION is empty
* substitute xfonts-mathml with fonts-stix (lp: #1487148)
+ * cherry-pick from Debian:
+ - readd conflicts against openoffice-unbundled to libreoffice-common.
+ openoffice*-debian-menus contains /usr/bin/soffice
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 05 Oct 2015 19:18:29 +0200
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sat, 03 Oct 2015 01:29:02 +0200
libreoffice (1:5.0.2-0ubuntu1) wily; urgency=medium
diff --git a/control.in b/control.in
index 4a9a9b1..5bea367 100644
--- a/control.in
+++ b/control.in
@@ -278,7 +278,8 @@ Suggests: libreoffice-style-crystal,
libreoffice-style-sifr,
libreoffice-style-tango
Recommends: fonts-stix, ${pyuno-depends}, ${textcat-data-recommends}
-Conflicts: broffice,
+Conflicts: openoffice-unbundled,
+ broffice,
libreoffice-filter-mobiledev,
libreoffice-l10n-4.3,
libreoffice-l10n-4.4
diff --git a/rules b/rules
index e788b9b..57ba2f8 100755
--- a/rules
+++ b/rules
@@ -1762,10 +1762,6 @@ endif
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
mv debian/control.tmp debian/control
- # no conflict with "universal Linux packages" as they have the version in their
- # names thankfully now
- perl -pi -e 's/libreoffice-unbundled, //' debian/control
-
# make -l10n-fi suggest libreoffice-spellcheck-fi to
# match myspell-fi and libreoffice-soikko/-voikko
perl -pi -e 's/myspell-dictionary-fi/myspell-dictionary-fi | libreoffice-spellcheck-fi/' debian/control
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: