[Pkg-emacsen-addons] Bug#891987: dh-make-elpa: better handling of debhelper version

[Lev Lamberov]

Package: dh-make-elpa
Version: 0.12
Severity: wishlist
Tags: patch

Hi Sean,

please find attached two patches for dh-make-elpa.

The first one,
0001-Substitute-debhelper-version-in-Build-Depends-from-c.patch,
refactors code to generate build dependency on debhelper in d/control.
Now one don't need to change both debhelper version in DEFAULTS of
lib/DhMakeELPA/Config.pm and hardcoded version in add call of
lib/DhMakeELPA/Command/make.pm, one just needs to change DEFAULTS.

The second one,
0002-Generate-debhelper-version-11-in-control-and-compat.patch, bumps
debhelper version in generated files (d/control and d/compat) from 10
to 11.

Cheers!
Lev


-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8), LANGUAGE=ru_RU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages dh-make-elpa depends on:
ii  dh-elpa                 1.11
ii  dh-make-perl            0.99
ii  libarray-utils-perl     0.5-1
ii  libfile-find-rule-perl  0.34-1
ii  libfile-grep-perl       0.02-1
ii  libgit-repository-perl  1.321-1
ii  libtrycatch-perl        1.003002-2+b4
ii  perl                    5.26.1-5

Versions of packages dh-make-elpa recommends:
ii  devscripts  2.17.12

dh-make-elpa suggests no packages.

-- no debconf information
-------------- next part --------------
>From 6ee16b1e4eaf872dbd05296e165357a9ab909b8c Mon Sep 17 00:00:00 2001
From: Lev Lamberov <dogsleg at debian.org>
Date: Sat, 3 Mar 2018 23:41:49 +0500
Subject: [PATCH 1/2] Substitute debhelper version in Build-Depends from
 configuration

---
 lib/DhMakeELPA/Command/make.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/DhMakeELPA/Command/make.pm b/lib/DhMakeELPA/Command/make.pm
index 0111c10..1ddb143 100644
--- a/lib/DhMakeELPA/Command/make.pm
+++ b/lib/DhMakeELPA/Command/make.pm
@@ -51,7 +51,7 @@ sub create_control {
     $src->Section("lisp");
     $src->Priority("optional");
     $src->Standards_Version( $self->debstdversion );
-    $src->Build_Depends->add( "debhelper (>= 10)" );
+    $src->Build_Depends->add( sprintf "debhelper (>= %s)", $self->cfg->dh );
     $src->Build_Depends->add( "dh-elpa" );
     $src->Build_Depends->add( "elpa-buttercup" )
       if ( $self->detect_buttercup_tests() );
-- 
2.16.1

-------------- next part --------------
>From bccb1a8c3f4a9a9e8a14fea4b89b84a82f684dca Mon Sep 17 00:00:00 2001
From: Lev Lamberov <dogsleg at debian.org>
Date: Sat, 3 Mar 2018 23:43:53 +0500
Subject: [PATCH 2/2] Generate debhelper version 11 in control and compat

---
 lib/DhMakeELPA/Config.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/DhMakeELPA/Config.pm b/lib/DhMakeELPA/Config.pm
index 7820191..8c92c20 100644
--- a/lib/DhMakeELPA/Config.pm
+++ b/lib/DhMakeELPA/Config.pm
@@ -34,7 +34,7 @@ __PACKAGE__->mk_accessors(
 );
 
 use constant DEFAULTS => {
-                          dh            => 10,
+                          dh            => 11,
                           data_dir      => '/usr/share/dh-make-elpa',
                           home_dir      => "$ENV{HOME}/.dh-make-elpa",
                           source_format => '3.0 (quilt)',
-- 
2.16.1