[java-policy] 147/198: Make experimental upload with Java7 as default

[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 3f9fb5b13ac16efba9ddc045785d495044435f4b
Author: Niels Thykier <nthykier at debian.org>
Date:   Mon Jun 18 12:44:12 2012 +0000

    Make experimental upload with Java7 as default
---
 debian/changelog |  8 ++++++++
 debian/rules     | 16 ++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0031c3..2bf0494 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/rules b/debian/rules
index bfbc6e2..81efa64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,18 +27,18 @@ dversion	= 1:1.5-$(jrel)
 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)

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