diff -Nru granule-1.4.0-7/debian/changelog granule-1.4.0-7/debian/changelog --- granule-1.4.0-7/debian/changelog 2017-06-29 11:43:15.000000000 +0000 +++ granule-1.4.0-7/debian/changelog 2017-07-24 20:12:36.000000000 +0000 @@ -1,3 +1,12 @@ +granule (1.4.0-7-7) unstable; urgency=medium + + * QA upload. + * Fix "Local copy of intltool-* fails with perl 5.26": + add patch to escape the literal left braces in regexps. + (Closes: #869579) + + -- gregor herrmann Mon, 24 Jul 2017 22:12:36 +0200 + granule (1.4.0-7-6) unstable; urgency=medium [ Andreas Beckmann ] diff -Nru granule-1.4.0-7/debian/patches/03-unescaped-left-brace.patch granule-1.4.0-7/debian/patches/03-unescaped-left-brace.patch --- granule-1.4.0-7/debian/patches/03-unescaped-left-brace.patch 1970-01-01 00:00:00.000000000 +0000 +++ granule-1.4.0-7/debian/patches/03-unescaped-left-brace.patch 2017-07-24 20:12:34.000000000 +0000 @@ -0,0 +1,55 @@ +Description: fix unescaped left braces on regexp, fatal in perl 5.26 +Origin: vendor +Bug: https://bugs.debian.org/869579 +Forwarded: no +Author: gregor herrmann +Last-Update: 2017-07-24 + +--- a/intltool-update.in ++++ b/intltool-update.in +@@ -872,13 +872,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"); + } +@@ -996,10 +996,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) +@@ -1007,10 +1007,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? diff -Nru granule-1.4.0-7/debian/patches/series granule-1.4.0-7/debian/patches/series --- granule-1.4.0-7/debian/patches/series 2017-06-29 11:43:15.000000000 +0000 +++ granule-1.4.0-7/debian/patches/series 2017-07-24 20:06:49.000000000 +0000 @@ -1,3 +1,4 @@ 01-fix-template-with-permissive.diff 02-add-swedish-translation.diff 805203.patch +03-unescaped-left-brace.patch