From 59fa796efa226beee8d602fb43a11e05f55d1908 Mon Sep 17 00:00:00 2001 From: Vladimir Petko <vladimir.petko@canonical.com> Date: Fri, 17 Nov 2023 20:16:45 +1300 Subject: [PATCH 1/2] * d/Makefile: use java_compat_level variable provided by java-common (Closes: #1052566). --- debian/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/Makefile b/debian/Makefile index b81e3a2..4f67f03 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -5,10 +5,11 @@ # Author: Damien Raude-Morvan <drazzib@debian.org> # Adapted for Fedora by: gil cattaneo <puntogil@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 \ -- GitLab From 861213964b2ec74b1956eed6b43e1410dbf29539 Mon Sep 17 00:00:00 2001 From: Vladimir Petko <vladimir.petko@canonical.com> Date: Fri, 17 Nov 2023 20:18:58 +1300 Subject: [PATCH 2/2] changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index c0aa022..af2e3a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libnative-platform-java (0.14-6) UNRELEASED; urgency=medium + + * d/Makefile: use java_compat_level variable provided by java-common + (Closes: #1052566). + + -- Vladimir Petko <vladimir.petko@canonical.com> Fri, 17 Nov 2023 20:18:10 +1300 + libnative-platform-java (0.14-5) unstable; urgency=medium * Team upload. -- GitLab