[libreoffice] 01/01: 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 master
in repository libreoffice.

commit c62dfb89b85116dd73dc8f029fd6f1922fa7e504
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  | 6 ++++--
 control    | 4 ++--
 control.in | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 953da0f..6fa4213 100644
--- a/changelog
+++ b/changelog
@@ -5,8 +5,10 @@ libreoffice (1:5.4.3-3) UNRELEASED; urgency=medium
   * debian/rules: replace some manual dpkg-parsechangelog calls with
     $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
     --disable-dependency-tracking
-  * debian/control.in: clean up mozilla suggests to just
-    firefox-esr | thunderbird | firefox
+  * debian/control.in:
+    - 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>  Thu, 23 Nov 2017 18:44:11 +0100
 
diff --git a/control b/control
index 217bbd3..b31b9f4 100644
--- a/control
+++ b/control
@@ -358,8 +358,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 072b0aa..16d3799 100644
--- a/control.in
+++ b/control.in
@@ -179,7 +179,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