[java-common] 01/02: Import Debian version 0.60

[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 ee44169faa5f3beaa48a12d9e8055a4fefe964b8
Author: Matthias Klose <doko at debian.org>
Date:   Thu Mar 15 19:59:44 2018 +0100

    Import Debian version 0.60
    
    java-common (0.60) unstable; urgency=medium
    
      * Don't build jre/jdk defaults packages on platforms still relying
        on java 5 (provided by gcj). Closes: #892529.
      * Remove kfreebsd-amd64 kfreebsd-i386 from java9_architectures.
      * Prepare the default values for Java 11
      * Stop building gcj-native-helper.
      * java_defaults.mk: Add two new macros:
        - java_default_architectures
        - java_dependency, call as $(call java_dependency, default-jdk)
          -> default-jdk [!hppa !ia64 !s390 !sparc !hurd-i386]
---
 debian/changelog        | 14 ++++++++++++++
 debian/control          |  2 +-
 debian/java_defaults.mk | 15 ++++++++++-----
 debian/rules            |  8 +++++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff649fa..6de5f31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+java-common (0.60) unstable; urgency=medium
+
+  * Don't build jre/jdk defaults packages on platforms still relying
+    on java 5 (provided by gcj). Closes: #892529.
+  * Remove kfreebsd-amd64 kfreebsd-i386 from java9_architectures.
+  * Prepare the default values for Java 11
+  * Stop building gcj-native-helper.
+  * java_defaults.mk: Add two new macros:
+    - java_default_architectures
+    - java_dependency, call as $(call java_dependency, default-jdk)
+      -> default-jdk [!hppa !ia64 !s390 !sparc !hurd-i386]
+
+ -- Matthias Klose <doko at debian.org>  Thu, 15 Mar 2018 19:59:44 +0100
+
 java-common (0.59) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 1727642..248a137 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Matthias Klose <doko at debian.org>
 Build-Depends: debhelper (>= 10)
-Standards-Version: 4.0.0
+Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/java-common.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/java-common.git
 Homepage: https://wiki.debian.org/Java/
diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk
index 662fa94..c8a34e9 100644
--- a/debian/java_defaults.mk
+++ b/debian/java_defaults.mk
@@ -1,14 +1,15 @@
 
 # makefile fragment to define the macros java_default_version,
-# java{,5,6,7,8,9,10}_architectures
+# java{,5,6,7,8,9,10,11}_architectures
 
-java10_architectures =
-java9_architectures = $(java10_architectures)
-java8_architectures = $(java9_architectures) \
+java11_architectures =
+java10_architectures = $(java11_architectures)
+java9_architectures = $(java10_architectures) \
 		alpha amd64 arm64 armel armhf i386 \
 		m68k mips mipsel mips64el \
 		powerpc powerpcspe ppc64 ppc64el \
-		s390x sh4 sparc64 x32 \
+		s390x sh4 sparc64 x32
+java8_architectures = $(java9_architectures) \
 		kfreebsd-amd64 kfreebsd-i386
 java7_architectures = $(java8_architectures)
 java6_architectures = $(java7_architectures)
@@ -17,6 +18,10 @@ java5_architectures = $(java6_architectures) \
 		hurd-i386
 java_architectures = $(java5_architectures)
 
+java_default_architectures = $(java8_architectures)
+
+java_dependency = $(strip $(1) [$(foreach a,$(filter-out $(java_default_architectures), $(java5_architectures)),!$(a))])
+
 java_plugin_architectures = \
 		amd64 arm64 armel armhf i386 \
 		powerpc ppc64 ppc64el s390x \
diff --git a/debian/rules b/debian/rules
index 8fc3b8e..862a34e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,12 @@ ifeq (,$(filter $(_java_host_arch),$(java_plugin_architectures)))
   p_plugin      =
 endif
 
+nopkgs = -Ngcj-native-helper
+ifeq (5, $(java_default_version))
+	p_jre =
+	nopkgs += -N$(p_jre) -N$(p_jhl) -N$(p_jdk) -N$(p_jdkhl)
+endif
+
 jre_provides	= java-runtime, java2-runtime, $(shell seq --format java%.f-runtime --separator ', ' 5 $(java_default_version))
 jhl_provides	= java-runtime-headless, java2-runtime-headless, $(shell seq --format java%.f-runtime-headless --separator ', ' 5 $(java_default_version))
 jdk_provides	= java-sdk, java2-sdk, $(shell seq --format java%.f-sdk --separator ', ' 5 $(java_default_version))
@@ -88,7 +94,7 @@ endif
 override_dh_builddeb:
 	dh_builddeb -i
 ifneq (,$(p_jre))
-	dh_builddeb -a --no-package=default-java-plugin
+	dh_builddeb -a --no-package=default-java-plugin $(nopkgs)
 endif
 ifneq (,$(p_plugin))
 	dh_builddeb -pdefault-java-plugin

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