[libreoffice] 02/02: readd conflicts against openoffice-unbundled
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit a07e1b4b4575d3320e88d48d604db26c4995daf4
Author: Rene Engelhard <rene@debian.org>
Date: Mon Oct 5 12:08:53 2015 +0200
readd conflicts against openoffice-unbundled
---
changelog | 3 +++
control | 3 ++-
control.in | 3 ++-
rules | 4 ----
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index bb33cb0..c137207 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,9 @@ libreoffice (1:5.0.2-2) UNRELEASED; urgency=medium
- use dh_installdocs --link-doc=libreoffice-{core,common}
- update dh_shlibdeps calls for URE in /usr/lib/libreoffice/program and
remove obsolete OOUREDIR
+ * debian/rules, debian/control.in:
+ - readd conflicts against openoffice-unbundled to libreoffice-common.
+ openoffice*-debian-menus contains /usr/bin/soffice
* debian/control.in:
- update -style-* dependencies based on the recommendation in
https://lists.debian.org/debian-openoffice/2015/09/msg00343.html ff.
diff --git a/control b/control
index ba96ed0..bfe41de 100644
--- a/control
+++ b/control
@@ -440,7 +440,8 @@ Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
Conflicts: broffice,
libreoffice-filter-mobiledev,
libreoffice-l10n-4.3,
- libreoffice-l10n-4.4
+ libreoffice-l10n-4.4,
+ openoffice-ubundled
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
diff --git a/control.in b/control.in
index 3e98835..4b00bfc 100644
--- a/control.in
+++ b/control.in
@@ -272,7 +272,8 @@ Suggests: libreoffice-style-breeze,
libreoffice-style-sifr,
libreoffice-style-tango
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
-Conflicts: broffice,
+Conflicts: openoffice-ubundled,
+ broffice,
libreoffice-filter-mobiledev,
libreoffice-l10n-4.3,
libreoffice-l10n-4.4
diff --git a/rules b/rules
index 39457a4..1e7b62c 100755
--- a/rules
+++ b/rules
@@ -1821,10 +1821,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: