Merge ~vpa1977/ubuntu/+source/libsvm:java21-ftbfs into ubuntu/+source/libsvm: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]
 - autopkgtest in Java 17[4] and Java 21[5] ppa

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15798730/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/libsvm/+bug/2054242/comments/1
[4] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-gettext/noble/amd64/libs/libsvm/20240219_010026_7f556@/log.gz
[5] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-gettext-21/noble/amd64/libs/libsvm/20240219_010103_ecbb4@/log.gz

[Pushkar Kulkarni (pushkarnk)]

review: Approve

[Vladimir Petko (vpa1977)]

Uploaded, thank you

[Vladimir Petko (vpa1977)]

Build failed for non-amd64

review: Needs Fixing

[Vladimir Petko (vpa1977)]

Rebuilt libsvm moving default-jdk to default build dependency[1]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/byte-buddy-fix/+sourcepub/15810772/+listing-archive-extra

[Vladimir Petko (vpa1977)]

Rebuilt with java-common added to dependencies[1]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/byte-buddy-fix/+sourcepub/15810792/+listing-archive-extra

[Zixing Liu (liushuyu-011)]

LGTM

review: Approve

[Vladimir Petko (vpa1977)]

review: Abstain

[Vladimir Petko (vpa1977)]

Uploaded, thank you!

diff --git a/debian/changelog b/debian/changelog
index 2d4242e..77179de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libsvm (3.24+ds-6ubuntu2) noble; urgency=medium
+
+  * d/control: add java-common to Build-Depends to resolve build
+    failure on platforms other than amd64.
+
+ -- Vladimir Petko <[e-mail]>  Thu, 22 Feb 2024 16:33:36 +1300
+
+libsvm (3.24+ds-6ubuntu1) noble; urgency=medium
+
+  * d/rules, d/target-source.patch: use java_compat_level variable
+    provided by java-common to adjust -source/-target level to the
+    minimum required by the default Java (LP: #2054242).
+
+ -- Vladimir Petko <[e-mail]>  Mon, 19 Feb 2024 10:34:10 +1300
+
 libsvm (3.24+ds-6) unstable; urgency=medium
 
   * d/test/control: Add python3-all to python-simple's Depends:
diff --git a/debian/control b/debian/control
index 5361a28..750fff8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libsvm
 Section: devel
 Priority: optional
-Maintainer: Debian Science Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Science Maintainers <[e-mail]>
 Uploaders:
     Chen-Tse Tsai <[e-mail]>,
     Christian Kastner <[e-mail]>,
@@ -11,6 +12,7 @@ Build-Depends:
 	libtool,
 	python3-all:native,
 	dh-python,
+	java-common,
 Build-Depends-Indep:
 	default-jdk
 Rules-Requires-Root: no
diff --git a/debian/patches/target-source.patch b/debian/patches/target-source.patch
index 302d64f..abdaa42 100644
--- a/debian/patches/target-source.patch
+++ b/debian/patches/target-source.patch
@@ -8,7 +8,14 @@ Bug-Debian: https://bugs.debian.org/893291
 
 --- a/java/Makefile
 +++ b/java/Makefile
-@@ -11,7 +11,7 @@ JAVAC = javac
+@@ -5,13 +5,13 @@
+ 		svm_train.class svm_predict.class svm_toy.class svm_scale.class
+ 
+ #JAVAC = jikes
+-JAVAC_FLAGS = -target 1.7 -source 1.7
++JAVAC_FLAGS = -target $(JAVA_COMPAT_LEVEL) -source $(JAVA_COMPAT_LEVEL)
+ JAVAC = javac
+ # JAVAC_FLAGS =
  export CLASSPATH := .:$(CLASSPATH)
  
  all: $(FILES)
diff --git a/debian/rules b/debian/rules
index f18e5ad..26a7c4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+include /usr/share/java/java_defaults.mk
 
 # For DEB_VERSION_UPSTREAM
 include /usr/share/dpkg/pkg-info.mk
@@ -53,7 +54,7 @@ override_dh_auto_build-arch:
 
 override_dh_auto_build-indep:
 	dh_auto_build -i
-	$(MAKE) -C java
+	$(MAKE) JAVA_COMPAT_LEVEL=$(java_compat_level) -C java
 
 override_dh_auto_install:
 	dh_auto_install -- libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/