[libreoffice] 02/02: revert Java9 hacks

[Rene Engelhard]

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

rene pushed a commit to branch debian-stretch-backports
in repository libreoffice.

commit 3cd03c0310b0f9d3422734ac9c6cf9e6d5f25d79
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Dec 5 21:37:35 2017 +0100

    revert Java9 hacks
---
 changelog |  7 +++++++
 control   |  1 -
 rules     | 15 ---------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/changelog b/changelog
index d8ea682..1a457e1 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,13 @@ libreoffice (1:5.4.3-4~bpo9+1) stretch-backports; urgency=medium
   * tarballs/*, debian/source/include-binaries: include needed internal
     stuff
 
+  * revert Java9 hacks. openjdk-9 is fixed (in sid), openjdk-8 is supposed to
+    be fixed (in sid and some future stretch security update) and linux is
+    also fixed in jessie (8.10) and stretch (9.3). Build with default Java
+    (again)
+    This doesn't cause a regression since stretch-backports/i386 was affected
+    by this regression anyway and this makes a backport possible...
+
  -- Rene Engelhard <rene at debian.org>  Tue, 05 Dec 2017 21:33:47 +0100
 
 libreoffice (1:5.4.3-4) unstable; urgency=medium
diff --git a/control b/control
index afefd99..ec41053 100644
--- a/control
+++ b/control
@@ -140,7 +140,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                lp-solve (>= 5.5.0.13-5+b1),
                maven-repo-helper,
                opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
-               openjdk-9-jdk (>= 9.0.1+11-1~) [i386],
                pkg-config,
                pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                python3,
diff --git a/rules b/rules
index edf08a4..36490a5 100755
--- a/rules
+++ b/rules
@@ -144,16 +144,11 @@ PACKAGE_TTF_OPENSYMBOL=y
 BUILD_ONLY_EN_US=n
 ENABLE_JAVA=y
 ifeq "$(ENABLE_JAVA)" "y"
-  ifeq "$(DEB_HOST_ARCH)" "i386"
-  JDK=openjdk
-  JAVA_MAINVER=9
-  else
   JDK=default
   include /usr/share/java/java_defaults.mk
   ifneq "$(JDK)" "default"
     JAVA_MAINVER=7
   endif
-  endif
 endif
 JAVAHELPER_MIN_VERSION= (>= 0.37~)
 SYSTEM_STUFF += hunspell
@@ -1048,11 +1043,6 @@ ifeq "$(ENABLE_JAVA)" "y"
 	BUILD_DEPS += , java-common (>= 0.49)
 	JAVA_HOME=/usr/lib/jvm/default-java
 	BUILD_DEPS += , default-jdk (>= 1:1.6) $(shell echo "$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))" | sed -e "s/\]/ !i386]/")
-    ifeq (i386,$(findstring i386,$(OOO_JAVA_ARCHS)))
-#	BUILD_DEPS += , default-jdk (>= 2:1.9) [i386]
-	# hack.
-	BUILD_DEPS += , openjdk-9-jdk (>= 9.0.1+11-1~) [i386]
-    endif
     ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS)))
 	BUILD_DEPS += , default-jdk (>= 1:1.7-48) [ia64]
     endif
@@ -1084,10 +1074,6 @@ ifeq "$(ENABLE_JAVA)" "y"
   else
 	BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
   endif
-  # force Java with #876069 (9) and #882436 (8) fixed on i386
-  ifeq "$(DEB_HOST_ARCH)" "i386"
-	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"
@@ -1102,7 +1088,6 @@ ifeq "$(ENABLE_JAVA)" "y"
 	JAVA_RUNTIME_DEPENDS += | java6-runtime
 	# Suns Java "packages"
 	JAVA_RUNTIME_DEPENDS += | jre
-  endif
 export JAVA_HOME
 	CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
 	JAVA_COMMON_DEPENDS= , libreoffice-java-common

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