r52688 - in /desktop/unstable/intltool/debian: changelog patches/perl5.22-regex-fixes.patch patches/perl5.26-regex-fixes.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Jul 23 15:32:51 2017
New Revision: 52688

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52688
Log:
Fix "Unescaped left brace in regex is deprecated at
/usr/bin/intltool-update line 1070":
With perl 5.26 these deprecation warnings are treated as errors.
(Closes: #826471)

Added:
    desktop/unstable/intltool/debian/patches/perl5.26-regex-fixes.patch
      - copied, changed from r52687, desktop/unstable/intltool/debian/patches/perl5.22-regex-fixes.patch
Removed:
    desktop/unstable/intltool/debian/patches/perl5.22-regex-fixes.patch
Modified:
    desktop/unstable/intltool/debian/changelog
    desktop/unstable/intltool/debian/patches/series

Modified: desktop/unstable/intltool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/changelog?rev=52688&op=diff
==============================================================================
--- desktop/unstable/intltool/debian/changelog	[utf-8] (original)
+++ desktop/unstable/intltool/debian/changelog	[utf-8] Sun Jul 23 15:32:51 2017
@@ -1,3 +1,13 @@
+intltool (0.51.0-4) UNRELEASED; urgency=medium
+
+  [ gregor herrmann ]
+  * Fix "Unescaped left brace in regex is deprecated at
+    /usr/bin/intltool-update line 1070":
+    With perl 5.26 these deprecation warnings are treated as errors.
+    (Closes: #826471)
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 23 Jul 2017 17:14:43 +0200
+
 intltool (0.51.0-3) unstable; urgency=medium
 
   * Convert from cdbs to dh.

Copied: desktop/unstable/intltool/debian/patches/perl5.26-regex-fixes.patch (from r52687, desktop/unstable/intltool/debian/patches/perl5.22-regex-fixes.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/patches/perl5.26-regex-fixes.patch?rev=52688&op=diff
==============================================================================
--- desktop/unstable/intltool/debian/patches/perl5.22-regex-fixes.patch	[utf-8] (original)
+++ desktop/unstable/intltool/debian/patches/perl5.26-regex-fixes.patch	[utf-8] Sun Jul 23 15:32:51 2017
@@ -1,13 +1,15 @@
-Description: Escape some "{", to prevent complaints from perl 5.22
+Description: Escape "{", to prevent complaints from perl 5.22 and 5.26
 Author: Roderich Schupp <roderich.schupp at gmail.com>
+Author: gregor herrmann <gregoa at debian.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826471
 Bug-Upstream: https://bugs.launchpad.net/intltool/+bug/1490906
 
-Index: b/intltool-update.in
+Index: intltool-0.51.0/intltool-update.in
 ===================================================================
---- a/intltool-update.in
-+++ b/intltool-update.in
-@@ -1061,7 +1061,7 @@
+--- intltool-0.51.0.orig/intltool-update.in	2017-07-23 17:24:35.113169465 +0200
++++ intltool-0.51.0/intltool-update.in	2017-07-23 17:24:35.109169052 +0200
+@@ -1062,13 +1062,13 @@
  	}
      }
  
@@ -16,7 +18,14 @@
      {
  	my $rest = $3;
  	my $untouched = $1;
-@@ -1189,10 +1189,10 @@
+ 	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");
+     }
+@@ -1190,10 +1190,10 @@
  	$name    =~ s/\(+$//g;
  	$version =~ s/\(+$//g;
  
@@ -31,7 +40,7 @@
      }
  
      if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
-@@ -1218,11 +1218,11 @@
+@@ -1219,11 +1219,11 @@
  	$version =~ s/\(+$//g;
          $bugurl  =~ s/\(+$//g if (defined $bugurl);
  

Modified: desktop/unstable/intltool/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/patches/series?rev=52688&op=diff
==============================================================================
--- desktop/unstable/intltool/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/intltool/debian/patches/series	[utf-8] Sun Jul 23 15:32:51 2017
@@ -1 +1 @@
-perl5.22-regex-fixes.patch
+perl5.26-regex-fixes.patch