[libreoffice] 01/03: --with-jvm-path is a bad idea, apparently. relies on < 9 paths. remove and add conflicts instead

[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 9db75e8afb33906e0a9377d6b8a86b1b3cc5740a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 7 19:38:09 2017 +0100

    --with-jvm-path is a bad idea, apparently. relies on < 9 paths. remove and add conflicts instead
---
 changelog  | 7 ++++---
 control    | 7 ++++++-
 control.in | 2 +-
 rules      | 1 -
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index dea04aa..634b4ca 100644
--- a/changelog
+++ b/changelog
@@ -10,8 +10,7 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
       those work.
     - stop passing --disable-database-connectivity for no-Base archs
       (closes: #874274)
-    - explicitly use openjdk 9 on i386 now that #876069 is fixed. Allow
-      it as the only one by explicitly using --with-jvm-path
+    - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed.
     - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for
       Java9 in reportbuilder) 
     - make testsuite failures on i386 fatal again
@@ -23,8 +22,10 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
   * debian/rules, debian/libreoffice-common.maintscript: fix path in/for
     apparmor profiles (add missing /). mv_conffile the files to the new
     name...
+  * debian/control.in: make -core conflict against openjdk-{6,7,8}-jre-headless
+    on i386- -java-common would make more sense, but it's Arch: all..
 
- -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 07:59:37 +0100
+ -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 19:34:51 +0100
 
 libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 
diff --git a/control b/control
index 4157c99..a1e0e75 100644
--- a/control
+++ b/control
@@ -355,7 +355,12 @@ Breaks: browser-plugin-libreoffice,
         libreoffice-officebean (<< ${binary:Version}),
         libreoffice-pdfimport (<< 1:5.4~),
         libreoffice-writer (<< ${binary:Version})
-Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
+Conflicts: libreoffice-filter-binfilter,
+           libreoffice-unbundled,
+           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]
 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 b9cb3d1..7d55ac4 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: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
+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
 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 d34e02c..88efb1e 100755
--- a/rules
+++ b/rules
@@ -1085,7 +1085,6 @@ ifeq "$(ENABLE_JAVA)" "y"
   endif
   # force Java 9 with #876069 fixed on i386
   ifeq "$(DEB_HOST_ARCH)" "i386"
-	CONFIGURE_FLAGS += --with-jvm-path=$(JAVA_HOME)
 	JAVA_RUNTIME_DEPENDS := openjdk-9-jre (>= 9.0.1+11-1)
   else
 	JAVA_RUNTIME_DEPENDS = default-jre

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