Control: tags -1 + patch Hi,
as this prevents a number of packages from building, I’d like to speed up the fix by providing a patch... Test suite passes. Greetings, Joachim -- -- Joachim “nomeata” Breitner Debian Developer [email protected] • https://people.debian.org/~nomeata XMPP: [email protected] • GPG-Key: 0xF0FBF51F https://www.joachim-breitner.de/
From 0701fa3c0981d5b0b584bbe053a511837a271f63 Mon Sep 17 00:00:00 2001 From: Joachim Breitner <[email protected]> Date: Tue, 23 Feb 2016 10:23:29 +0100 Subject: [PATCH] addsubstvar: Pass -a to grep to handle substvars with unicode content gracefully (Closes: #815620) --- Debian/Debhelper/Dh_Lib.pm | 4 ++-- debian/changelog | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index a6f1e00..2baf029 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -703,7 +703,7 @@ sub delsubstvar { my $substvarfile="debian/${ext}substvars"; if (-e $substvarfile) { - complex_doit("grep -s -v '^${substvar}=' $substvarfile > $substvarfile.new || true"); + complex_doit("grep -a -s -v '^${substvar}=' $substvarfile > $substvarfile.new || true"); doit("mv", "$substvarfile.new","$substvarfile"); } } @@ -750,7 +750,7 @@ sub addsubstvar { } if (length $line) { - complex_doit("(grep -s -v ${substvar} $substvarfile; echo ".escape_shell("${substvar}=$line").") > $substvarfile.new"); + complex_doit("(grep -a -s -v ${substvar} $substvarfile; echo ".escape_shell("${substvar}=$line").") > $substvarfile.new"); doit("mv", "$substvarfile.new", $substvarfile); } else { diff --git a/debian/changelog b/debian/changelog index 9b1eb99..2a91861 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ debhelper (9.20160116) UNRELEASED; urgency=medium + [ Niels Thykier ] * Remove dh_suidregister and related autoscripts. No package (that can be built in unstable) invokes this tool. * dh: Do not create stamp files when running with --no-act. @@ -26,6 +27,10 @@ debhelper (9.20160116) UNRELEASED; urgency=medium * cmake.pm: Apply patch from Helmut Grohne to correct the name of the default cross compilers. (Closes: #812136) + [ Joachim Breitner ] + * addsubstvar: Pass -a to grep to handle substvars with unicode content + gracefully (Closes: #815620) + -- Niels Thykier <[email protected]> Sat, 16 Jan 2016 13:23:00 +0000 debhelper (9.20160115) unstable; urgency=medium -- 2.7.0
signature.asc
Description: This is a digitally signed message part
