Bug#889006: dh-autoreconf is run before patching

[Niels Thykier]

Gergely Nagy:
> Sorry for the brevity, I'm a tad short on time right now: yeah, I'm ok
> with a 0-day NMU of dpatch, that tweaks the sequence, and includes the
> patch for #868978 as well.
> 
> Thanks!
> 

Thanks, I have uploaded dpatch/2.0.38+nmu1 with the attached changes. :)

Apologies for the noise from a "2.0.37+nmu1" upload; I was basing it off
git and did not notice that git was out of date for the upload.

Thanks,
~Niels

diff -Nru dpatch-2.0.38/debhelper/dpatch.pm 
dpatch-2.0.38+nmu1/debhelper/dpatch.pm
--- dpatch-2.0.38/debhelper/dpatch.pm   2015-11-30 11:34:18.000000000 +0100
+++ dpatch-2.0.38+nmu1/debhelper/dpatch.pm      2018-02-04 16:23:16.000000000 
+0100
@@ -3,7 +3,7 @@
 use strict;
 use Debian::Debhelper::Dh_Lib;
 
-insert_before("dh_auto_configure", "dh_dpatch_patch");
+insert_before("dh_update_autotools_config", "dh_dpatch_patch");
 insert_before("dh_clean", "dh_dpatch_unpatch");
 
 # Eval to avoid problem with debhelper < 7.3.12
diff -Nru dpatch-2.0.38/debian/changelog dpatch-2.0.38+nmu1/debian/changelog
--- dpatch-2.0.38/debian/changelog      2015-11-30 12:19:57.000000000 +0100
+++ dpatch-2.0.38+nmu1/debian/changelog 2018-02-04 16:23:16.000000000 +0100
@@ -1,3 +1,15 @@
+dpatch (2.0.38+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.  Uploaded without delay with
+    maintainer's permission  (#889006 comment 44).
+  * Apply patch from Sven Joachim to FTBFS if awk is provided
+    by original-awk rather than mawk.  (Closes: #868978)
+  * Run dh_dpatch_patch before dh_update_autotools_config rather
+    than before dh_auto_configure to ensure patching happens
+    before autotools "retooling".  (Closes: #889006)
+
+ -- Niels Thykier <ni...@thykier.net>  Sun, 04 Feb 2018 15:23:16 +0000
+
 dpatch (2.0.38) unstable; urgency=medium
 
   * Don't just install bash completion to a new place, remove the old files
diff -Nru dpatch-2.0.38/tools/shpp.awk dpatch-2.0.38+nmu1/tools/shpp.awk
--- dpatch-2.0.38/tools/shpp.awk        2015-11-30 11:34:18.000000000 +0100
+++ dpatch-2.0.38+nmu1/tools/shpp.awk   2018-02-04 16:23:16.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/nawk -f
+#!/usr/bin/awk -f
 # shpp.awk -- Simple preprocessor for shell scripts
 #
 #  Copyright (C) 2003  Miles Bader <mi...@gnu.org>

signature.asc
Description: OpenPGP digital signature