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

[Matthias Klose]

Author: doko
Date: 2014-01-11 13:23:51 +0000 (Sat, 11 Jan 2014)
New Revision: 17653

Modified:
   trunk/java-common/debian/changelog
   trunk/java-common/debian/java_defaults.mk
   trunk/java-common/debian/rules
Log:
  * 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.


Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog	2014-01-10 15:40:00 UTC (rev 17652)
+++ trunk/java-common/debian/changelog	2014-01-11 13:23:51 UTC (rev 17653)
@@ -1,9 +1,23 @@
 java-common (0.51) UNRELEASED; urgency=low
 
+  [ Sylvestre Ledru ]
   * Fix some wrong version declarations
 
- -- Sylvestre Ledru <sylvestre at 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 at debian.org>  Sat, 11 Jan 2014 13:52:50 +0100
+
 java-common (0.50) unstable; urgency=low
 
   * Remove the 'Libraries must depend on the needed runtime environment'
@@ -13,7 +27,6 @@
   [ Damien Raude-Morvan ]
   * Promote openjdk-7 as default-java on kfreebsd-{i386,amd64}.
 
-
  -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 23 Nov 2013 14:55:24 +0100
 
 java-common (0.49) unstable; urgency=low

Modified: trunk/java-common/debian/java_defaults.mk
===================================================================
--- trunk/java-common/debian/java_defaults.mk	2014-01-10 15:40:00 UTC (rev 17652)
+++ trunk/java-common/debian/java_defaults.mk	2014-01-11 13:23:51 UTC (rev 17653)
@@ -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))

Modified: trunk/java-common/debian/rules
===================================================================
--- trunk/java-common/debian/rules	2014-01-10 15:40:00 UTC (rev 17652)
+++ trunk/java-common/debian/rules	2014-01-11 13:23:51 UTC (rev 17653)
@@ -23,7 +23,7 @@
 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 @@
   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 @@
   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