[libreoffice] 02/03: add versions to openjdk-{7, 8}-jre-headless conflicts

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 29ab3b080fe8264a6aabf20fe73625b9d7312a27
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Nov 23 19:28:05 2017 +0100

    add versions to openjdk-{7,8}-jre-headless conflicts
---
 changelog  | 2 ++
 control    | 4 ++--
 control.in | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index c8043b2..e032692 100644
--- a/changelog
+++ b/changelog
@@ -31,6 +31,8 @@ libreoffice (1:6.0.0~beta1~git20171120-1) UNRELEASED; urgency=medium
     - add fonts-noto-hinted, fonts-noto-mono, fonts-noto-unhinted to
       Recommends
     - clean up mozilla suggests to just firefox-esr | thunderbird | firefox
+    - add versions to openjdk-{7,8}-jre-headless conflicts now that they are
+      also supposed to be fixed
 
  -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 20:59:01 +0100
 
diff --git a/control b/control
index b2521c9..27f2d86 100644
--- a/control
+++ b/control
@@ -360,8 +360,8 @@ Breaks: browser-plugin-libreoffice,
 Conflicts: libreoffice-filter-binfilter,
            libreoffice-unbundled,
            openjdk-6-jre-headless [i386],
-           openjdk-7-jre-headless [i386],
-           openjdk-8-jre-headless [i386],
+           openjdk-7-jre-headless (<< 7u151-2.6.11-4~) [i386],
+           openjdk-8-jre-headless (<< 8u151-b12-2~) [i386],
            openjdk-9-jre-headless (<< 9.0.1+11-1~) [i386]
 Provides: libreoffice-bundled
 Replaces: libreoffice-common (<< 1:5.4.1), libreoffice-pdfimport (<< 1:5.4~)
diff --git a/control.in b/control.in
index 85a3608..d9b1454 100644
--- a/control.in
+++ b/control.in
@@ -182,7 +182,7 @@ Breaks: libreoffice-base (<< ${binary:Version}),
         browser-plugin-libreoffice,
         libreoffice-pdfimport (<< 1:5.4~),
         libreoffice-common (<< 1:5.4.1)
-Conflicts: openjdk-6-jre-headless [i386], openjdk-7-jre-headless [i386], openjdk-8-jre-headless [i386], openjdk-9-jre-headless (<< 9.0.1+11-1~) [i386], libreoffice-filter-binfilter, libreoffice-unbundled
+Conflicts: openjdk-6-jre-headless [i386], openjdk-7-jre-headless (<< 7u151-2.6.11-4~) [i386], openjdk-8-jre-headless (<< 8u151-b12-2~) [i386], openjdk-9-jre-headless (<< 9.0.1+11-1~) [i386], libreoffice-filter-binfilter, libreoffice-unbundled
 Provides: libreoffice-bundled
 Replaces: libreoffice-pdfimport (<< 1:5.4~), libreoffice-common (<< 1:5.4.1)
 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