[java-common] 02/05: Prepared the default values for Java 9

[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 763a290c3f4a830eaf63dedd95c619c853ca6307
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 1 22:35:23 2015 +0200

    Prepared the default values for Java 9
---
 debian/changelog        |  1 +
 debian/java_defaults.mk | 11 +++++++----
 debian/rules            | 13 ++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6382df0..127a39d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 java-common (0.53) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Prepared the default values for Java 9
   * Policy changes:
     - Programs must depend on the needed runtime environment, but not
       the libraries (Closes: #730133)
diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk
index 65728f4..62a2a80 100644
--- a/debian/java_defaults.mk
+++ b/debian/java_defaults.mk
@@ -1,9 +1,10 @@
 
 # makefile fragment to define the macros java_default_version,
-# java{,5,6,7,8}_architectures
+# java{,5,6,7,8,9}_architectures
 
-java8_architectures =
-java7_architectures = alpha amd64 arm64 armel armhf arm64 i386 lpia \
+java9_architectures =
+java8_architectures = $(java9_architectures)
+java7_architectures = $(java8_architectures) alpha amd64 arm64 armel armhf arm64 i386 lpia \
 		mips mipsel mips64el \
 		powerpc powerpcspe ppc64 ppc64el \
 		s390x sh4 x32
@@ -14,7 +15,9 @@ java5_architectures = $(java6_architectures) \
 java_architectures = $(java5_architectures)
 
 _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH))
-ifneq (,$(filter $(_java_host_arch),$(java8_architectures)))
+ifneq (,$(filter $(_java_host_arch),$(java9_architectures)))
+  java_default_version = 9
+else ifneq (,$(filter $(_java_host_arch),$(java8_architectures)))
   java_default_version = 8
 else ifneq (,$(filter $(_java_host_arch),$(java6_architectures)))
   java_default_version = 7
diff --git a/debian/rules b/debian/rules
index f2b0462..fa6d935 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,18 @@ p_doc		= openjdk-7-doc
 
 include debian/java_defaults.mk
 
-ifneq (,$(filter $(DEB_HOST_ARCH),$(java8_architectures)))
+ifneq (,$(filter $(DEB_HOST_ARCH),$(java9_architectures)))
+  p_jre         = openjdk-9-jre
+  p_jhl         = openjdk-9-jre-headless
+  p_jdk         = openjdk-9-jdk
+  jdk_build_dep = openjdk-8-jdk
+  v_jre         = $(S)(>= 9~b74-1)
+  v_jdk         = $(v_jre)
+  provides      = java java2 java5 java6 java7 java8 java9
+  dversion      = 2:1.9-$(jrel)
+  jvmdir        = java-1.9.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
+  p_doc         = openjdk-9-doc
+else ifneq (,$(filter $(DEB_HOST_ARCH),$(java8_architectures)))
   p_jre         = openjdk-8-jre
   p_jhl         = openjdk-8-jre-headless
   p_jdk         = openjdk-8-jdk

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