Ubuntu
nescc package

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

  1. Git
  2. lp:~vpa1977/ubuntu/+source/nescc
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Vladimir Petko
Status: Merged
Merge reported by: Vladimir Petko
Merged at revision: 2eb41806fe4becec6188e9b2c9b7e55690c1f292
Proposed branch: ~vpa1977/ubuntu/+source/nescc:ubuntu/devel
Merge into: ubuntu/+source/nescc:ubuntu/devel
Diff against target: 103 lines (+21/-8)
4 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/patches/compile-for-old-java.patch (+7/-7)
debian/rules (+4/-0)
Reviewer Review Type Date Requested Status
Matthias Klose Pending
git-ubuntu import Pending
Review via email: mp+460154@code.launchpad.net

Description of the change

This MP resolves Java 21 ftbfs.

PPA: ppa:vpa1977/gettext [1]

Changes:
 - Use JAVA_COMPAT_LEVEL environment 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/15775946/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/nescc/+bug/2052574/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 8238b1f..1db5562 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+nescc (1.3.5-1.1ubuntu1) noble; urgency=medium
7+
8+ * d/p/compile-for-old-java.patch, d/rules: use JAVA_COMPAT_LEVEL
9+ environment variable provided by java-common to adjust -source/-target
10+ level to the minimum required by the default Java (LP: #2052574).
11+
12+ -- Vladimir Petko <vladimir.petko@canonical.com> Wed, 07 Feb 2024 14:35:09 +1300
13+
14 nescc (1.3.5-1.1build1) eoan; urgency=medium
15
16 * No-change upload with strops.h and sys/strops.h removed in glibc.
17diff --git a/debian/control b/debian/control
18index 4af07fc..60c2701 100644
19--- a/debian/control
20+++ b/debian/control
21@@ -1,7 +1,8 @@
22 Source: nescc
23 Section: devel
24 Priority: optional
25-Maintainer: Sebastian Reichel <sre@debian.org>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Sebastian Reichel <sre@debian.org>
28 Standards-Version: 3.9.5
29 Homepage: http://nescc.sourceforge.net/
30 Vcs-Git: git://anonscm.debian.org/collab-maint/nescc.git
31diff --git a/debian/patches/compile-for-old-java.patch b/debian/patches/compile-for-old-java.patch
32index 8fbac50..c58f89c 100644
33--- a/debian/patches/compile-for-old-java.patch
34+++ b/debian/patches/compile-for-old-java.patch
35@@ -11,7 +11,7 @@ Last-Update: 2014-05-04
36
37 $(class_files): $(java_files)
38 - CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac $(java_files)
39-+ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source 1.7 -target 1.7 $(java_files)
40++ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source $$JAVA_COMPAT_LEVEL -target $$JAVA_COMPAT_LEVEL $(java_files)
41
42 clean mostlyclean:
43 rm -f *.class
44@@ -22,8 +22,8 @@ Last-Update: 2014-05-04
45
46 $(class_files): $(java_files)
47 - CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac $(java_files)
48-+ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source 1.7 -target 1.7 $(java_files)
49-
50++ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source $$JAVA_COMPAT_LEVEL -target $$JAVA_COMPAT_LEVEL $(java_files)
51+
52 clean mostlyclean:
53 rm -f *.class
54 --- a/tools/java/net/tinyos/nesc/wiring/Makefile.am
55@@ -33,7 +33,7 @@ Last-Update: 2014-05-04
56
57 $(class_files): $(java_files)
58 - CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac $(java_files)
59-+ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source 1.7 -target 1.7 $(java_files)
60++ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source $$JAVA_COMPAT_LEVEL -target $$JAVA_COMPAT_LEVEL $(java_files)
61
62 clean mostlyclean:
63 rm -f *.class
64@@ -44,7 +44,7 @@ Last-Update: 2014-05-04
65
66 $(class_files): $(java_files)
67 - CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac $(java_files)
68-+ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source 1.7 -target 1.7 $(java_files)
69++ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source $$JAVA_COMPAT_LEVEL -target $$JAVA_COMPAT_LEVEL $(java_files)
70
71 clean mostlyclean:
72 rm -f *.class
73@@ -55,7 +55,7 @@ Last-Update: 2014-05-04
74
75 $(class_files): $(java_files)
76 - CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac $(java_files)
77-+ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source 1.7 -target 1.7 $(java_files)
78++ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source $$JAVA_COMPAT_LEVEL -target $$JAVA_COMPAT_LEVEL $(java_files)
79
80 clean mostlyclean:
81 rm -f *.class
82@@ -66,7 +66,7 @@ Last-Update: 2014-05-04
83
84 $(class_files): $(java_files)
85 - CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac $(java_files)
86-+ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source 1.7 -target 1.7 $(java_files)
87++ CLASSPATH=`cygpath -w $(ROOT) 2>/dev/null || echo $(ROOT)` javac -source $$JAVA_COMPAT_LEVEL -target $$JAVA_COMPAT_LEVEL $(java_files)
88
89 clean mostlyclean:
90 rm -f *.class
91diff --git a/debian/rules b/debian/rules
92index 66410b2..ff7ce4a 100755
93--- a/debian/rules
94+++ b/debian/rules
95@@ -1,4 +1,8 @@
96 #!/usr/bin/make -f
97+include /usr/share/java/java_defaults.mk
98+
99+export JAVA_COMPAT_LEVEL=$(java_compat_level)
100+
101 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
102
103 %:

Subscribers

People subscribed via source and target branches