Tony Mancill pushed to branch master at Debian Java Maintainers / gnome-split
Commits: 42c45844 by Vladimir Petko at 2023-11-21T09:50:57+13:00 Use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java. - - - - - bc71d33c by Vladimir Petko at 2023-11-21T09:52:58+13:00 changelog - - - - - 27a39746 by Tony Mancill at 2023-11-21T04:28:03+00:00 Merge branch 'master' into 'master' Fix Java 21 FTBFS See merge request java-team/gnome-split!1 - - - - - 3 changed files: - debian/changelog - debian/patches/02_java9_compatibility.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +gnome-split (1.2-5) UNRELEASED; urgency=medium + + * d/rules, d/p/02_java9_compatibility.path: Use java_compat_level + variable provided by java-common to adjust -source/-target level to + the minimum required by the default Java (Closes: #1053023). + + -- Vladimir Petko <[email protected]> Tue, 21 Nov 2023 09:52:17 +1300 + gnome-split (1.2-4) unstable; urgency=medium * Team upload. ===================================== debian/patches/02_java9_compatibility.patch ===================================== @@ -8,7 +8,7 @@ Forwarded: no tmp/stamp/compile: $(SOURCES_DIST) @/bin/echo -e "$(JAVAC_CMD)\ttmp/classes/*.class" - $(JAVAC) -d tmp/classes -classpath tmp/classes:$(CLASSPATH) -sourcepath src/ $^ -+ $(JAVAC) -source 1.7 -target 1.7 -d tmp/classes -classpath tmp/classes:$(CLASSPATH) -sourcepath src/ $^ ++ $(JAVAC) -source $$JAVA_COMPAT_LEVEL -target $$JAVA_COMPAT_LEVEL -d tmp/classes -classpath tmp/classes:$(CLASSPATH) -sourcepath src/ $^ touch $@ translation: tmp/i18n/gnome-split.pot $(TRANSLATIONS) ===================================== debian/rules ===================================== @@ -1,4 +1,6 @@ #!/usr/bin/make -f +include /usr/share/java/java_defaults.mk +export JAVA_COMPAT_LEVEL=$(java_compat_level) %: dh $@ --no-parallel View it on GitLab: https://salsa.debian.org/java-team/gnome-split/-/compare/fa8ab8ab790723bcfb748f177e7c7fcf22337ec1...27a39746a871e82ad357a3c78fde43675b262a83 -- View it on GitLab: https://salsa.debian.org/java-team/gnome-split/-/compare/fa8ab8ab790723bcfb748f177e7c7fcf22337ec1...27a39746a871e82ad357a3c78fde43675b262a83 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
