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

[Vladimir Petko]

This MP resolves Java 21 ftbfs and the rebuild issue since it blocks package rebuilds.

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
 - Force deletion of vnc_unixsrc/*/Makefile

Testing:
 - rebuild in default Java 21 ppa[2]
 - piuparts test [3]
 - rebuild the package after the successfull build[4]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15788007/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/ssvnc/+bug/2053195/comments/1
[4] https://bugs.launchpad.net/ubuntu/+source/ssvnc/+bug/2053196/comments/1

diff --git a/debian/changelog b/debian/changelog
index d2866a4..a9803e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ssvnc (1.0.29-6ubuntu1) 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: #2053195).
+  * d/rules: force deletion of vnc_unixsrc/*/Makefile (LP: #2053196).
+
+ -- Vladimir Petko <[e-mail]>  Thu, 15 Feb 2024 10:55:51 +1300
+
 ssvnc (1.0.29-6) unstable; urgency=low
 
   * no-mkmf.patch: Replace Imake-generated Makefiles with simple ones in
diff --git a/debian/control b/debian/control
index 399b1a5..c6304a1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ssvnc
 Section: net
 Priority: optional
-Maintainer: Magnus Holmgren <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Magnus Holmgren <[e-mail]>
 Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 10), xutils-dev, libxaw7-dev,
  libxmu-dev, libxext-dev, libxt-dev, libsm-dev, libice-dev,
  libjpeg-dev, zlib1g-dev | libz-dev,
diff --git a/debian/rules b/debian/rules
index e786be2..9228a6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-
+include /usr/share/java/java_defaults.mk
 DESTDIR=$(CURDIR)/debian/ssvnc
 
 export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
@@ -27,7 +27,7 @@ build-arch: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 
-	$(MAKE) all JC_ARGS="-source 1.7 -target 1.7"
+	$(MAKE) all JC_ARGS="-source $(java_compat_level) -target $(java_compat_level)"
 
 	touch $@
 
@@ -39,9 +39,9 @@ clean: configure-stamp
 	rm -f build-stamp configure-stamp
 
 	$(MAKE) clean
-	rm vnc_unixsrc/*/Makefile
+	rm -f vnc_unixsrc/*/Makefile
 
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir