r47255 - in /desktop/unstable/intltool/debian: changelog control patches/perl5.22-regex-fixes patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Mon Jan 18 11:56:40 2016
New Revision: 47255

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47255
Log:
Take patch from upstream bug#1490906 to silence warnings in
intltool-update when run against perl 5.22. (Closes: #788705)

Added:
    desktop/unstable/intltool/debian/patches/perl5.22-regex-fixes
Modified:
    desktop/unstable/intltool/debian/changelog
    desktop/unstable/intltool/debian/control
    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=47255&op=diff
==============================================================================
--- desktop/unstable/intltool/debian/changelog	[utf-8] (original)
+++ desktop/unstable/intltool/debian/changelog	[utf-8] Mon Jan 18 11:56:40 2016
@@ -1,3 +1,10 @@
+intltool (0.50.2-3) UNRELEASED; urgency=medium
+
+  * Take patch from upstream bug#1490906 to silence warnings in
+    intltool-update when run against perl 5.22. (Closes: #788705)
+
+ -- Iain Lane <laney at debian.org>  Mon, 18 Jan 2016 11:32:58 +0000
+
 intltool (0.50.2-2) unstable; urgency=low
 
   * Mark intltool as Multi-Arch: foreign to allow using this as

Modified: desktop/unstable/intltool/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/control?rev=47255&op=diff
==============================================================================
--- desktop/unstable/intltool/debian/control	[utf-8] (original)
+++ desktop/unstable/intltool/debian/control	[utf-8] Mon Jan 18 11:56:40 2016
@@ -2,12 +2,11 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: intltool
 Section: devel
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Iain Lane <laney at debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs,
                gnome-pkg-tools (>= 0.10),

Added: desktop/unstable/intltool/debian/patches/perl5.22-regex-fixes
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/patches/perl5.22-regex-fixes?rev=47255&op=file
==============================================================================
--- desktop/unstable/intltool/debian/patches/perl5.22-regex-fixes	(added)
+++ desktop/unstable/intltool/debian/patches/perl5.22-regex-fixes	[utf-8] Mon Jan 18 11:56:40 2016
@@ -0,0 +1,50 @@
+Description: Escape some "{", to prevent complaints from perl 5.22
+Author: Roderich Schupp <roderich.schupp at gmail.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705
+Bug-Upstream: https://bugs.launchpad.net/intltool/+bug/1490906
+
+Index: b/intltool-update.in
+===================================================================
+--- a/intltool-update.in
++++ b/intltool-update.in
+@@ -1061,7 +1061,7 @@
+ 	}
+     }
+ 
+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+ 	my $rest = $3;
+ 	my $untouched = $1;
+@@ -1189,10 +1189,10 @@
+ 	$name    =~ s/\(+$//g;
+ 	$version =~ 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)
+@@ -1218,11 +1218,11 @@
+ 	$version =~ s/\(+$//g;
+         $bugurl  =~ s/\(+$//g if (defined $bugurl);
+ 
+-	$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_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
++	$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_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
+     }
+ 
+     # \s makes this not work, why?

Modified: desktop/unstable/intltool/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/patches/series?rev=47255&op=diff
==============================================================================
--- desktop/unstable/intltool/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/intltool/debian/patches/series	[utf-8] Mon Jan 18 11:56:40 2016
@@ -0,0 +1 @@
+perl5.22-regex-fixes