Ubuntu
geotranz package

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

  1. Git
  2. lp:~vpa1977/ubuntu/+source/geotranz
  3. java21-ftbfs
  4. Merge into ubuntu/devel
Proposed by Vladimir Petko
Status: Merged
Merge reported by: Vladimir Petko
Merged at revision: c2b453097a4d40eaaea3bda834ba18ee2704998e
Proposed branch: ~vpa1977/ubuntu/+source/geotranz:java21-ftbfs
Merge into: ubuntu/+source/geotranz:ubuntu/devel
Diff against target: 54 lines (+13/-2)
4 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/patches/001.1-default-java-version.patch (+1/-1)
debian/rules (+2/-0)
Reviewer Review Type Date Requested Status
Matthias Klose Pending
git-ubuntu import Pending
Review via email: mp+460137@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 install/upgrade/purge test [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15775900/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/geotranz/+bug/2052565/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 59f7ca8..b95a76c 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+geotranz (3.7-3ubuntu1) noble; urgency=medium
7+
8+ * Use java_compat_level variable provided by java-common to adjust
9+ -source/-target level to the minimum required by the default Java
10+ (LP: #2052565).
11+
12+ -- Vladimir Petko <vladimir.petko@canonical.com> Mon, 20 Nov 2023 15:25:33 +1300
13+
14 geotranz (3.7-3) unstable; urgency=medium
15
16 * QA upload.
17diff --git a/debian/control b/debian/control
18index 57c4ace..f24d25a 100644
19--- a/debian/control
20+++ b/debian/control
21@@ -1,7 +1,8 @@
22 Source: geotranz
23 Section: utils
24 Priority: optional
25-Maintainer: Debian QA Group <packages@qa.debian.org>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
28 Build-Depends: cdbs (>= 0.4.93~), dh-exec (>=0.3), debhelper (>= 10), default-jdk, giftrans, imagemagick, cpio
29 Standards-Version: 4.3.0
30 Homepage: http://earth-info.nga.mil/GandG/geotrans/
31diff --git a/debian/patches/001.1-default-java-version.patch b/debian/patches/001.1-default-java-version.patch
32index b2c7cc0..f4a0960 100644
33--- a/debian/patches/001.1-default-java-version.patch
34+++ b/debian/patches/001.1-default-java-version.patch
35@@ -10,7 +10,7 @@ Index: geotranz-3.3/GEOTRANS3/java_gui/Makefile
36 SRC = geotrans3
37 ICONS = $(SRC)/gui/icons
38 -JAVAC = /usr/lib/jvm/default-java/bin/javac
39-+JAVAC = /usr/lib/jvm/default-java/bin/javac -source 1.7 -target 1.7
40++JAVAC = /usr/lib/jvm/default-java/bin/javac -source $$JAVA_COMPAT_LEVEL -target $$JAVA_COMPAT_LEVEL
41
42 all: MSPCCS.jar
43
44diff --git a/debian/rules b/debian/rules
45index a3ecec3..788aa2a 100755
46--- a/debian/rules
47+++ b/debian/rules
48@@ -1,4 +1,6 @@
49 #!/usr/bin/make -f
50+include /usr/share/java/java_defaults.mk
51+export JAVA_COMPAT_LEVEL=$(java_compat_level)
52
53 include /usr/share/cdbs/1/rules/debhelper.mk
54 include /usr/share/cdbs/1/class/makefile.mk

Subscribers

People subscribed via source and target branches