Merge ~vpa1977/ubuntu/+source/libmatthew-java:java21-ftbfs into ubuntu/+source/libmatthew-java:ubuntu/devel

Proposed by Vladimir Petko
Status: Merged
Merge reported by: Vladimir Petko
Merged at revision: 2712fceaf50e13cd35bb73edb8160a946d826263
Proposed branch: ~vpa1977/ubuntu/+source/libmatthew-java:java21-ftbfs
Merge into: ubuntu/+source/libmatthew-java:ubuntu/devel
Diff against target: 49 lines (+12/-2)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/rules (+2/-1)
Reviewer Review Type Date Requested Status
Matthias Klose Pending
git-ubuntu import Pending
Review via email: mp+460151@code.launchpad.net

Description of the change

This MP resolves Java 21 ftbfs.
Note: this mp replaces -source with --release fixing #1049791 as old packaging produced bytecode with the level of the compiling jdk.

PPA: ppa:vpa1977/october-21 [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/october-21
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15775946/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/libmatthew-java/+bug/2052572/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
diff --git a/debian/changelog b/debian/changelog
index ad133b5..270f736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1libmatthew-java (0.8.1-2ubuntu1) noble; urgency=medium
2
3 * d/rules: use java_compat_level variable provided by java-common to
4 adjust --release level to the minimum required by the
5 default Java (LP: #1049791, LP: #2052572).
6
7 -- Vladimir Petko <vladimir.petko@canonical.com> Wed, 07 Feb 2024 14:00:13 +1300
8
1libmatthew-java (0.8.1-2) unstable; urgency=medium9libmatthew-java (0.8.1-2) unstable; urgency=medium
210
3 * add patch to fix javadoc error (FTBFS with OpenJDK 17)11 * add patch to fix javadoc error (FTBFS with OpenJDK 17)
diff --git a/debian/control b/debian/control
index b9ca8a7..a8d4966 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
1Source: libmatthew-java1Source: libmatthew-java
2Section: java2Section: java
3Priority: optional3Priority: optional
4Maintainer: Debian IoT Maintainers <debian-iot-maintainers@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian IoT Maintainers <debian-iot-maintainers@lists.alioth.debian.org>
5Uploaders: Thorsten Alteholz <debian@alteholz.de>6Uploaders: Thorsten Alteholz <debian@alteholz.de>
6Build-Depends: debhelper-compat (= 11),7Build-Depends: debhelper-compat (= 11),
7 docbook-to-man,8 docbook-to-man,
diff --git a/debian/rules b/debian/rules
index 1be0fb6..51c8e53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,5 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2include /usr/share/java/java_defaults.mk
23
3%:4%:
4 dh $@ --with javahelper5 dh $@ --with javahelper
@@ -9,7 +10,7 @@ override_dh_auto_build:
9 JAVAH=/usr/lib/jvm/default-java/bin/javah \10 JAVAH=/usr/lib/jvm/default-java/bin/javah \
10 JAVADOC=/usr/lib/jvm/default-java/bin/javadoc \11 JAVADOC=/usr/lib/jvm/default-java/bin/javadoc \
11 JAVADOCFLAGS="-quiet -author -link /usr/share/doc/default-jdk-doc/api/" \12 JAVADOCFLAGS="-quiet -author -link /usr/share/doc/default-jdk-doc/api/" \
12 JVERCFLAGS="-source 1.7" \13 JVERCFLAGS="--release $(java_compat_level)" \
13 JAR=/usr/bin/fastjar \14 JAR=/usr/bin/fastjar \
14 PREFIX=/usr \15 PREFIX=/usr \
15 all doc16 all doc

Subscribers

People subscribed via source and target branches