[libreoffice] 01/02: remove openjdk conflicts nd make them Depends in JAVA_RUNTIME_DEPENDS. linux is now also fixed...

[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 b6874f5af3abbaaabfdb8d2ee3da42d6c841edeb
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Dec 2 12:12:47 2017 +0100

    remove openjdk conflicts nd make them Depends in JAVA_RUNTIME_DEPENDS. linux is now also fixed...
---
 changelog  | 12 ++++++++++++
 control    |  7 +------
 control.in |  2 +-
 rules      |  6 +++---
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/changelog b/changelog
index 913442e..5964f99 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+libreoffice (1:5.4.3-4) unstable; urgency=medium
+
+  * debian/control.in: remove openjdk conflicts ...
+  * debian/rules: ... and make them Depends in JAVA_RUNTIME_DEPENDS for the
+    Java-using packages. Also allow openjdk-9 everywhere
+  This doesn't prevent usage of the "broken" JDK but otherwise we "break"
+  jodconverter/natbraille in testing... And linux 4.14.2-1 is also supposed to
+  fix the regression finally...
+  This also closes: #882436
+
+ -- Rene Engelhard <rene at debian.org>  Sat, 02 Dec 2017 01:01:41 +0100
+
 libreoffice (1:5.4.3-3) unstable; urgency=medium
 
   * debian/patches/icu-60.diff: backport icu 60 support patch from master
diff --git a/control b/control
index 1a55de7..e3a01a9 100644
--- a/control
+++ b/control
@@ -356,12 +356,7 @@ Breaks: browser-plugin-libreoffice,
         libreoffice-officebean (<< ${binary:Version}),
         libreoffice-pdfimport (<< 1:5.4~),
         libreoffice-writer (<< ${binary:Version})
-Conflicts: libreoffice-filter-binfilter,
-           libreoffice-unbundled,
-           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]
+Conflicts: libreoffice-filter-binfilter, libreoffice-unbundled
 Provides: libreoffice-bundled
 Replaces: libreoffice-common (<< 1:5.4.1), libreoffice-pdfimport (<< 1:5.4~)
 Description: office productivity suite -- arch-dependent files
diff --git a/control.in b/control.in
index 350640c..10e4fd1 100644
--- a/control.in
+++ b/control.in
@@ -180,7 +180,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 (<< 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
+Conflicts: 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
diff --git a/rules b/rules
index 642261c..9aa9fe3 100755
--- a/rules
+++ b/rules
@@ -1084,14 +1084,14 @@ ifeq "$(ENABLE_JAVA)" "y"
   else
 	BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
   endif
-  # force Java 9 with #876069 fixed on i386
+  # force Java with #876069 (9) and #882436 (8) fixed on i386
   ifeq "$(DEB_HOST_ARCH)" "i386"
-	JAVA_RUNTIME_DEPENDS := openjdk-9-jre (>= 9.0.1+11-1)
+	JAVA_RUNTIME_DEPENDS := openjdk-8-jre (>= 8u151-b12-2~) | openjdk-9-jre (>= 9.0.1+11-1)
   else
 	JAVA_RUNTIME_DEPENDS = default-jre
   ifneq (,$(filter $(DEB_HOST_ARCH), $(OOO_OPENJDK_ARCHS)))
     ifneq "$(DEB_HOST_ARCH)" "ia64"
-	JAVA_RUNTIME_DEPENDS += | openjdk-8-jre | openjdk-7-jre | openjdk-6-jre
+	JAVA_RUNTIME_DEPENDS += | openjdk-9-jre | openjdk-8-jre | openjdk-7-jre | openjdk-6-jre
     else
 	JAVA_RUNTIME_DEPENDS += | openjdk-7-jre
     endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git