[pkg-java] r17968 - trunk/java-common/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-02 20:58:45 +0000 (Wed, 02 Apr 2014)
New Revision: 17968

Modified:
   trunk/java-common/debian/changelog
   trunk/java-common/debian/rules
Log:
Prepared the default values for Java 8



Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog	2014-03-29 19:57:39 UTC (rev 17967)
+++ trunk/java-common/debian/changelog	2014-04-02 20:58:45 UTC (rev 17968)
@@ -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 ]

Modified: trunk/java-common/debian/rules
===================================================================
--- trunk/java-common/debian/rules	2014-03-29 19:57:39 UTC (rev 17967)
+++ trunk/java-common/debian/rules	2014-04-02 20:58:45 UTC (rev 17968)
@@ -30,7 +30,18 @@
 
 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