build/debian-packages/dpkg-wheezy.diff
author Mike Hommey <mh+mozilla@glandium.org>
Thu, 18 Jan 2018 14:41:11 +0900
changeset 454235 c647e9f13846de9f6f89d4b8bf89414bdab43ce3
permissions -rw-r--r--
Bug 1431297 - Build a xz-utils package for Debian wheezy. r=dustin There were a few constraints in the choice of the version of dpkg to backport: - 1.17.20 is the first version that supports the debian source format for that xz-utils package. - versions >= 1.17.10 and <= 1.17.22 fail to build on wheezy. - versions >= 1.17.21 depend on a version of patch not available on wheezy. All in all, the simpler choice was to go with version 1.17.20 with a backport of the build failure fix. That version of dpkg breaks the version of devscripts in wheezy, so the version from wheezy-backports would be better to use, but we can't unconditionally use it on all builds, because it happens that mk-build-deps from that version is broken with the dpkg in wheezy. In the end, it's simpler to build that backport and rely on package task dependencies rather than selectively install the package from wheezy-backports, so we do that. Except we can't use version 2.14.11~bpo70+1 because of bug 1419577.

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 $!;
 }