Emmanuel Bourg pushed to branch master at Debian Java Maintainers / java-common
Commits: e34b40ab by Emmanuel Bourg at 2019-07-17T08:29:42Z Prepared the default values for Java 13 to 17 - - - - - 9c9aba4a by Emmanuel Bourg at 2019-07-17T08:31:05Z Standards-Version updated to 4.4.0 - - - - - 319cd6e6 by Emmanuel Bourg at 2019-07-17T09:11:20Z Upload to unstable - - - - - 3 changed files: - debian/changelog - debian/control - debian/java_defaults.mk Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +java-common (0.72) unstable; urgency=medium + + * Team upload. + * Prepared the default values for Java 13 to 17 + * Standards-Version updated to 4.4.0 + + -- Emmanuel Bourg <ebo...@apache.org> Wed, 17 Jul 2019 11:11:14 +0200 + java-common (0.71) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Matthias Klose <d...@debian.org> Build-Depends: debhelper (>= 11) -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Vcs-Git: https://salsa.debian.org/java-team/java-common.git Vcs-Browser: https://salsa.debian.org/java-team/java-common Homepage: https://wiki.debian.org/Java/ ===================================== debian/java_defaults.mk ===================================== @@ -1,8 +1,12 @@ - # makefile fragment to define the macros java_default_version, -# java{,5,6,7,8,9,10,11,12}_architectures +# java{,5,6,...,17}_architectures -java12_architectures = +java17_architectures = +java16_architectures = $(java17_architectures) +java15_architectures = $(java16_architectures) +java14_architectures = $(java15_architectures) +java13_architectures = $(java14_architectures) +java12_architectures = $(java13_architectures) java11_architectures = $(java12_architectures) \ alpha amd64 arm64 armel armhf i386 \ ia64 m68k mips mipsel mips64el \ @@ -25,7 +29,17 @@ java_default_architectures = $(java8_architectures) java_dependency = $(strip $(1) [$(foreach a,$(filter-out $(java_default_architectures), $(java5_architectures)),!$(a))]) _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH)) -ifneq (,$(filter $(_java_host_arch),$(java12_architectures))) +ifneq (,$(filter $(_java_host_arch),$(java17_architectures))) + java_default_version = 17 +else ifneq (,$(filter $(_java_host_arch),$(java16_architectures))) + java_default_version = 16 +else ifneq (,$(filter $(_java_host_arch),$(java15_architectures))) + java_default_version = 15 +else ifneq (,$(filter $(_java_host_arch),$(java14_architectures))) + java_default_version = 14 +else ifneq (,$(filter $(_java_host_arch),$(java13_architectures))) + java_default_version = 13 +else ifneq (,$(filter $(_java_host_arch),$(java12_architectures))) java_default_version = 12 else ifneq (,$(filter $(_java_host_arch),$(java11_architectures))) java_default_version = 11 @@ -57,7 +71,7 @@ jvm_archdir_map = \ jvm_archdir := \ $(strip $(patsubst $(_java_host_cpu)=%, %, $(filter $(_java_host_cpu)=%, $(jvm_archdir_map)))) -ifneq (,$(filter $(java_default_version), 9 10 11 12)) +ifneq (,$(filter $(java_default_version), 9 10 11 12 13 14 15 16 17)) jvm_archpath := lib/$(jvm_archdir) else jvm_archpath := jre/lib/$(jvm_archdir) View it on GitLab: https://salsa.debian.org/java-team/java-common/compare/5d6434291ec0a767993038fded37795ba41dbb9f...319cd6e6caef33051d2b0058ef3aea5d2022dced -- View it on GitLab: https://salsa.debian.org/java-team/java-common/compare/5d6434291ec0a767993038fded37795ba41dbb9f...319cd6e6caef33051d2b0058ef3aea5d2022dced You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits