[java-common] 01/01: Merge branch '0.52.1'

[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-common.

commit 86296d83caa55469f5e49d593bacc5ce37693e2c
Merge: d367baa 0379297
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Oct 11 22:08:03 2015 +0200

    Merge branch '0.52.1'

 debian/changelog        |  8 ++++++++
 debian/java_defaults.mk | 25 +++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 8cbe5b7,a4daab6..cb3b8a7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,50 -1,11 +1,58 @@@
 +java-common (0.54) UNRELEASED; urgency=medium
 +
 +  * Team upload.
 +  * Use OpenJDK 8 on mips, mipsel and mips64el.
 +  * Added a new default-java-plugin package depending on the right plugin
 +    package for the current architecture, typically icedtea-<n>-plugin.
 +    default-java-plugin provides icedtea-plugin (Closes: #678381).
 +  * default-jre now recommends default-java-plugin
 +  * The Java Policy and the FAQ have been moved to the new java-policy package.
 +  * default-jdk-doc is now architecture dependent (Closes: #801257)
 +  * gcj-native-helper no longer depends on default-jdk
 +  * gcj-native-helper depends on gcj-jdk instead of openjdk (regression in 0.53)
 +  * default-jdk/jre now have unversioned dependencies on openjdk
 +  * Dropped support for non multiarch aware openjdk packages
 +  * update-java-alternatives now supports bash completion (Closes: #777550)
 +  * The output of update-java-alternatives --list is now aligned vertically
 +  * Removed the unused classpath-from-jars-1 example
 +  * Removed the old dummy control files
 +  * Removed the README about the old default-jdk-builddep transition
 +  * Removed the unused Lintian overrides for java-common
 +  * Removed the not implemented --test option from update-java-alternatives
 +    (Closes: #800024)
 +  * Converted debian/copyright to the Copyright Format 1.0
 +  * Simplified debian/rules using the dh sequencer
 +  * Removed the default values for Java 6 (no longer used)
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Tue, 22 Sep 2015 09:23:34 +0200
 +
 +java-common (0.53) experimental; urgency=medium
 +
 +  * Team upload.
 +  * Use OpenJDK 8 on amd64, arm64, armel, armhf, i386, powerpc, powerpcspe,
 +    ppc64, ppc64el, s390x and x32.
 +  * Prepared the default values for Java 9
 +  * Policy changes:
 +    - Programs must depend on the needed runtime environment, but not
 +      the libraries (Closes: #730133)
 +    - Replaced 'java' with 'Java' when referring to the language
 +    - Mentioned the virtual packages java{5,6,7,8}-runtime(-headless)?
 +  * Removed Niels Thykier from the uploaders (Closes: #770579)
 +  * Changed the maintainer from 'Debian Java Mailing List'
 +    to 'Debian Java Maintainers'
 +  * Standards-Version updated to 3.9.6 (no changes)
 +  * Moved the package to Git
 +
 + -- Emmanuel Bourg <ebourg at apache.org>  Tue, 01 Sep 2015 23:11:54 +0200
 +
+ java-common (0.52.1) unstable; urgency=medium
+ 
+   * Team upload.
+   * Bump kfreebsd-amd64 kfreebsd-i386 to 1.7 again.
+   * java_defaults.mk: Add jvm_archdir and jvm_archpath macros.
+ 
+  -- Matthias Klose <doko at debian.org>  Sun, 11 Oct 2015 09:40:26 +0200
+ 
  java-common (0.52) unstable; urgency=medium
  
    * Team upload.
diff --cc debian/java_defaults.mk
index dc20ecc,47863db..b5877a9
--- a/debian/java_defaults.mk
+++ b/debian/java_defaults.mk
@@@ -1,15 -1,12 +1,16 @@@
  
  # makefile fragment to define the macros java_default_version,
 -# java{,5,6,7,8}_architectures
 +# java{,5,6,7,8,9}_architectures
  
 -java8_architectures =
 -java7_architectures = alpha amd64 arm64 armel armhf arm64 i386 lpia \
 +java9_architectures =
 +java8_architectures = $(java9_architectures) \
 +		amd64 arm64 armel armhf i386 \
  		mips mipsel mips64el \
  		powerpc powerpcspe ppc64 ppc64el \
 -		s390x sh4 x32 kfreebsd-amd64 kfreebsd-i386
 +		s390x x32
 +java7_architectures = $(java8_architectures) \
- 		alpha lpia sh4
++		alpha lpia sh4 \
++		kfreebsd-amd64 kfreebsd-i386
  java6_architectures = $(java7_architectures)
  java5_architectures = $(java6_architectures) \
  		hppa ia64 m68k s390 sparc sparc64 \

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