Merge ~vpa1977/ubuntu/+source/altos:java21-ftbfs into ubuntu/+source/altos:ubuntu/devel

[Vladimir Petko]

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [1]

Changes:
 - Pass java_compat_level provided by java-common as a configure option.

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/15798947/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/altos/+bug/2054254/comments/1

diff --git a/debian/changelog b/debian/changelog
index a791a8a..f94122c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+altos (1.9.17-1ubuntu1) noble; urgency=medium
+
+  * d/rules: pass java_compat_level provided by java-common as a
+    configure option (LP: #2054254).
+
+ -- Vladimir Petko <[e-mail]>  Mon, 19 Feb 2024 12:16:52 +1300
+
 altos (1.9.17-1) unstable; urgency=medium
 
   [ Bdale Garbee ]
diff --git a/debian/control b/debian/control
index 50ec195..5e84a02 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: altos
 Section: electronics
 Priority: optional
-Maintainer: Bdale Garbee <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bdale Garbee <[e-mail]>
 Uploaders: Keith Packard <[e-mail]>
 Build-Depends: asciidoctor,
                ruby-asciidoctor-pdf,
diff --git a/debian/rules b/debian/rules
index 960da9e..e818e9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/java/java_defaults.mk
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DH_VERBOSE=1
 PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
@@ -12,7 +14,8 @@ prebuild:
 configure_flags = \
 	--disable-install-shared-mime-info \
 	--enable-faketime \
-	--disable-multi-arch
+	--disable-multi-arch \
+	--with-java-version=$(java_compat_level)
 
 configure: configure-stamp
 configure-stamp: