Tony Mancill pushed to branch master at Debian Java Maintainers / jmagick
Commits:
9baf55cb by Vladimir Petko at 2024-01-25T14:50:31+13:00
Use java_compat_level variable provided by java-common to set the release.
- - - - -
cce96da5 by Vladimir Petko at 2024-01-25T14:59:27+13:00
changelog
- - - - -
a057aa94 by Tony Mancill at 2024-01-25T03:57:31+00:00
Merge branch 'master' into 'master'
Resolve Java 21 ftbfs
See merge request java-team/jmagick!1
- - - - -
2 changed files:
- debian/changelog
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jmagick (6.6.9~20130201-svn99-5) UNRELEASED; urgency=medium
+
+ * d/rules: use java_compat_level variable provided by java-common to
+ set Java release level (Closes: #1057510).
+
+ -- Vladimir Petko <vladimir.pe...@canonical.com> Thu, 25 Jan 2024 14:50:47
+1300
+
jmagick (6.6.9~20130201-svn99-4) unstable; urgency=medium
* Team upload.
=====================================
debian/rules
=====================================
@@ -5,6 +5,7 @@ JAVA_HOME := /usr/lib/jvm/default-java
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/java/java_defaults.mk
CC=gcc
DEB_CONFIGURE_SCRIPT_ENV += PATH=$(JAVA_HOME)/bin:$$PATH
@@ -19,7 +20,7 @@ DEB_INSTALL_CHANGELOGS_ALL := Changelog.txt
DEB_AUTO_UPDATE_AUTOCONF := yes
VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^~-]+).*,\1,p')
-export JFLAGS = --release 7 -g
+export JFLAGS = --release $(java_compat_level) -g
install/libjmagick6-java::
mh_install
View it on GitLab:
https://salsa.debian.org/java-team/jmagick/-/compare/fa685029b87e983028b3b00704aa4ba75e3ecbc6...a057aa94f49dd71a6648479e108671f778ad090f
--
View it on GitLab:
https://salsa.debian.org/java-team/jmagick/-/compare/fa685029b87e983028b3b00704aa4ba75e3ecbc6...a057aa94f49dd71a6648479e108671f778ad090f
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
