[Git][java-team/java-common][master] 9 commits: Use OpenJDK 17 on the architectures with a port available

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Mon Oct 31 18:09:18 GMT 2022 


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / java-common


Commits:
cd3766b8 by Emmanuel Bourg at 2022-10-31T14:13:11+01:00
Use OpenJDK 17 on the architectures with a port available

- - - - -
115459de by Emmanuel Bourg at 2022-10-31T14:13:28+01:00
Standards-Version updated to 4.6.1

- - - - -
237cfae1 by Emmanuel Bourg at 2022-10-31T14:13:43+01:00
Switch to debhelper level 13

- - - - -
4fbcff88 by Emmanuel Bourg at 2022-10-31T14:46:11+01:00
Dropped unsupported architectures: hppa, kfreebsd-*, hurd-i386, powerpcspe, s390 and sparc

- - - - -
a4244104 by Emmanuel Bourg at 2022-10-31T15:51:35+01:00
New macro java_unsupported_architectures listing architectures without Java

- - - - -
7e436bf3 by Emmanuel Bourg at 2022-10-31T16:15:33+01:00
Keep the default values for the LTS versions since Java 8 only (8, 11, 17)

- - - - -
fc8f4231 by Emmanuel Bourg at 2022-10-31T16:33:47+01:00
The java-runtime and java-runtime-headless virtual packages are now versioned

- - - - -
d8644b5a by Emmanuel Bourg at 2022-10-31T19:03:01+01:00
Fixed the return code of update-java-alternatives --list and --set (Closes: #929105, #1017922)

- - - - -
f96b92ec by Emmanuel Bourg at 2022-10-31T19:08:03+01:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/java_defaults.mk
- debian/rules
- scripts/update-java-alternatives


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+java-common (0.73) unstable; urgency=medium
+
+  * Team upload.
+  * Use OpenJDK 17 on alpha, amd64, arm64, armel, armhf, i386, ia64, m68k,
+    mipsel, mips64el, ppc64, ppc64el, riscv64, s390x, sh4, sparc64 and x32.
+  * The java-runtime & java-runtime-headless virtual packages are now versioned
+  * Fixed the return code of update-java-alternatives --list and --set
+    (Closes: #929105, #1017922)
+  * Dropped unsupported architectures: hppa, kfreebsd-amd64, kfreebsd-i386,
+    hurd-i386, powerpcspe, s390 and sparc
+  * New macro java_unsupported_architectures listing architectures without Java
+  * Keep the default values for the LTS versions since Java 8 only (8, 11, 17)
+  * Standards-Version updated to 4.6.1
+  * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 31 Oct 2022 19:07:53 +0100
+
 java-common (0.72) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -3,8 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Matthias Klose <doko at debian.org>
-Build-Depends: debhelper (>= 11)
-Standards-Version: 4.4.0
+Build-Depends: debhelper-compat (= 13)
+Standards-Version: 4.6.1
 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,60 +1,30 @@
 # makefile fragment to define the macros java_default_version,
-# java{,5,6,...,17}_architectures
+# java{,8,...,17}_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) \
+java17_architectures = \
 		alpha amd64 arm64 armel armhf i386 \
-		ia64 m68k mips mipsel mips64el \
-		powerpc ppc64 ppc64el \
+		ia64 m68k mipsel mips64el \
+		ppc64 ppc64el \
 		riscv64 s390x sh4 sparc64 x32
-java10_architectures = $(java11_architectures) \
-		powerpcspe
-java9_architectures = $(java10_architectures)
-java8_architectures = $(java9_architectures) \
-		kfreebsd-amd64 kfreebsd-i386
-java7_architectures = $(java8_architectures)
-java6_architectures = $(java7_architectures)
-java5_architectures = $(java6_architectures) \
-		hppa s390 sparc \
-		hurd-i386
-java_architectures = $(java5_architectures)
+java11_architectures = $(java17_architectures) \
+		mips powerpc
+java8_architectures = $(java11_architectures)
+java_architectures = $(java8_architectures)
 
 java_default_architectures = $(java8_architectures)
 
-java_dependency = $(strip $(1) [$(foreach a,$(filter-out $(java_default_architectures), $(java5_architectures)),!$(a))])
+java_unsupported_architectures = hppa hurd-i386 kfreebsd-amd64 kfreebsd-i386 hurd-i386 powerpcspe s390 sparc
+
+java_dependency = $(strip $(1) [$(foreach a,$(filter-out $(java_default_architectures), $(java_unsupported_architectures)),!$(a))])
+
 
 _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH))
 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
-else ifneq (,$(filter $(_java_host_arch),$(java10_architectures)))
-  java_default_version = 10
-else ifneq (,$(filter $(_java_host_arch),$(java9_architectures)))
-  java_default_version = 9
 else ifneq (,$(filter $(_java_host_arch),$(java8_architectures)))
   java_default_version = 8
-else ifneq (,$(filter $(_java_host_arch),$(java6_architectures)))
-  java_default_version = 7
-else ifneq (,$(filter $(_java_host_arch),$(java6_architectures)))
-  java_default_version = 6
-else ifneq (,$(filter $(_java_host_arch),$(java5_architectures)))
-  java_default_version = 5
 endif
 
 # jvm_archdir is the directory for architecture specific files / libraries
@@ -63,24 +33,21 @@ endif
 
 _java_host_cpu := $(if $(DEB_HOST_ARCH_CPU),$(DEB_HOST_ARCH_CPU),$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU))
 jvm_archdir_map = \
-	alpha=alpha armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc \
+	alpha=alpha armel=arm armhf=arm arm64=aarch64 amd64=amd64 \
 	i386=i386 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el \
-	powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le riscv64=riscv64 \
-	sparc=sparc sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 x32=x32
+	powerpc=ppc ppc64=ppc64 ppc64el=ppc64le riscv64=riscv64 \
+	sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 x32=x32
 
 jvm_archdir := \
 	$(strip $(patsubst $(_java_host_cpu)=%, %, $(filter $(_java_host_cpu)=%, $(jvm_archdir_map))))
 
-ifneq (,$(filter $(java_default_version), 9 10 11 12 13 14 15 16 17))
-  jvm_archpath := lib/$(jvm_archdir)
-else
+ifneq (,$(filter $(java_default_version), 8))
   jvm_archpath := jre/lib/$(jvm_archdir)
+else
+  jvm_archpath := lib/$(jvm_archdir)
 endif
 
 _jvm_osinclude = linux
-ifeq (,$(filter $(java_default_version), 6 7))
-  _jvm_osinclude = $(if $(findstring kfreebsd,$(_java_host_arch)),bsd,linux)
-endif
 
 jvm_includes = \
 	-I/usr/lib/jvm/java-$(java_default_version)-openjdk-$(_java_host_arch)/include \


=====================================
debian/rules
=====================================
@@ -7,8 +7,8 @@ release = $(shell dpkg-parsechangelog | grep -E ^Version: | sed "s/Version: 0.//
 
 dversion	= 2:1.$(java_default_version)-$(release)
 
-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))
+jre_provides	= java-runtime (= $(java_default_version)), java2-runtime, $(shell seq --format java%.f-runtime --separator ', ' 5 $(java_default_version))
+jhl_provides	= java-runtime-headless (= $(java_default_version)), 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))
 jdkhl_provides	= java-sdk-headless, java2-sdk-headless, $(shell seq --format java%.f-sdk-headless --separator ', ' 5 $(java_default_version))
 


=====================================
scripts/update-java-alternatives
=====================================
@@ -153,3 +153,5 @@ if [ "$action" != list ] && [ "$(id -u)" -ne 0 ]; then
 fi
 
 do_$action
+
+exit 0



View it on GitLab: https://salsa.debian.org/java-team/java-common/-/compare/319cd6e6caef33051d2b0058ef3aea5d2022dced...f96b92ec229cbb31cf89b18a54d69fb924b77249

-- 
View it on GitLab: https://salsa.debian.org/java-team/java-common/-/compare/319cd6e6caef33051d2b0058ef3aea5d2022dced...f96b92ec229cbb31cf89b18a54d69fb924b77249
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20221031/1838a7b7/attachment.htm>

More information about the pkg-java-commits mailing list