* 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.

3 files changed, 25 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 0495b94..d207bd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,22 @@
 java-common (0.51) UNRELEASED; urgency=low
 
+  [ Sylvestre Ledru ]
   * Fix some wrong version declarations
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 25 Nov 2013 15:46:09 +0100
+  [ Matthias Klose ]
+  * 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.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 11 Jan 2014 13:52:50 +0100
 
 java-common (0.50) unstable; urgency=low
 
@@ -13,7 +27,6 @@ java-common (0.50) unstable; urgency=low
   [ Damien Raude-Morvan ]
   * Promote openjdk-7 as default-java on kfreebsd-{i386,amd64}.
 
-
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 23 Nov 2013 14:55:24 +0100
 
 java-common (0.49) unstable; urgency=low
diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk
index 7eaa34d..f51b8b9 100644
--- a/debian/java_defaults.mk
+++ b/debian/java_defaults.mk
@@ -3,13 +3,14 @@
 # java{,5,6,7,8}_architectures
 
 java8_architectures =
-java7_architectures = alpha amd64 armel armhf arm64 i386 ia64 lpia \
-		kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 \
-		s390x sh4 sparc sparc64
-java6_architectures = $(java7_architectures) \
-		mips mipsel powerpcspe s390
+java7_architectures = alpha amd64 arm64 armel armhf arm64 i386 lpia \
+		mips mipsel \
+		powerpc powerpcspe ppc64 ppc64el \
+		s390x sh4 x32
+java6_architectures = $(java7_architectures)
 java5_architectures = $(java6_architectures) \
-		hppa m68k x32 hurd-i386
+		hppa ia64 m68k s390 sparc sparc64 \
+		kfreebsd-amd64 kfreebsd-i386 hurd-i386
 java_architectures = $(java5_architectures)
 
 _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH))
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