Control: tag -1 + patch On Mon, 24 Jul 2017 20:22:15 +0200, gregor herrmann wrote:
> Cf. #826471 in intltool which contains a patch. > > I haven't looked if/how far it needs to be adadpted for the old > embedded versions of intltool-update but it might serve as a starting > point. Here's a debdiff with the adjusted intltool-update patch. Cheers, gregor -- .''`. 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: Juilliard Ensemble, Berberian,: Différences
diff -Nru gdmap-0.8.1/debian/changelog gdmap-0.8.1/debian/changelog --- gdmap-0.8.1/debian/changelog 2013-06-22 20:32:39.000000000 +0200 +++ gdmap-0.8.1/debian/changelog 2017-07-24 22:19:17.000000000 +0200 @@ -1,3 +1,12 @@ +gdmap (0.8.1-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix "Local copy of intltool-* fails with perl 5.26": + add a patch to fix the "Unescaped left brace in regex is illegal" errors. + (Closes: #869578) + + -- gregor herrmann <gre...@debian.org> Mon, 24 Jul 2017 22:19:17 +0200 + gdmap (0.8.1-3) unstable; urgency=low * Import math-underlink.patch from Ubuntu, to link libm explicitly diff -Nru gdmap-0.8.1/debian/patches/series gdmap-0.8.1/debian/patches/series --- gdmap-0.8.1/debian/patches/series 2013-06-22 17:45:03.000000000 +0200 +++ gdmap-0.8.1/debian/patches/series 2017-07-24 22:19:17.000000000 +0200 @@ -10,3 +10,4 @@ math-underlink.patch format-strings.patch gtk-set-locale.patch +unescaped-left-brace.patch diff -Nru gdmap-0.8.1/debian/patches/unescaped-left-brace.patch gdmap-0.8.1/debian/patches/unescaped-left-brace.patch --- gdmap-0.8.1/debian/patches/unescaped-left-brace.patch 1970-01-01 01:00:00.000000000 +0100 +++ gdmap-0.8.1/debian/patches/unescaped-left-brace.patch 2017-07-24 22:19:17.000000000 +0200 @@ -0,0 +1,55 @@ +Description: fix "Unescaped left brace in regex" errors with perl 5.26 +Origin: vendor +Bug-Debian: https://bugs.debian.org/869578 +Forwarded: no +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2017-07-24 + +--- a/intltool-update.in ++++ b/intltool-update.in +@@ -947,13 +947,13 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; + my $sub = ""; + # Ignore recursive definitions of variables +- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; ++ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/; + + return SubstituteVariable ("$untouched$sub$rest"); + } +@@ -1071,10 +1071,10 @@ + ($name, $version) = ($1, $2); + $name =~ s/[\[\]\s]//g; + $version =~ s/[\[\]\s]//g; +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) +@@ -1082,10 +1082,10 @@ + ($name, $version) = ($1, $2); + $name =~ s/[\[\]\s]//g; + $version =~ s/[\[\]\s]//g; +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + # \s makes this not work, why?
signature.asc
Description: Digital Signature
