Control: tags -1 + patch
On 2017-01-16 14:28 +0100, Martin Quinson wrote:
> I never dived into quilt.pm myself. I think it was done by Raphael
> Hertzog a while ago. I don't feel very confident with modifying this
> code at this point of the release.
>
> Could someone prepare and test a patch? I recognize that this seem
> overkill given how simple the change is, but ... I have a very sparse
> time right now and I don't have the time to fix things if I mess
> things up...
I have attached a patch which works for me, it's literally a one-liner.
> On Thu, Jan 12, 2017 at 06:11:00PM +0000, Niels Thykier wrote:
>> Control: reassign -1 quilt
>> Control: retitle -1 quilt: Update dh-sequence module
>>
>> Hi Martin and Ryan,
>>
>> Please update your debhelper sequence (quilt.pm) to use:
>>
>> """
>> insert_before("dh_update_autotools_config", "dh_quilt_patch");
>> """
>> This requires a dependency on debhelper (>= 9.20160114)
I don't see why this is necessary, because insert_before just seems to
be a no-op if the first argument is not present in the sequence, but I
must admit that I haven't tested with Jessie's debhelper version.
Otherwise quilt should rather declare a Breaks on old debhelper versions
rather than add a dependency on debhelper.
Cheers,
Sven
>From 6240498c8b25ff5685e31bcfa7349ec19848ffb8 Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenj...@gmx.de>
Date: Thu, 16 Mar 2017 20:24:33 +0100
Subject: [PATCH] Run dh_quilt_patch before dh_update_autotools_config
Otherwise the patches for the build system needs might be applied too
late.
---
debian/quilt.pm | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/quilt.pm b/debian/quilt.pm
index 987a0cd..dfe4787 100644
--- a/debian/quilt.pm
+++ b/debian/quilt.pm
@@ -4,6 +4,7 @@ use strict;
use Debian::Debhelper::Dh_Lib;
insert_before("dh_auto_configure", "dh_quilt_patch");
+insert_before("dh_update_autotools_config", "dh_quilt_patch");
insert_before("dh_clean", "dh_quilt_unpatch");
# Eval to avoid problem with debhelper < 7.3.12
--
2.11.0
