Ubuntu
jzmq package

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

  1. Git
  2. lp:~vpa1977/ubuntu/+source/jzmq
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Vladimir Petko
Status: Merged
Merged at revision: 42a6db3b4a6f2602aca95a16279f3458e4e8357a
Proposed branch: ~vpa1977/ubuntu/+source/jzmq:ubuntu/devel
Merge into: ubuntu/+source/jzmq:ubuntu/devel
Diff against target: 48 lines (+12/-2)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/rules (+2/-1)
Reviewer Review Type Date Requested Status
Julian Andres Klode (community) Approve
git-ubuntu import Pending
Review via email: mp+460425@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/15785412/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/jzmq/+bug/2052991/comments/1

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

Uploaded, thanks

review: Approve

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 63a6f81..b40f54a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+jzmq (3.1.0-16ubuntu1) 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: #2052991).
11+
12+ -- Vladimir Petko <vladimir.petko@canonical.com> Tue, 13 Feb 2024 16:31:51 +1300
13+
14 jzmq (3.1.0-16) unstable; urgency=medium
15
16 * Add dependency on cppzmq-dev to fix broken build caused by
17diff --git a/debian/control b/debian/control
18index a57d56d..3738ce0 100644
19--- a/debian/control
20+++ b/debian/control
21@@ -1,7 +1,8 @@
22 Source: jzmq
23 Section: java
24 Priority: optional
25-Maintainer: Jan Niehusmann <jan@debian.org>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Jan Niehusmann <jan@debian.org>
28 Build-Depends: debhelper (>= 9), dh-exec (>=0.3), libzmq5-dev, default-jdk-headless (>= 2:1.8) | openjdk-8-jdk-headless | java-8-sdk-headless, libpgm-dev, pkg-config, libtool, autoconf, libtool-bin, automake, maven-repo-helper, javahelper, dh-autoreconf, default-jdk-doc, junit4, cppzmq-dev
29 Standards-Version: 3.9.6
30 Homepage: https://github.com/zeromq/jzmq
31diff --git a/debian/rules b/debian/rules
32index 2acb986..388f110 100755
33--- a/debian/rules
34+++ b/debian/rules
35@@ -1,4 +1,5 @@
36 #!/usr/bin/make -f
37+include /usr/share/java/java_defaults.mk
38
39 export DH_VERBOSE=1
40
41@@ -6,7 +7,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
42 export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
43 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
44
45-export JAVACFLAGS = -source 1.7 -target 1.7
46+export JAVACFLAGS = -source $(java_compat_level) -target $(java_compat_level)
47
48 JAVA_HOME=/usr/lib/jvm/default-java
49

Subscribers

People subscribed via source and target branches