Tony Mancill pushed to branch master at Debian Java Maintainers / 
libnative-platform-java


Commits:
59fa796e by Vladimir Petko at 2023-11-17T20:20:27+13:00
  * d/Makefile: use java_compat_level variable provided by java-common (Closes: 
#1052566).

- - - - -
86121396 by Vladimir Petko at 2023-11-17T20:20:48+13:00
changelog

- - - - -
8bbcb6ff by Tony Mancill at 2024-02-19T17:07:49+00:00
Merge branch 'master' into 'use-compat-level-macro'

Fix-up changelog

# Conflicts:
#   debian/changelog
- - - - -
b8b5dcf6 by Tony Mancill at 2024-02-19T17:08:46+00:00
Merge branch 'use-compat-level-macro' into 'master'

Use compat level macro to resolve Java 21 FTFBS

See merge request java-team/libnative-platform-java!4
- - - - -


2 changed files:

- debian/Makefile
- debian/changelog


Changes:

=====================================
debian/Makefile
=====================================
@@ -5,10 +5,11 @@
 #  Author: Damien Raude-Morvan <draz...@debian.org>
 #  Adapted for Fedora by: gil cattaneo <punto...@libero.it>
 include /usr/share/dpkg/architecture.mk
+include /usr/share/java/java_defaults.mk
 
 JAVA_HOME ?= /usr/lib/jvm/default-java
-JAVA_TARGET_VERSION = 1.7
-JAVA_SOURCE_VERSION = 1.7
+JAVA_TARGET_VERSION = $(java_compat_level)
+JAVA_SOURCE_VERSION = $(java_compat_level)
 BUILD_DIR = debian/out
 
 CPPFLAGS += -Isrc/shared/headers \


=====================================
debian/changelog
=====================================
@@ -1,8 +1,13 @@
 libnative-platform-java (0.14-6) UNRELEASED; urgency=medium
 
+  [ Vladimir Petko ]
+  * d/Makefile: use java_compat_level variable provided by java-common
+    (Closes: #1052566).
+
+  [ Edward Betts ]
   * Upstream GitHub repo has moved, update URL.
 
- -- Edward Betts <edw...@4angle.com>  Mon, 21 Sep 2020 12:27:27 +0100
+ -- Vladimir Petko <vladimir.pe...@canonical.com>  Fri, 17 Nov 2023 20:18:10 
+1300
 
 libnative-platform-java (0.14-5) unstable; urgency=medium
 



View it on GitLab: 
https://salsa.debian.org/java-team/libnative-platform-java/-/compare/b946c4298e5f710aaf5ec7521e2499c3b057ec13...b8b5dcf67ded40710d6e4190c266c80d2b9caf50

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/libnative-platform-java/-/compare/b946c4298e5f710aaf5ec7521e2499c3b057ec13...b8b5dcf67ded40710d6e4190c266c80d2b9caf50
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

Reply via email to