98N/AFix warnings from perl-5.22 about deprecated regex syntax.

98N/A

606N/APatch from upstream bug report:

98N/A

98N/A=== modified file 'intltool-update.in'

98N/A--- a/intltool-update.in 2014-05-14 02:15:53 +0000

98N/A+++ b/intltool-update.in 2016-01-19 19:06:54 +0000

98N/A@@ -1062,7 +1062,7 @@

98N/A }

98N/A }

98N/A

98N/A- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)

98N/A+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)

98N/A {

98N/A my $rest = $3;

98N/A my $untouched = $1;

98N/A@@ -1190,10 +1190,10 @@

98N/A $name =~ s/\(+$//g;

98N/A $version =~ s/\(+$//g;

98N/A

98N/A- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);

98N/A- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);

98N/A- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);

98N/A- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);

98N/A+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);

98N/A+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);

98N/A+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);

98N/A+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);

98N/A }

98N/A

493N/A if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)

493N/A@@ -1219,11 +1219,11 @@

98N/A $version =~ s/\(+$//g;

98N/A $bugurl =~ s/\(+$//g if (defined $bugurl);

753N/A

493N/A- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);

493N/A- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);

493N/A- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);

493N/A- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);

493N/A- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);

98N/A+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);

98N/A+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);

493N/A+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);

493N/A+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);

98N/A+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);

98N/A }

156N/A

156N/A # \s makes this not work, why?

98N/A

98N/A