Ubuntu
mina package

Merge ~vpa1977/ubuntu/+source/mina:ubuntu/devel into ubuntu/+source/mina:ubuntu/devel

  1. Git
  2. lp:~vpa1977/ubuntu/+source/mina
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Vladimir Petko
Status: Needs review
Proposed branch: ~vpa1977/ubuntu/+source/mina:ubuntu/devel
Merge into: ubuntu/+source/mina:ubuntu/devel
Diff against target: 51 lines (+13/-2)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/rules (+3/-1)
Reviewer Review Type Date Requested Status
Julian Andres Klode (community) Approve
git-ubuntu import Pending
Review via email: mp+460427@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/15785417/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/mina/+bug/2052992/comments/1

To post a comment you must log in.
Revision history for this message
Julian Andres Klode (juliank) wrote :

Uploaded, thanks

review: Approve
Reply

Unmerged commits

c37eda9... by Vladimir Petko

changelog

dd8fe40... by Vladimir Petko

update-maintainer

65b6c2a... by Vladimir Petko

d/rules: use java_compat_level variable provided by java-common to adjust -source/-target level to the minimum required by the default Java (LP: #2052992).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 6f84055..1b37781 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+mina (1.1.7.dfsg-13ubuntu1) noble; urgency=medium
7+
8+ * d/rules: use java_compat_level variable provided by java-common to
9+ adjust -source/-target level to the minimum required by the default
10+ Java (LP: #2052992).
11+
12+ -- Vladimir Petko <vladimir.petko@canonical.com> Tue, 13 Feb 2024 16:46:50 +1300
13+
14 mina (1.1.7.dfsg-13) unstable; urgency=medium
15
16 * Team upload.
17diff --git a/debian/control b/debian/control
18index 2ed9801..1d72671 100644
19--- a/debian/control
20+++ b/debian/control
21@@ -1,7 +1,8 @@
22 Source: mina
23 Section: java
24 Priority: optional
25-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
28 Uploaders:
29 Emmanuel Bourg <ebourg@apache.org>
30 Build-Depends:
31diff --git a/debian/rules b/debian/rules
32index 2994dae..90d8809 100755
33--- a/debian/rules
34+++ b/debian/rules
35@@ -1,5 +1,7 @@
36 #!/usr/bin/make -f
37
38+include /usr/share/java/java_defaults.mk
39+
40 # Uncomment this to turn on verbose mode.
41 #export DH_VERBOSE=1
42
43@@ -11,7 +13,7 @@ JAVA_HOME := /usr/lib/jvm/default-java
44 export JAVA_HOME
45
46 # Force compilation of 1.7 .class format
47-JAVA_OPTS := -source 1.7 -target 1.7
48+JAVA_OPTS := -source $(java_compat_level) -target $(java_compat_level)
49
50 CORE_JAR := $(PACKAGE)-core.jar
51 CORE_SRC := core/src/main/java/

Subscribers

People subscribed via source and target branches