diff options
| author | Matthias Klose <doko@debian.org> | 2014-01-11 13:23:51 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@debian.org> | 2014-01-11 13:23:51 +0000 |
| commit | 9f4c70b2c3a8c5ce95fbc42e7c1e2789755a7e25 (patch) | |
| tree | 2e48de94c5b3e6a3819e907fcc0de96275701741 /debian/rules | |
| parent | 643b3a87654a96a74fc96d94de8d23296188da0c (diff) | |
| download | java-common-9f4c70b2c3a8c5ce95fbc42e7c1e2789755a7e25.tar.gz | |
* Promote openjdk-7 as default-java on arm64, mips, mipsel, powerpcspe,
ppc64el, x32.
* Revert back to gcj on ia64. openjdk-7 fails to build, not porter feedback.
* Revert back to gcj on s390. openjdk-7 fails to build, not a release
architecture anymore.
* Revert back to gcj on sparc and sparc64. Hotspot for sparc isn't
maintained anymore upstream. No porter feedback about a Zero port.
* Revert back to gcj on kfreebsd-{i386,amd64}. The port is not yet
available upstream. No feedback from the kfreebsd porters, and no
updates for new upstream versions.
* Bump the epoch on the default-{jre-headless,jre,jdk} packages.
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules index f27d544..4d4b9c1 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ jdk_build_dep = v_jre = v_jdk = $(v_jre) provides = java java2 java5 -dversion = 1:1.5-$(jrel) +dversion = 2:1.5-$(jrel) jvmdir = java-gcj p_doc = openjdk-7-doc @@ -38,7 +38,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(java7_architectures))) v_jre = $(S)(>= 7~u3-2.1.1) v_jdk = $(v_jre) provides = java java2 java5 java6 java7 - dversion = 1:1.7-$(jrel) + dversion = 2:1.7-$(jrel) jvmdir = java-1.7.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH)) else ifneq (,$(filter $(DEB_HOST_ARCH),$(java6_architectures))) p_jre = openjdk-6-jre @@ -48,7 +48,7 @@ else ifneq (,$(filter $(DEB_HOST_ARCH),$(java6_architectures))) v_jre = $(S)(>= 6b23~pre8-2~) v_jdk = $(v_jre) provides = java java2 java5 java6 - dversion = 1:1.6-$(jrel) + dversion = 2:1.6-$(jrel) jvmdir = java-1.6.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH)) p_doc = openjdk-6-doc endif |