Merge ~vpa1977/ubuntu/+source/clj-yaml-clojure:java21-ftbfs into ubuntu/+source/clj-yaml-clojure:ubuntu/devel

Proposed by Vladimir Petko
Status: Merged
Merge reported by: Vladimir Petko
Merged at revision: 587126bc4bcd2f3a86329a47a3a27dc172e94398
Proposed branch: ~vpa1977/ubuntu/+source/clj-yaml-clojure:java21-ftbfs
Merge into: ubuntu/+source/clj-yaml-clojure:ubuntu/devel
Diff against target: 61 lines (+29/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/0002-javac-options.patch (+19/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Matthias Klose Pending
git-ubuntu import Pending
Review via email: mp+460149@code.launchpad.net

Description of the change

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [1]

Changes:
 - add patch to set javac option for -source/-target to 8 in project.clj

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/15775923/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/clj-yaml-clojure/+bug/2052568/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/changelog b/debian/changelog
2index 6d664ee..92c7ca5 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+clj-yaml-clojure (0.7.2-1ubuntu1) noble; urgency=medium
7+
8+ * d/p/0002-javac-options.patch: set source and target Java language
9+ level to 8 for compatibility with the default Java 21 (LP: #2052568).
10+
11+ -- Vladimir Petko <vladimir.petko@canonical.com> Wed, 07 Feb 2024 13:27:37 +1300
12+
13 clj-yaml-clojure (0.7.2-1) unstable; urgency=medium
14
15 * Team upload.
16diff --git a/debian/control b/debian/control
17index 41f4da2..7f2d60a 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -1,7 +1,8 @@
21 Source: clj-yaml-clojure
22 Section: java
23 Priority: optional
24-Maintainer: Debian Clojure Maintainers <team+clojure@tracker.debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Debian Clojure Maintainers <team+clojure@tracker.debian.org>
27 Uploaders: Louis-Philippe Véronneau <pollo@debian.org>
28 Build-Depends:
29 debhelper-compat (= 13),
30diff --git a/debian/patches/0002-javac-options.patch b/debian/patches/0002-javac-options.patch
31new file mode 100644
32index 0000000..84eecdd
33--- /dev/null
34+++ b/debian/patches/0002-javac-options.patch
35@@ -0,0 +1,19 @@
36+Description: Set source and target Java language level
37+ Set source and target Java language level for compatibility with the default
38+ Java 21.
39+Author: Vladimir Petko <vladimir.petko@canonical.com>
40+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052576
41+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/clj-yaml-clojure/+bug/2052568
42+Forwarded: not-needed
43+Last-Update: 2023-11-20
44+--- a/project.clj
45++++ b/project.clj
46+@@ -9,7 +9,7 @@
47+ :global-vars {*warn-on-reflection* true}
48+ :source-paths ["src/clojure"]
49+ :java-source-paths ["src/java"]
50+- :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"]
51++ :javac-options ["-target" "1.8" "-source" "1.8" "-Xlint:-options"]
52+ :dependencies
53+ [[org.yaml/snakeyaml "1.x"]
54+ [org.flatland/ordered "debian"]]
55diff --git a/debian/patches/series b/debian/patches/series
56index 30fa6b5..9551373 100644
57--- a/debian/patches/series
58+++ b/debian/patches/series
59@@ -1 +1,2 @@
60 0001-Lein-Local.patch
61+0002-javac-options.patch

Subscribers

People subscribed via source and target branches