diff -Nru mgp-1.13a+upstream20090219/debian/changelog mgp-1.13a+upstream20090219/debian/changelog
--- mgp-1.13a+upstream20090219/debian/changelog	2019-02-16 20:48:50.000000000 +0000
+++ mgp-1.13a+upstream20090219/debian/changelog	2020-07-30 15:12:24.000000000 +0000
@@ -1,3 +1,11 @@
+mgp (1.13a+upstream20090219-12) unstable; urgency=medium
+
+  * Quick keep-in-testing upload before mgp 1.2/2.0 is ready
+  * d/p/957539.diff: Rename yy* variables to mgp* (Closes: #957539)
+  * Move from debhelper compat 5 to 13 (Closes: #965721)
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Thu, 30 Jul 2020 17:12:24 +0200
+
 mgp (1.13a+upstream20090219-11) unstable; urgency=low
 
   * Also hardcode /bin/gzip, for mgpembed, should fix reproducibility
diff -Nru mgp-1.13a+upstream20090219/debian/compat mgp-1.13a+upstream20090219/debian/compat
--- mgp-1.13a+upstream20090219/debian/compat	2011-07-19 18:22:16.000000000 +0000
+++ mgp-1.13a+upstream20090219/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-5
diff -Nru mgp-1.13a+upstream20090219/debian/control mgp-1.13a+upstream20090219/debian/control
--- mgp-1.13a+upstream20090219/debian/control	2018-10-25 19:28:37.000000000 +0000
+++ mgp-1.13a+upstream20090219/debian/control	2020-07-30 15:11:57.000000000 +0000
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Thorsten Glaser <tg@mirbsd.de>
-Build-Depends: debhelper (>= 5), autotools-dev, bison, cpp, devscripts,
+Build-Depends: debhelper-compat (= 13), bison, cpp, devscripts,
  flex, gawk | awk, libfontconfig1-dev, libfreetype6-dev, libgif-dev,
  libice-dev, libimlib2-dev, libjpeg-dev, libmng-dev, libpng-dev,
  libsm-dev, libtiff-dev, libx11-dev, libxext-dev, libxft-dev,
diff -Nru mgp-1.13a+upstream20090219/debian/patches/957539.diff mgp-1.13a+upstream20090219/debian/patches/957539.diff
--- mgp-1.13a+upstream20090219/debian/patches/957539.diff	1970-01-01 00:00:00.000000000 +0000
+++ mgp-1.13a+upstream20090219/debian/patches/957539.diff	2020-07-30 15:09:01.000000000 +0000
@@ -0,0 +1,80 @@
+# DP: #957539 avoid by renaming; still unsure whether this is correct
+# DP: but rename yyfilename as well since yy prefix is reserved-ish
+
+--- a/grammar.y
++++ b/grammar.y
+@@ -74,8 +74,8 @@ int yylex(void);
+ 
+ int n_errors = 0;
+ struct ctrl *root;
+-char *yyfilename;
+-int yylineno;
++char *mgpyyfilename;
++int mgpyylineno;
+ 
+ #ifdef HAVE_STDARG_H
+ /* GCC complains if we declare this function in traditional style */
+@@ -94,7 +94,7 @@ yyerror(msg)
+ 	va_start(ap);
+ #endif
+ 	++n_errors;
+-	fprintf(stderr, "%s:%d: error: ", yyfilename, yylineno);
++	fprintf(stderr, "%s:%d: error: ", mgpyyfilename, mgpyylineno);
+ 	vfprintf(stderr, msg, ap);
+ 	fprintf(stderr, "\n");
+ 	va_end(ap);
+@@ -116,7 +116,7 @@ yywarn(msg)
+ #else
+ 	va_start(ap);
+ #endif
+-	fprintf(stderr, "%s:%d: warning: ", yyfilename, yylineno);
++	fprintf(stderr, "%s:%d: warning: ", mgpyyfilename, mgpyylineno);
+ 	vfprintf(stderr, msg, ap);
+ 	fprintf(stderr, "\n");
+ 	va_end(ap);
+--- a/parse.c
++++ b/parse.c
+@@ -50,8 +50,8 @@ extern int findImage __P((char *, char *
+ /* lex/yacc variables */
+ extern int n_errors;
+ extern struct ctrl *root;
+-extern char *yyfilename;
+-extern int yylineno;
++extern char *mgpyyfilename;
++extern int mgpyylineno;
+ /* Prevent warning if -Wall.  */
+ #ifdef __GNUC__
+ extern void lex_init(u_char *);
+@@ -296,8 +296,8 @@ read_rc(fp, filename)
+ 		if (buf[0] == '#' || !buf[0])
+ 			continue;
+ 
+-		yyfilename = filename;
+-		yylineno = lineno;
++		mgpyyfilename = filename;
++		mgpyylineno = lineno;
+ 
+ 		lex_init(buf);
+ 		if (yyparse() || n_errors) {
+@@ -421,8 +421,8 @@ read_file(fp, filename, page, line, prea
+ 		if (buf[1] == '%')
+ 			continue;
+ 
+-		yyfilename = filename;
+-		yylineno = lineno;
++		mgpyyfilename = filename;
++		mgpyylineno = lineno;
+ 		lex_init(buf + 1);
+ 		if (yyparse() || n_errors) {
+ 			fprintf(stderr, "%s:%d: fatal syntax error detected\n",
+@@ -606,8 +606,8 @@ command:
+ 
+ 			prevfiltermode = filtermode ? 1 : 0;
+ 
+-			yyfilename = filename;
+-			yylineno = lineno;
++			mgpyyfilename = filename;
++			mgpyylineno = lineno;
+ 			lex_init(buf + 1);
+ 			if (yyparse() || n_errors) {
+ 				fprintf(stderr,
diff -Nru mgp-1.13a+upstream20090219/debian/patches/series mgp-1.13a+upstream20090219/debian/patches/series
--- mgp-1.13a+upstream20090219/debian/patches/series	2018-10-25 22:25:57.000000000 +0000
+++ mgp-1.13a+upstream20090219/debian/patches/series	2020-07-30 15:06:36.000000000 +0000
@@ -7,3 +7,4 @@
 bugfixes.diff
 guide-rendering.diff
 spelling-fixes.diff
+957539.diff