[Git][java-team/antlr][master] 5 commits: Fix FTBFS with Java 21 (Closes: #1057488)
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Wed Dec 6 06:27:14 GMT 2023
Tony Mancill pushed to branch master at Debian Java Maintainers / antlr
Commits:
7edba3c5 by tony mancill at 2023-12-05T21:59:21-08:00
Fix FTBFS with Java 21 (Closes: #1057488)
- - - - -
1cf4d4fd by tony mancill at 2023-12-05T22:07:37-08:00
Fix FTBFS twice in a row (Closes: #1043866)
- - - - -
692ae14e by tony mancill at 2023-12-05T22:08:02-08:00
Bump Standards-Version to 4.6.2
- - - - -
51664a3a by tony mancill at 2023-12-05T22:19:44-08:00
Add lintian-override for long lines in upstream HTML
- - - - -
44727122 by tony mancill at 2023-12-05T22:19:44-08:00
Prepare changelog for upload
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/rules
- + debian/source/lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+antlr (2.7.7+dfsg-13) unstable; urgency=medium
+
+ * Fix FTBFS with Java 21 (Closes: #1057488)
+ * Fix FTBFS twice in a row (Closes: #1043866)
+ * Bump Standards-Version to 4.6.2
+ * Add lintian-override for long lines in upstream HTML
+
+ -- tony mancill <tmancill at debian.org> Tue, 05 Dec 2023 22:08:08 -0800
+
antlr (2.7.7+dfsg-12) unstable; urgency=medium
* Fix build for arch:any when building with --no-arch-all
=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends:
python3-all-dev,
python3-setuptools,
sharutils,
-Standards-Version: 4.5.1
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/antlr.git
Vcs-Browser: https://salsa.debian.org/java-team/antlr
Homepage: https://www.antlr2.org
=====================================
debian/rules
=====================================
@@ -3,18 +3,19 @@
PYTHON3S:=$(shell py3versions -vr 2>/dev/null)
include /usr/share/dpkg/pkg-info.mk
+include /usr/share/java/java_defaults.mk
%:
dh $@ --with maven-repo-helper --with python3
override_dh_auto_configure:
cp /usr/share/misc/config.* scripts
- JAVAC='/usr/lib/jvm/default-java/bin/javac -source 1.7' CLASSPATH=`pwd` JAVA=/usr/lib/jvm/default-java/bin/java \
+ JAVAC='/usr/lib/jvm/default-java/bin/javac -source $(java_compat_level)' CLASSPATH=`pwd` JAVA=/usr/lib/jvm/default-java/bin/java \
./configure --prefix=/usr --mandir=\$${prefix}/share/man
override_dh_auto_build-indep:
mkdir -p target/classes
- javac -source 1.7 -target 1.7 -d target/classes $(shell find antlr -name '*.java')
+ javac -source $(java_compat_level) -target $(java_compat_level) -d target/classes $(shell find antlr -name '*.java')
jar cvf antlr.jar -C target/classes .
cp bin/antlr target/runantlr
@@ -54,6 +55,7 @@ override_dh_auto_clean:
-cd lib/cpp; $(MAKE) clean
-find -name Makefile | xargs rm -f
-rm -rf lib/python/build
+ -rm -rf lib/python/antlr.egg-info
-rm -rf scripts/run-antlr
get-orig-pom:
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,11 @@
+# upstream sources include HTML with long lines
+antlr source: source-is-missing [doc/csharp-runtime.html]
+antlr source: source-is-missing [doc/inheritance.html]
+antlr source: source-is-missing [doc/lexer.html]
+antlr source: source-is-missing [doc/metalang.html]
+antlr source: source-is-missing [doc/options.html]
+antlr source: source-is-missing [doc/runtime.html]
+antlr source: source-is-missing [doc/sor.html]
+antlr source: source-is-missing [doc/streams.html]
+antlr source: source-is-missing [doc/trees.html]
+antlr source: source-is-missing [doc/vocab.html]
View it on GitLab: https://salsa.debian.org/java-team/antlr/-/compare/fed7e9ba62de2becbcd46033accfff571c10f939...447271224a73187ed22885d9333e0142893e7277
--
View it on GitLab: https://salsa.debian.org/java-team/antlr/-/compare/fed7e9ba62de2becbcd46033accfff571c10f939...447271224a73187ed22885d9333e0142893e7277
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20231206/678b86ca/attachment.htm>
More information about the pkg-java-commits
mailing list