[Git][java-team/jfractionlab][master] 3 commits: Use java_compat_level variable provided by java-common to adjust...

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / jfractionlab


Commits:
a12c1ced by Vladimir Petko at 2023-11-22T09:18:26+13:00
Use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java.

- - - - -
819bf6c6 by Vladimir Petko at 2023-11-22T09:18:55+13:00
changelog

- - - - -
342324ce by Tony Mancill at 2023-11-25T05:06:54+00:00
Merge branch 'master' into 'master'

Resolve Java 21 FTBFS

See merge request java-team/jfractionlab!2
- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jfractionlab (0.92-3) UNRELEASED; 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 (Closes: #1053031).
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Wed, 22 Nov 2023 09:15:50 +1300
+
 jfractionlab (0.92-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/rules
=====================================
@@ -1,11 +1,13 @@
 #!/usr/bin/make -f
 
+include /usr/share/java/java_defaults.mk
+
 UNOIL_PATH1= $(shell dpkg -L libreoffice-java-common | grep share | grep unoil.jar|head -1)
 UNOIL_PATH2= $(shell dpkg -L openoffice-java-common | grep share | grep unoil.jar|head -1)
 UNOIL_PATH=$(UNOIL_PATH1)$(UNOIL_PATH2)
 CLASSPATH=src:/usr/share/java/tablelayout.jar:/usr/share/java/java_uno.jar:/usr/share/java/juh.jar:/usr/share/java/jurt.jar:/usr/share/java/ridl.jar:/usr/share/java/unoloader.jar:$(UNOIL_PATH)
 
-JAVA_ARGS=-source 7 -target 7 -encoding ISO-8859-1
+JAVA_ARGS=-source $(java_compat_level) -target $(java_compat_level) -encoding ISO-8859-1
 
 %:
 	dh $@



View it on GitLab: https://salsa.debian.org/java-team/jfractionlab/-/compare/878f1eba778a397a1217368ac0b1fd76ee53efec...342324cedd158f7485898359a518186a3781e27d

-- 
View it on GitLab: https://salsa.debian.org/java-team/jfractionlab/-/compare/878f1eba778a397a1217368ac0b1fd76ee53efec...342324cedd158f7485898359a518186a3781e27d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20231125/4b242f86/attachment.htm>