[java-common] 02/04: Prepared the default values for Java 10

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository java-common.

commit 11dffe7999422ac64a8a93ecde5e7c643cff7afb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 29 16:28:46 2017 +0200

    Prepared the default values for Java 10
---
 debian/changelog        |  1 +
 debian/java_defaults.mk | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50c20a4..484a529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 java-common (0.59) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Prepared the default values for Java 10
   * Standards-Version updated to 4.0.0
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 29 Jun 2017 15:36:19 +0200
diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk
index 3a25ccd..662fa94 100644
--- a/debian/java_defaults.mk
+++ b/debian/java_defaults.mk
@@ -1,8 +1,9 @@
 
 # makefile fragment to define the macros java_default_version,
-# java{,5,6,7,8,9}_architectures
+# java{,5,6,7,8,9,10}_architectures
 
-java9_architectures =
+java10_architectures =
+java9_architectures = $(java10_architectures)
 java8_architectures = $(java9_architectures) \
 		alpha amd64 arm64 armel armhf i386 \
 		m68k mips mipsel mips64el \
@@ -23,7 +24,9 @@ java_plugin_architectures = \
 		x32
 
 _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH))
-ifneq (,$(filter $(_java_host_arch),$(java9_architectures)))
+ifneq (,$(filter $(_java_host_arch),$(java10_architectures)))
+  java_default_version = 10
+else ifneq (,$(filter $(_java_host_arch),$(java9_architectures)))
   java_default_version = 9
 else ifneq (,$(filter $(_java_host_arch),$(java8_architectures)))
   java_default_version = 8
@@ -49,7 +52,7 @@ jvm_archdir_map = \
 jvm_archdir := \
 	$(strip $(patsubst $(_java_host_cpu)=%, %, $(filter $(_java_host_cpu)=%, $(jvm_archdir_map))))
 
-ifneq (,$(filter $(java_default_version), 9))
+ifneq (,$(filter $(java_default_version), 9 10))
   jvm_archpath := lib/$(jvm_archdir)
 else
   jvm_archpath := jre/lib/$(jvm_archdir)

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