Merge ~vpa1977/ubuntu/+source/jsurf-alggeo:java21-ftbfs into ubuntu/+source/jsurf-alggeo: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/15785409/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/jsurf-alggeo/+bug/2052990/comments/1

[Julian Andres Klode (juliank)]

Uploaded, thanks

review: Approve

diff --git a/debian/changelog b/debian/changelog
index c99cbdf..0c136e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jsurf-alggeo (0.4.1+ds-4ubuntu2) noble; urgency=medium
+
+  * d/rules: use java_compat_level variable provided by java-common to
+    adjust -source/-target level to the minimum required by the default
+    Java (LP: #2052990).
+
+ -- Vladimir Petko <[e-mail]>  Tue, 13 Feb 2024 16:18:10 +1300
+
 jsurf-alggeo (0.4.1+ds-4ubuntu1) mantic; urgency=medium
 
   * d/p/check-interrupted-status.patch: add retries to the test to avoid race
diff --git a/debian/rules b/debian/rules
index 8b0885f..c5fb549 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 include /usr/share/dpkg/pkg-info.mk
+include /usr/share/java/java_defaults.mk
 
 UPS_PKG_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed s/+.*//)
 DEB_PKG_VERSION = $(DEB_VERSION)
@@ -16,7 +17,7 @@ default:
 	dh $@ --with javahelper --with jh_maven_repo_helper
 
 override_jh_build-indep:
-	jh_build --javacopts="-source 1.7 -target 1.7" --javadoc-opts="-source 1.7"
+	jh_build --javacopts="-source $(java_compat_level) -target $(java_compat_level)" --javadoc-opts="-source $(java_compat_level)"
 
 override_dh_prep-indep:
 	$(MKDIR_P) debian/poms