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

[Niels Thykier]

Author: nthykier
Date: 2012-06-18 12:44:12 +0000 (Mon, 18 Jun 2012)
New Revision: 16136

Modified:
   trunk/java-common/debian/changelog
   trunk/java-common/debian/rules
Log:
Make experimental upload with Java7 as default

Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog	2012-06-17 23:00:30 UTC (rev 16135)
+++ trunk/java-common/debian/changelog	2012-06-18 12:44:12 UTC (rev 16136)
@@ -1,3 +1,11 @@
+java-common (0.47) experimental; urgency=low
+
+  * Upload to experimental.
+  * Replace java6 with java7 on architectures supporting
+    openjdk-7.
+
+ -- Niels Thykier <niels at thykier.net>  Mon, 18 Jun 2012 14:29:24 +0200
+
 java-common (0.47) unstable; urgency=low
 
   * Add creation and removal of /etc/.java (common to different OpenJDK

Modified: trunk/java-common/debian/rules
===================================================================
--- trunk/java-common/debian/rules	2012-06-17 23:00:30 UTC (rev 16135)
+++ trunk/java-common/debian/rules	2012-06-18 12:44:12 UTC (rev 16136)
@@ -27,18 +27,18 @@
 jvmdir		= java-gcj
 
 ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel armhf i386 ia64 lpia mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc sh4))
-  p_jre		= openjdk-6-jre
-  p_jhl		= openjdk-6-jre-headless
-  p_jdk		= openjdk-6-jdk
+  p_jre		= openjdk-7-jre
+  p_jhl		= openjdk-7-jre-headless
+  p_jdk		= openjdk-7-jdk
   jdk_build_dep	= gcj-jdk
-  v_jre		= $(S)(>= 6b23~pre8-2~)
+  v_jre		= $(S)(>= 7~u3-2.1.1)
   v_jdk		= $(v_jre)
-  provides	= java java2 java5 java6
-  dversion	= 1:1.6-$(jrel)
-  jvmdir	= java-1.6.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
+  provides	= java java2 java5 java6 java7
+  dversion	= 1:1.7-$(jrel)
+  jvmdir	= java-1.7.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
 endif
 
-p_doc		= openjdk-6-doc
+p_doc		= openjdk-7-doc
 
 jre_provides	= $(call mk_cslist,$(provides),runtime)
 jhl_provides	= $(call mk_cslist,$(provides),runtime-headless)