[java-policy] 138/198: Merge changes from unstable (uploads by doko)

[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 ab5553e5e6e9cc7359e3ce97ab38bd89b8ea4995
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sat Sep 3 14:47:09 2011 +0000

    Merge changes from unstable (uploads by doko)
---
 debian/changelog                 | 28 ++++++++++++++++++++++++++--
 debian/control                   |  1 +
 debian/rules                     |  7 ++++---
 scripts/update-java-alternatives |  5 +++++
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c34f33f..1a221d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,18 @@
-java-common (0.41) UNRELEASED; urgency=low
+java-common (0.43) unstable; urgency=low
+
+  * Depend on the multiarch aware openjdk-6-jre-headless.
+  * Default to openjdk-6 on ppc64.
+  * update-java-alternatives: Substitute <jname> with <jname>-<arch>.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 28 Aug 2011 18:08:08 +0200
+
+java-common (0.42) unstable; urgency=low
+
+  * Set jvmdir to java-1.6.0-openjdk for the openjdk-6 default.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 27 Aug 2011 14:21:43 +0200
+
+java-common (0.41) unstable; urgency=low
 
   * Bumped Standards-Versions to 3.9.1 - no changes required.
   * Removed DMUA  - no longer required.
@@ -8,7 +22,17 @@ java-common (0.41) UNRELEASED; urgency=low
     Revert of the change introduced in version 0.39
   * Remove outdated information about java in Squeeze (Closes: #617803)
 
- -- Niels Thykier <niels at thykier.net>  Tue, 09 Nov 2010 08:32:02 +0100
+  [ Matthias Klose ]
+  * Default to openjdk-6 on s390x. Closes: #638361.
+  * Default to openjdk-6 on armhf.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 27 Aug 2011 13:30:55 +0200
+
+java-common (0.40ubuntu1) natty; urgency=low
+
+  * Default to OpenJDK on ppc64.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sat, 20 Nov 2010 16:24:51 +0100
 
 java-common (0.40) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4ea1548..7c9e921 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Architecture: any
 Depends: ${jhl}${jre:version}, java-common, ${misc:Depends}
 Suggests: default-jre
 Provides: ${jhl:provides}
+Replaces: openjdk-6-jre-headless (<< 6b23~pre8-2~)
 Description: Standard Java or Java compatible Runtime (headless)
  This package points to the Java runtime, or Java compatible
  runtime recommended for this architecture, which is
diff --git a/debian/rules b/debian/rules
index 2ad735b..c8867ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ jrel = $(shell dpkg-parsechangelog | grep -E ^Version: | sed "s/Version: 0.//")
 
 DPKG_VARS := $(shell dpkg-architecture)
 DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH)
 
 p_jre		= gcj-jre
 p_jhl		= gcj-jre-headless
@@ -25,16 +26,16 @@ provides	= java java2 java5
 dversion	= 1:1.5-$(jrel)
 jvmdir		= java-gcj
 
-ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel i386 ia64 lpia mips mipsel powerpc powerpcspe s390 sparc sh4))
+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
   jdk_build_dep	= gcj-jdk
-  v_jre		= $(S)(>= 6b14)
+  v_jre		= $(S)(>= 6b23~pre8-2~)
   v_jdk		= $(v_jre)
   provides	= java java2 java5 java6
   dversion	= 1:1.6-$(jrel)
-  jvmdir	= java-6-openjdk
+  jvmdir	= java-1.6.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
 endif
 
 p_doc		= openjdk-6-doc
diff --git a/scripts/update-java-alternatives b/scripts/update-java-alternatives
index aadbb5e..5e31a68 100755
--- a/scripts/update-java-alternatives
+++ b/scripts/update-java-alternatives
@@ -79,6 +79,11 @@ fi
 top=/usr/lib/jvm
 
 if [ -n "$jname" ]; then
+    arch=$(dpkg --print-architecture)
+    if [ ! -x $top/$jname/bin/java ] && [ -x $top/$jname-$arch/bin/java ]; then
+	echo >&2 "$prog: obsolete <jname>, please use $jname-$arch instead"
+	jname=$jname-$arch
+    fi
     case "$jname" in
 	/*) jdir=$jname; jname=$(basename $jdir);;
 	*)  jdir=$top/$jname

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