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

[Julian Andres Klode (juliank)]

Uploaded, thanks

review: Approve

Unmerged commits

5b527d4... by Vladimir Petko on 2024-02-13

changelog

26b95da... by Vladimir Petko on 2024-02-13

Use JAVA_COMPAT_LEVEL to set -source/-target

diff --git a/debian/changelog b/debian/changelog
index 885bf27..af01011 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+coco-java (20110419-4ubuntu1) noble; urgency=medium
+
+  * d/p/debian.patch, 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: #2052987).
+
+ -- Vladimir Petko <[e-mail]>  Wed, 22 Nov 2023 10:42:13 +1300
+
 coco-java (20110419-4) unstable; urgency=medium
 
   * QA upload.
diff --git a/debian/patches/debian.patch b/debian/patches/debian.patch
index ea38da9..f245c75 100644
--- a/debian/patches/debian.patch
+++ b/debian/patches/debian.patch
@@ -2,7 +2,7 @@
 +++ coco-java-20110419/Makefile
 @@ -0,0 +1,13 @@
 +all:
-+	javac -d . -source 1.7 -target 1.7 Trace.java Scanner.java Tab.java DFA.java ParserGen.java Parser.java Coco.java
++	javac -d . -source $$JAVA_COMPAT_LEVEL -target $$JAVA_COMPAT_LEVEL Trace.java Scanner.java Tab.java DFA.java ParserGen.java Parser.java Coco.java
 +	jar cfm Coco.jar Coco.manifest Coco/*.class
 +	rm -rf Coco
 +
diff --git a/debian/rules b/debian/rules
index 6e052c2..b783118 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-
+include /usr/share/java/java_defaults.mk
+export JAVA_COMPAT_LEVEL=$(java_compat_level)
 
 CFLAGS = -Wall -g