Tony Mancill pushed to branch master at Debian Java Maintainers / dbus-java
Commits:
80a6ae30 by Vladimir Petko at 2023-11-20T17:02:33+13:00
Use java_compat_level variable provided by java-common to adjust
-source/-target level to the minimum required by the default Java.
- - - - -
dd3f0cf9 by Vladimir Petko at 2023-11-20T17:04:25+13:00
changelog
- - - - -
fde4b172 by Tony Mancill at 2023-11-20T04:45:26+00:00
Merge branch 'master' into 'master'
Fix Java 21 FTBFS
See merge request java-team/dbus-java!1
- - - - -
2 changed files:
- debian/changelog
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+dbus-java (2.8-11) 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: #1053021).
+
+ -- Vladimir Petko <vladimir.pe...@canonical.com> Mon, 20 Nov 2023 17:04:02
+1300
+
dbus-java (2.8-10) unstable; urgency=medium
* Switch to debhelper-compat = 13.
=====================================
debian/rules
=====================================
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
+include /usr/share/java/java_defaults.mk
# Rules file to build dbus-java packages by Matthew Johnson
#
@@ -13,7 +14,7 @@ VERSION=$(shell dpkg-parsechangelog | sed -n
'/^Version/s/Version: \(.*\)-[^-]*$
override_dh_auto_build:
# Add here commands to compile the package.
$(MAKE) DEBUG=disable \
- JCFLAGS="-source 1.7 -target 1.7 -O -encoding UTF-8" \
+ JCFLAGS="-source $(java_compat_level) -target
$(java_compat_level) -O -encoding UTF-8" \
PREFIX=/usr \
JAVA_HOME=${JAVA_HOME}/bin/ \
JAVAC=${JAVA_HOME}/bin/javac \
View it on GitLab:
https://salsa.debian.org/java-team/dbus-java/-/compare/03b45a156b5e842e859a16269c20b44f008744a8...fde4b1723028b1966d2aa29bea73f92fff36f5b8
--
View it on GitLab:
https://salsa.debian.org/java-team/dbus-java/-/compare/03b45a156b5e842e859a16269c20b44f008744a8...fde4b1723028b1966d2aa29bea73f92fff36f5b8
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
