diff -Nru grok-1.20110708.1/debian/changelog grok-1.20110708.1/debian/changelog --- grok-1.20110708.1/debian/changelog 2020-01-13 22:12:23.000000000 +0000 +++ grok-1.20110708.1/debian/changelog 2020-04-25 19:57:15.000000000 +0000 @@ -1,3 +1,10 @@ +grok (1.20110708.1-4.5) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC-10. (Closes: #957309) + + -- Sudip Mukherjee Sat, 25 Apr 2020 20:57:15 +0100 + grok (1.20110708.1-4.4) unstable; urgency=medium * Non-maintainer upload. diff -Nru grok-1.20110708.1/debian/patches/fix_gcc10.patch grok-1.20110708.1/debian/patches/fix_gcc10.patch --- grok-1.20110708.1/debian/patches/fix_gcc10.patch 1970-01-01 00:00:00.000000000 +0000 +++ grok-1.20110708.1/debian/patches/fix_gcc10.patch 2020-04-25 19:55:43.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fix FTBFS with GCC-10 + Fix multiple definitions of a variable by declaring it as extern + +Author: Sudip Mukherjee +Bug-Debian: https://bugs.debian.org/957309 + +--- + +--- grok-1.20110708.1.orig/conf.tab.c ++++ grok-1.20110708.1/conf.tab.c +@@ -77,7 +77,7 @@ + #include "grok_input.h" + #include "grok_matchconf.h" + +-int yylineno; ++extern int yylineno; + void yyerror (YYLTYPE *loc, struct config *conf, char const *s) { + fprintf (stderr, "Syntax error: %s\n", s); + } diff -Nru grok-1.20110708.1/debian/patches/series grok-1.20110708.1/debian/patches/series --- grok-1.20110708.1/debian/patches/series 2020-01-13 22:08:30.000000000 +0000 +++ grok-1.20110708.1/debian/patches/series 2020-04-25 19:56:14.000000000 +0000 @@ -6,3 +6,4 @@ fix-gperf-version-detection.patch gperf-function-declaration.patch move_ldflags.patch +fix_gcc10.patch