Merge ~vpa1977/ubuntu/+source/jlapack:java-21-ftbfs into ubuntu/+source/jlapack:ubuntu/devel

[Vladimir Petko]

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [1]

Changes:
 - use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java

Testing:
 - rebuild in default Java 21 ppa[2]
 - piuparts test [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15775864/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/jlapack/+bug/2052563/comments/1

diff --git a/debian/changelog b/debian/changelog
index 9eb0c5d..f184fb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jlapack (0.8~dfsg-5ubuntu1) noble; urgency=medium
+
+  * d/rules, d/p/java9.patch: use java_compat_level variable provided by
+    java-common to adjust -source/-target level to the minimum required by the
+    default Java (LP: #2052563).
+
+ -- Vladimir Petko <[e-mail]>  Fri, 17 Nov 2023 20:55:38 +1300
+
 jlapack (0.8~dfsg-5) unstable; urgency=medium
 
   * Fake watch file
diff --git a/debian/control b/debian/control
index e19d06e..4e318e1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: jlapack
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Olivier Sallou <[e-mail]>,
            Andreas Tille <[e-mail]>
 Section: java
diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
index 5be0659..3c715c1 100644
--- a/debian/patches/java9.patch
+++ b/debian/patches/java9.patch
@@ -9,16 +9,14 @@ Forwarded: no
  jlapack-3.1.1/make.def | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/jlapack-3.1.1/make.def b/jlapack-3.1.1/make.def
-index 4250a84..054b849 100644
 --- a/jlapack-3.1.1/make.def
 +++ b/jlapack-3.1.1/make.def
-@@ -3,7 +3,7 @@ VERSION=jlapack-0.8
+@@ -3,7 +3,7 @@
  F2J=f2java
  JAVA=java
  MORE_MEM_FLAG=-Xmx500M
 -JAVAC=javac -source 1.4 -target 1.4
-+JAVAC=javac -source 1.7 -target 1.7
++JAVAC=javac -source $$JAVA_COMPAT_LEVEL -target $$JAVA_COMPAT_LEVEL
  JAVAB=javab
  JAR=jar
  # JAR=/usr/bin/jar
diff --git a/debian/rules b/debian/rules
index 5937fae..c8119f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-
+include /usr/share/java/java_defaults.mk
+export JAVA_COMPAT_LEVEL=$(java_compat_level)
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1