On Thu, 16 Mar 2017 20:40:59 +0100, Sven Joachim wrote:

> > 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, 

I think, and Niels just confirmed on IRC, that he meant to _replace_
 insert_before("dh_auto_configure", "dh_quilt_patch");
with
 insert_before("dh_update_autotools_config", "dh_quilt_patch");
instead of adding the latter, and then the dependency would be
required on the first debhelper version which has
dh_update_autotools_config.

> but I
> must admit that I haven't tested with Jessie's debhelper version.

Just tried: jessie chroot, /usr/share/perl5/Debian/Debhelper/Sequence/quilt.pm
with your patch:

# dh $@ --with quilt --no-act build                      
   dh_testdir
   dh_quilt_patch
   dh_auto_configure
   dh_auto_build
   dh_auto_test

The same in stretch:

# dh $@ --with quilt --no-act build
dh: Compatibility levels before 9 are deprecated (level 7 in use)
   dh_testdir
   dh_quilt_patch
   dh_update_autotools_config
   dh_auto_configure
   dh_auto_build
   dh_auto_test
   create-stamp debian/debhelper-build-stamp

So it looks like the patch works indeed with "old" and "new
debhelper. In that case we don't need the dependency.

(I'd probably add a comment to the code why there are now 2
insert_before; a pointer to this bug e.g. :))


Cheers,
gregor

-- 
 .''`.  https://info.comodo.priv.at/ - Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Johnny Cash: In My Life

Attachment: signature.asc
Description: Digital Signature

Reply via email to