[libreoffice] 01/01: fix default-jdk 1.9 epoch
Rene Engelhard
rene at moszumanska.debian.org
Fri Nov 24 22:18:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit cc8b872d5ea77132409f260e24b20f58b5125d08
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Fri Nov 24 23:17:51 2017 +0100
fix default-jdk 1.9 epoch
---
rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules b/rules
index ffdf806..04bf204 100755
--- a/rules
+++ b/rules
@@ -1048,7 +1048,7 @@ ifeq "$(ENABLE_JAVA)" "y"
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 (>= 1:1.9) [i386]
+# BUILD_DEPS += , default-jdk (>= 2:1.9) [i386]
# hack.
BUILD_DEPS += , openjdk-9-jdk (>= 9.0.1+11-1~) [i386]
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list