[java-policy] 174/198: Prepared the default values for Java 8

[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-policy.

commit 031c49028b8cb84c805bcae9c33919828272f02d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 2 20:58:45 2014 +0000

    Prepared the default values for Java 8
---
 debian/changelog |  7 +++++++
 debian/rules     | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a8f3761..0ecedf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+java-common (0.52) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Prepared the default values for Java 8
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 02 Apr 2014 22:57:37 +0200
+
 java-common (0.51) unstable; urgency=low
 
   [ Sylvestre Ledru ]
diff --git a/debian/rules b/debian/rules
index 4d4b9c1..f2b0462 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),$(java7_architectures)))
+ifneq (,$(filter $(DEB_HOST_ARCH),$(java8_architectures)))
+  p_jre         = openjdk-8-jre
+  p_jhl         = openjdk-8-jre-headless
+  p_jdk         = openjdk-8-jdk
+  jdk_build_dep = openjdk-7-jdk
+  v_jre         = $(S)(>= 8~b132-1)
+  v_jdk         = $(v_jre)
+  provides      = java java2 java5 java6 java7 java8
+  dversion      = 2:1.8-$(jrel)
+  jvmdir        = java-1.8.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
+  p_doc         = openjdk-8-doc
+else ifneq (,$(filter $(DEB_HOST_ARCH),$(java7_architectures)))
   p_jre		= openjdk-7-jre
   p_jhl		= openjdk-7-jre-headless
   p_jdk		= openjdk-7-jdk

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