build/debian-packages/dpkg-wheezy.diff
author Brindusan Cristian <cbrindusan@mozilla.com>
Mon, 18 Feb 2019 23:48:55 +0200
changeset 459826 10bef0ce2b5bb28bb918969d35bc8ca47071b97e
parent 399908 c647e9f13846de9f6f89d4b8bf89414bdab43ce3
permissions -rw-r--r--
Merge mozilla-central to inbound. a=merge CLOSED TREE

diff -Nru dpkg-1.17.20/debian/changelog dpkg-1.17.20.deb7moz1/debian/changelog
--- dpkg-1.17.20/debian/changelog	2014-10-23 08:56:30.000000000 +0900
+++ dpkg-1.17.20.deb7moz1/debian/changelog	2018-01-17 18:30:46.000000000 +0900
@@ -1,3 +1,10 @@
+dpkg (1.17.20.deb7moz1) wheezy; urgency=medium
+
+  * Mozilla backport for wheezy.
+  * Apply patch from 1.17.23 fixing build against perl 5.14.
+
+ -- Mike Hommey <glandium@mozilla.com>  Wed, 17 Jan 2018 18:30:46 +0900
+
 dpkg (1.17.20) unstable; urgency=low
 
   [ Guillem Jover ]
diff -Nru dpkg-1.17.20/dselect/mkcurkeys.pl dpkg-1.17.20.deb7moz1/dselect/mkcurkeys.pl
--- dpkg-1.17.20/dselect/mkcurkeys.pl	2014-10-21 09:45:43.000000000 +0900
+++ dpkg-1.17.20.deb7moz1/dselect/mkcurkeys.pl	2018-01-17 18:30:46.000000000 +0900
@@ -140,6 +140,6 @@
 sub p {
     my ($k, $v) = @_;
 
-    $v =~ s/["\\]/\\${^MATCH}/pg;
+    $v =~ s/(["\\])/\\$1/g;
     printf("  { %-15s \"%-20s },\n", $k . ',', $v . '"') or die $!;
 }