diff options
| author | Markus Koschany <apo@debian.org> | 2016-06-26 20:41:57 +0200 |
|---|---|---|
| committer | Markus Koschany <apo@debian.org> | 2016-06-26 20:41:57 +0200 |
| commit | a5990d1bdf0bca8531bebb41a613d185af215cb3 (patch) | |
| tree | 1d0e8728c322ce7687b49fc65f633a6a46b167f9 | |
| parent | 095d954ef920c29d2a368d89a022e74c1d66d375 (diff) | |
| download | java-common-debian/0.47+deb7u2.tar.gz | |
Switch default Java environment in Wheezy to OpenJDK 7.debian/0.47+deb7u2
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/rules | 16 |
2 files changed, 15 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 6257910..89aa754 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +java-common (0.47+deb7u2) wheezy-security; urgency=high + + * Team upload. + * Switch default Java environment from OpenJDK 6 to OpenJDK 7 in Wheezy LTS. + + -- Markus Koschany <apo@debian.org> Sun, 26 Jun 2016 20:40:32 +0200 + java-common (0.47+deb7u1) wheezy-security; urgency=high * Non-maintainer upload by the LTS team. 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) |