Merge ~vpa1977/ubuntu/+source/libnative-platform-java:ubuntu/devel into ubuntu/+source/libnative-platform-java:ubuntu/devel

Proposed by Vladimir Petko
Status: Merged
Merge reported by: Vladimir Petko
Merged at revision: 5dd144584a19d482704c21973ce1960783821e3c
Proposed branch: ~vpa1977/ubuntu/+source/libnative-platform-java:ubuntu/devel
Merge into: ubuntu/+source/libnative-platform-java:ubuntu/devel
Diff against target: 47 lines (+12/-3)
3 files modified
debian/Makefile (+3/-2)
debian/changelog (+7/-0)
debian/control (+2/-1)
Reviewer Review Type Date Requested Status
Canonical Foundations Team Pending
git-ubuntu import Pending
Review via email: mp+460744@code.launchpad.net

Description of the change

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [1]

Changes:
 - Use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java

Testing:
 - rebuild in default Java 21 ppa[2]
 - piuparts test [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15799162/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/libnative-platform-java/+bug/2054265/comments/1

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/Makefile b/debian/Makefile
2index b81e3a2..4f67f03 100644
3--- a/debian/Makefile
4+++ b/debian/Makefile
5@@ -5,10 +5,11 @@
6 # Author: Damien Raude-Morvan <drazzib@debian.org>
7 # Adapted for Fedora by: gil cattaneo <puntogil@libero.it>
8 include /usr/share/dpkg/architecture.mk
9+include /usr/share/java/java_defaults.mk
10
11 JAVA_HOME ?= /usr/lib/jvm/default-java
12-JAVA_TARGET_VERSION = 1.7
13-JAVA_SOURCE_VERSION = 1.7
14+JAVA_TARGET_VERSION = $(java_compat_level)
15+JAVA_SOURCE_VERSION = $(java_compat_level)
16 BUILD_DIR = debian/out
17
18 CPPFLAGS += -Isrc/shared/headers \
19diff --git a/debian/changelog b/debian/changelog
20index fa62f50..a6c489b 100644
21--- a/debian/changelog
22+++ b/debian/changelog
23@@ -1,3 +1,10 @@
24+libnative-platform-java (0.14-5ubuntu1) noble; urgency=medium
25+
26+ * d/Makefile: use java_compat_level variable provided by java-common
27+ (LP: #2054265).
28+
29+ -- Vladimir Petko <vladimir.petko@canonical.com> Mon, 19 Feb 2024 15:11:57 +1300
30+
31 libnative-platform-java (0.14-5build1) focal; urgency=medium
32
33 * No-change rebuild for libgcc-s1 package name change.
34diff --git a/debian/control b/debian/control
35index a824dcd..d21d008 100644
36--- a/debian/control
37+++ b/debian/control
38@@ -1,7 +1,8 @@
39 Source: libnative-platform-java
40 Section: java
41 Priority: optional
42-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
43+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
44+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
45 Uploaders: Kai-Chung Yan <seamlikok@gmail.com>
46 Build-Depends: debhelper (>= 11),
47 default-jdk (>= 2:1.8),

Subscribers

People subscribed via source and target branches