Control: tags 952256 + patch Control: tags 952256 + pending Dear maintainer,
I've prepared an NMU for cbmc (versioned as 5.10-5.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru cbmc-5.10/debian/changelog cbmc-5.10/debian/changelog --- cbmc-5.10/debian/changelog 2018-10-17 21:55:17.000000000 +0300 +++ cbmc-5.10/debian/changelog 2020-04-07 11:55:23.000000000 +0300 @@ -1,3 +1,13 @@ +cbmc (5.10-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Build fixes: + - Fix the build with libmaven-compiler-plugin-java 3.8.1. + - Backport upstream fix for building with new bison. + (Closes: #952256) + + -- Adrian Bunk <b...@debian.org> Tue, 07 Apr 2020 11:55:23 +0300 + cbmc (5.10-5) unstable; urgency=low * Use default-jdk-headless instead of openjdk-8 (Closes: #910704) diff -Nru cbmc-5.10/debian/control cbmc-5.10/debian/control --- cbmc-5.10/debian/control 2018-10-17 21:53:51.000000000 +0300 +++ cbmc-5.10/debian/control 2020-04-07 11:55:23.000000000 +0300 @@ -4,7 +4,8 @@ Maintainer: Michael Tautschnig <m...@debian.org> Build-Depends: debhelper (>= 10), minisat (>= 1:2.2.1-2), zlib1g-dev, flex, bison, default-jdk-headless, maven, maven-repo-helper, maven-debian-helper, - libmaven-compiler-plugin-java + libmaven-compiler-plugin-java (>= 3.8.1), + libmaven-compiler-plugin-java (<< 3.8.2~) Standards-Version: 4.2.1 Homepage: http://www.cprover.org/cbmc/ diff -Nru cbmc-5.10/debian/patches/0001-set-the-name-of-bison-generated-header-file.patch cbmc-5.10/debian/patches/0001-set-the-name-of-bison-generated-header-file.patch --- cbmc-5.10/debian/patches/0001-set-the-name-of-bison-generated-header-file.patch 1970-01-01 02:00:00.000000000 +0200 +++ cbmc-5.10/debian/patches/0001-set-the-name-of-bison-generated-header-file.patch 2020-04-07 11:55:23.000000000 +0300 @@ -0,0 +1,78 @@ +From 90a835513e0a5c3d9d6c017d10378ddd8ab5e3ab Mon Sep 17 00:00:00 2001 +From: Daniel Kroening <kroen...@cs.ox.ac.uk> +Date: Mon, 8 Jul 2019 07:23:54 +0100 +Subject: set the name of bison-generated header file + +This avoids the need to rename the header file in the Makefile. + +diff --git a/src/ansi-c/Makefile b/src/ansi-c/Makefile +index 40866b05d..927a60686 100644 +--- a/src/ansi-c/Makefile ++++ b/src/ansi-c/Makefile +@@ -80,11 +80,9 @@ all: ansi-c$(LIBEXT) + ############################################################################### + + ansi_c_y.tab.cpp: parser.y +- $(YACC) $(YFLAGS) $$flags -pyyansi_c -d parser.y -o $@ ++ $(YACC) $(YFLAGS) $$flags -pyyansi_c parser.y --defines=ansi_c_y.tab.h -o $@ + + ansi_c_y.tab.h: ansi_c_y.tab.cpp +- if [ -e ansi_c_y.tab.hpp ] ; then mv ansi_c_y.tab.hpp ansi_c_y.tab.h ; else \ +- mv ansi_c_y.tab.cpp.h ansi_c_y.tab.h ; fi + + ansi_c_lex.yy.cpp: scanner.l + $(LEX) -Pyyansi_c -o$@ scanner.l +diff --git a/src/jsil/Makefile b/src/jsil/Makefile +index 61380167d..3a1e01a6a 100644 +--- a/src/jsil/Makefile ++++ b/src/jsil/Makefile +@@ -28,11 +28,9 @@ jsil$(LIBEXT): $(OBJ) + $(LINKLIB) + + jsil_y.tab.cpp: parser.y +- $(YACC) $(YFLAGS) $$flags -pyyjsil -d parser.y -o $@ ++ $(YACC) $(YFLAGS) $$flags -pyyjsil parser.y --defines=jsil_y.tab.h -o $@ + + jsil_y.tab.h: jsil_y.tab.cpp +- if [ -e jsil_y.tab.hpp ] ; then mv jsil_y.tab.hpp jsil_y.tab.h ; else \ +- mv jsil_y.tab.cpp.h jsil_y.tab.h ; fi + + jsil_lex.yy.cpp: scanner.l + $(LEX) -Pyyjsil -o$@ scanner.l +diff --git a/src/json/Makefile b/src/json/Makefile +index 4da2cdc21..8c5d345a2 100644 +--- a/src/json/Makefile ++++ b/src/json/Makefile +@@ -19,11 +19,9 @@ json$(LIBEXT): $(OBJ) + $(LINKLIB) + + json_y.tab.cpp: parser.y +- $(YACC) $(YFLAGS) $$flags -pyyjson -d parser.y -o $@ ++ $(YACC) $(YFLAGS) $$flags -pyyjson parser.y --defines=json_y.tab.h -o $@ + + json_y.tab.h: json_y.tab.cpp +- if [ -e json_y.tab.hpp ] ; then mv json_y.tab.hpp $@ ; else \ +- mv json_y.tab.cpp.h $@ ; fi + + json_lex.yy.cpp: scanner.l + $(LEX) -Pyyjson -o$@ scanner.l +diff --git a/src/xmllang/Makefile b/src/xmllang/Makefile +index d1543d7de..ecd4eca61 100644 +--- a/src/xmllang/Makefile ++++ b/src/xmllang/Makefile +@@ -21,11 +21,9 @@ xmllang$(LIBEXT): $(OBJ) + $(LINKLIB) + + xml_y.tab.cpp: parser.y +- $(YACC) $(YFLAGS) $$flags -pyyxml -d parser.y -o $@ ++ $(YACC) $(YFLAGS) $$flags -pyyxml parser.y --defines=xml_y.tab.h -o $@ + + xml_y.tab.h: xml_y.tab.cpp +- if [ -e xml_y.tab.hpp ] ; then mv xml_y.tab.hpp $@ ; else \ +- mv xml_y.tab.cpp.h $@ ; fi + + xml_lex.yy.cpp: scanner.l + $(LEX) -Pyyxml -o$@ scanner.l +-- +2.20.1 + diff -Nru cbmc-5.10/debian/patches/maven2 cbmc-5.10/debian/patches/maven2 --- cbmc-5.10/debian/patches/maven2 2018-09-29 17:29:36.000000000 +0300 +++ cbmc-5.10/debian/patches/maven2 2020-04-07 11:54:48.000000000 +0300 @@ -37,7 +37,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.1</version> -+ <version>3.8.0</version> ++ <version>3.8.1</version> <configuration> <compilerArguments> <classpath>${java.home}/lib/rt.jar</classpath> diff -Nru cbmc-5.10/debian/patches/series cbmc-5.10/debian/patches/series --- cbmc-5.10/debian/patches/series 2018-10-01 09:58:50.000000000 +0300 +++ cbmc-5.10/debian/patches/series 2020-04-07 11:55:23.000000000 +0300 @@ -4,3 +4,4 @@ 32bit-fix java_append_char_THOROUGH float-types +0001-set-the-name-of-bison-generated-header-file.patch
