Control: tags 865482 + pending Dear maintainer,
I've prepared an NMU for gri (versioned as 2.12.23-10.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. https://info.comodo.priv.at/ - Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Don McLean: Mother Nature
diff -Nru gri-2.12.23/debian/changelog gri-2.12.23/debian/changelog --- gri-2.12.23/debian/changelog 2016-10-08 22:37:57.000000000 +0200 +++ gri-2.12.23/debian/changelog 2017-07-12 21:50:06.000000000 +0200 @@ -1,3 +1,13 @@ +gri (2.12.23-10.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS with perl 5.26 -- Unescaped left brace in regex is + illegal": add patch perl-5.26.patch from Damyan Ivanov which adds the + missing backslashes. + (Closes: #865482) + + -- gregor herrmann <gre...@debian.org> Wed, 12 Jul 2017 21:50:06 +0200 + gri (2.12.23-10) unstable; urgency=medium * Bug fix: "missing debian/copyright", thanks to Thorsten Alteholz diff -Nru gri-2.12.23/debian/patches/perl-5.26.patch gri-2.12.23/debian/patches/perl-5.26.patch --- gri-2.12.23/debian/patches/perl-5.26.patch 1970-01-01 01:00:00.000000000 +0100 +++ gri-2.12.23/debian/patches/perl-5.26.patch 2017-07-12 21:50:03.000000000 +0200 @@ -0,0 +1,163 @@ +Description: fix "unescaped left brace" errors +Origin: vendor +Bug-Debian: https://bugs.debian.org/865482 +Forwarded: not-needed +Author: Damyan Ivanov <d...@debian.org> +Reviewed-by: gregor herrmann <gre...@debian.org> +Last-Update: 2017-07-12 +Applied-Upstream: 6d178b36a7ac2b0e5d67868fdcd3992ac04f2cd4 + +--- a/doc/texinfo2HTML ++++ b/doc/texinfo2HTML +@@ -119,7 +119,7 @@ while(get_a_line()) { + next; + } + # Process image commands (NOT...it's there already) +- if (/\@image{(.*)}/) { ++ if (/\@image\{(.*)\}/) { + #print "<img src=\"$1.gif\" border=\"1\">\n"; + next; + } +@@ -207,12 +207,12 @@ while(get_a_line()) { + s,<,<,og; + # Special tweak to make 'Gri' look cooler. + # s, Gri , G<FONT SIZE=-1>RI</FONT> ,og; +- s,\@code{\@\@},\@code{TEXINFO2HTML-AT-AT},og; ++ s,\@code\{\@\@\},\@code{TEXINFO2HTML-AT-AT},og; + s,\@},TEXINFO2HTML-CLOSE-BRACE,og; # retain inside e.g. @code{} + s,\@\@,TEXINFO2HTML-AT-AT,og; +- s,\@{,{,og; +- s,\@TeX{},TeX,og; +- s,\@dots{},...,og; ++ s,\@\{,{,og; ++ s,\@TeX\{\},TeX,og; ++ s,\@dots\{\},...,og; + # Put in place-holders for some accents. I should check for all + # of them, but for now, I'm just kludging in a couple, + # to solve an immediate problem and to serve as a place-holder +@@ -236,18 +236,18 @@ while(get_a_line()) { + } + next; + } +- while (/\@url{([^}]*)}/) { ++ while (/\@url\{([^}]*)\}/) { + $the_url = $1; +- s:\@url{[^}]*}:<a href="$the_url">\@code{$the_url}</a>:; ++ s:\@url\{[^}]*\}:<a href="$the_url">\@code{$the_url}</a>:; + } +- while (/\@uref{([^}]*)}/) { ++ while (/\@uref\{([^}]*)\}/) { + @items = split(/,/, $1); + if ($#items == 0) { +- s:\@uref{[^}]*}:<a href="$items[0]">$items[0]</a>:; ++ s:\@uref\{[^}]*\}:<a href="$items[0]">$items[0]</a>:; + } elsif ($#items == 1) { +- s:\@uref{[^}]*}:<a href="$items[0]">$items[1]</a>:; ++ s:\@uref\{[^}]*\}:<a href="$items[0]">$items[1]</a>:; + } elsif ($#items == 2) { +- s:\@uref{[^}]*}:\@code{$items[2]}:; ++ s:\@uref\{[^}]*\}:\@code{$items[2]}:; + } else { + die "Cannot have more than 3 items in a 'uref' at \"$_\""; + } +@@ -329,7 +329,7 @@ while(get_a_line()) { + while(get_a_line()) { + next if /\@sp/; + next if /\@cindex/; +- s|\@anchor{([^}]*)}|<a name=\"$1\"></a>|g; ++ s|\@anchor\{([^}]*)\}|<a name=\"$1\"></a>|g; + &process_examples(); + # Handle HTML inserts + if (/^\@c HTML (.*)/o) { +@@ -345,10 +345,10 @@ while(get_a_line()) { + } + if (/\s*\@item\s*(.*)/o) { + $the_item = $1; +- $the_item =~ s:\@{:{:og; +- $the_item =~ s:\@}:}:og; ++ $the_item =~ s:\@\{:{:og; ++ $the_item =~ s:\@\}:}:og; + $the_item =~ s:\@\@:\@:og; +- $the_item =~ s:\@code{([^}]*)}:`<font color="$ex_color"><code>$1</code></font>':og; ++ $the_item =~ s:\@code\{([^}]*)\}:`<font color="$ex_color"><code>$1</code></font>':og; + print "<dt> $start_item$the_item$end_item\n<dd>"; + } else { + print "<p>" if (/^$/o); +@@ -401,38 +401,38 @@ sub process_examples() { + } else { + s,\@value\{([^}]*)\},$value{$1},g; # Substitute set/value pair + s,\@},},og; +- s,\@{,{,og; ++ s,\@\{,{,og; + } + } + + + sub sub_refs { +- die "line $. of file: cannot have multiple refs on one line" if (/\@[px]*ref{(.*)}(.*)\@[px]*ref{(.*)}/); ++ die "line $. of file: cannot have multiple refs on one line" if (/\@[px]*ref\{(.*)\}(.*)\@[px]*ref\{(.*)\}/); + # anchors +- s|\@anchor{([^}]*)}|<a name=\"$1\"></a>|g; ++ s|\@anchor\{([^}]*)\}|<a name=\"$1\"></a>|g; + # Change e.g. + # @xref{Viewing} + # into + # <a href="#Viewing">see Viewing</a> + + #if (/\@ref/){print "AAA[$_]AAA\n"; +- s|\@ref{([^}]*)}|see <a href="#$1">$1</a>|g; ++ s|\@ref\{([^}]*)\}|see <a href="#$1">$1</a>|g; + #print "BBB[$_]BBB\n";} + +- s|\@xref{([^}]*)}|see <a href="#$1">$1</a>|g; +- s|\@pxref{([^}]*)}|see <a href="#$1">$1.</a>|g; +- while (/\@url{([^}]*)}/) { ++ s|\@xref\{([^}]*)\}|see <a href="#$1">$1</a>|g; ++ s|\@pxref\{([^}]*)\}|see <a href="#$1">$1.</a>|g; ++ while (/\@url\{([^}]*)\}/) { + $the_url = $1; +- s:\@url{[^}]*}:<a href="$the_url">\@code{$the_url}</a>:; ++ s:\@url\{[^}]*\}:<a href="$the_url">\@code{$the_url}</a>:; + } +- while (/\@uref{([^}]*)}/) { ++ while (/\@uref\{([^}]*)\}/) { + @items = split(/,/, $1); + if ($#items == 0) { +- s:\@uref{[^}]*}:<a href="$items[0]">$items[0]</a>:; ++ s:\@uref\{[^}]*\}:<a href="$items[0]">$items[0]</a>:; + } elsif ($#items == 1) { +- s:\@uref{[^}]*}:<a href="$items[0]">$items[1]</a>:; ++ s:\@uref\{[^}]*\}:<a href="$items[0]">$items[1]</a>:; + } elsif ($#items == 2) { +- s:\@uref{[^}]*}:\@code{$items[2]}:; ++ s:\@uref\{[^}]*\}:\@code{$items[2]}:; + } else { + die "Cannot have more than 3 items in a 'uref' at \"$_\""; + } +@@ -465,17 +465,17 @@ sub sub_headings { + sub sub_emphasis { + s,<<,<<,g; + s,>>,>>,g; +- s,\@emph{([^}]*)},<em>$1</em>,g; +- s,\@strong{([^}]*)},<b>$1</b>,g; +- s,\@footnote{([^}]*)}, [$1],g; +- s,\@b{([^}]*)},<b>$1</b>,g; ++ s,\@emph\{([^}]*)\},<em>$1</em>,g; ++ s,\@strong\{([^}]*)\},<b>$1</b>,g; ++ s,\@footnote\{([^}]*)\}, [$1],g; ++ s,\@b\{([^}]*)\},<b>$1</b>,g; + +- s,\@code{([^}]*)},`<font color="$ex_color"><code>$1</code></font>',g; ++ s,\@code\{([^}]*)\},`<font color="$ex_color"><code>$1</code></font>',g; + s,\@\@,\@,g; +- s,\@samp{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g; +- s,\@key{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g; +- s,\@kbd{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g; +- s,\@file{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g; ++ s,\@samp\{([^}]*)\},`<font color="$ex_color"><samp>$1</samp></font>',g; ++ s,\@key\{([^}]*)\},`<font color="$ex_color"><kbd>$1</kbd></font>',g; ++ s,\@kbd\{([^}]*)\},`<font color="$ex_color"><kbd>$1</kbd></font>',g; ++ s,\@file\{([^}]*)\},`<font color="$ex_color"><samp>$1</samp></font>',g; + s,TEXINFO2HTML-CLOSE-BRACE,},g; + s,TEXINFO2HTML-AT-AT,\@,g; + s,TEXINFO2HTML-ACCENT-ACUTE-a,á,g; diff -Nru gri-2.12.23/debian/patches/series gri-2.12.23/debian/patches/series --- gri-2.12.23/debian/patches/series 2016-10-08 22:22:23.000000000 +0200 +++ gri-2.12.23/debian/patches/series 2017-07-12 21:48:42.000000000 +0200 @@ -6,3 +6,4 @@ texinfo2HTML gri-2.12.23-9 gri-2.12.23-bug818449 +perl-5.26.patch
signature.asc
Description: Digital Signature
