Merge ~vpa1977/ubuntu/+source/mina:ubuntu/devel into ubuntu/+source/mina: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/15785417/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/mina/+bug/2052992/comments/1

[Julian Andres Klode (juliank)]

Uploaded, thanks

review: Approve

Unmerged commits

c37eda9... by Vladimir Petko on 2024-02-13

changelog

dd8fe40... by Vladimir Petko on 2024-02-13

update-maintainer

65b6c2a... by Vladimir Petko on 2024-02-13

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: #2052992).

diff --git a/debian/changelog b/debian/changelog
index 6f84055..1b37781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mina (1.1.7.dfsg-13ubuntu1) 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: #2052992).
+
+ -- Vladimir Petko <[e-mail]>  Tue, 13 Feb 2024 16:46:50 +1300
+
 mina (1.1.7.dfsg-13) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 2ed9801..1d72671 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: mina
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Emmanuel Bourg <[e-mail]>
 Build-Depends:
diff --git a/debian/rules b/debian/rules
index 2994dae..90d8809 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/java/java_defaults.mk
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -11,7 +13,7 @@ JAVA_HOME := /usr/lib/jvm/default-java
 export JAVA_HOME
 
 # Force compilation of 1.7 .class format
-JAVA_OPTS := -source 1.7 -target 1.7
+JAVA_OPTS := -source $(java_compat_level) -target $(java_compat_level)
 
 CORE_JAR  := $(PACKAGE)-core.jar
 CORE_SRC  := core/src/main/java/