[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#907261: lintian: do not warn for missing B-D: debhelper with debhelper-compat



Package: lintian
Version: 2.5.97
Severity: minor
Tags: patch

Hi,

Thanks for taking care of Lintian and keeping up with all the changes in
the Debian development ecosystem!

Recently, Lintian learned about B-D: debhelper-compat (= X) used instead
of the debian/compat file.  However, it still emits warnings if the
rules file uses commands that are part of the debhelper binary package
even if debhelper-compat specifies a recent enough version, thus
implying that a recent enough version of debhelper will be pulled in.

What do you think about the attached patch that allows debhelper-compat
to satisfy the requirements so that these warnings are not emitted?

Of course, as Lintian maintainers, it's your call, and if you say that
debhelper-compat is an indication of something else and it does not
necessarily imply that the debhelper binary package will be installed,
I guess I'll have to live with that and also add a debhelper dependency
to my packages :)  But, if this is indeed the intention of the Lintian
maintainers, I'd like to also hear the opinion of the debhelper
maintainers, since from #904886 it seems to me that the intention is
that B-D: debhelper-compat (= 11) should be enough.

Thanks again for these great tools and keep up the great work!

G'luck,
Peter

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

Kernel: Linux 4.17.0-3-amd64 (SMP w/8 CPU cores)
Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8), LANGUAGE=bg_BG.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages lintian depends on:
ii  binutils                       2.31.1-4
ii  bzip2                          1.0.6-9
ii  diffstat                       1.61-1+b1
ii  dpkg                           1.19.0.5+b1
ii  file                           1:5.34-2
ii  gettext                        0.19.8.1-7
ii  intltool-debian                0.35.0+20060710.4
ii  libapt-pkg-perl                0.1.34
ii  libarchive-zip-perl            1.62-2
ii  libclass-accessor-perl         0.51-1
ii  libclone-perl                  0.39-1
ii  libdpkg-perl                   1.19.0.5
ii  libemail-valid-perl            1.202-1
ii  libfile-basedir-perl           0.08-1
ii  libipc-run-perl                20180523.0-1
ii  liblist-moreutils-perl         0.416-1+b3
ii  libparse-debianchangelog-perl  1.2.0-12
ii  libtext-levenshtein-perl       0.13-1
ii  libtimedate-perl               2.3000-2
ii  liburi-perl                    1.74-1
ii  libxml-simple-perl             2.25-1
ii  libyaml-libyaml-perl           0.72+repack-1
ii  man-db                         2.8.4-2
ii  patchutils                     0.3.4-2
ii  perl [libdigest-sha-perl]      5.26.2-7
ii  t1utils                        1.41-2
ii  xz-utils                       5.2.2-1.3

Versions of packages lintian recommends:
pn  libperlio-gzip-perl  <none>

Versions of packages lintian suggests:
pn  binutils-multiarch     <none>
ii  dpkg-dev               1.19.0.5
ii  libhtml-parser-perl    3.72-3+b2
ii  libtext-template-perl  1.53-1

-- no debconf information
From cf6d412936885b2199fc1f852c986ece8fa4e6e6 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@ringlet.net>
Date: Thu, 16 Aug 2018 00:26:32 +0300
Subject: [PATCH] Allow dh_* commands with B-D: debhelper-compat.

Complete the support for a Build-Depends field that only contains
debhelper-compat and not debhelper.
---
 checks/rules.pm                   | 6 +++---
 data/debhelper/dh_addons-manual   | 4 ++--
 data/debhelper/dh_commands-manual | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/checks/rules.pm b/checks/rules.pm
index 894799d17..a200f47e2 100644
--- a/checks/rules.pm
+++ b/checks/rules.pm
@@ -61,8 +61,8 @@ our @GLOBAL_CLEAN_DEPENDS = (
     [cdbs => qr'^include\s+/usr/share/R/debian/r-cran\.mk'],
     [dbs => qr'^include\s+/usr/share/dbs/'],
     ['dh-make-php' => qr'^include\s+/usr/share/cdbs/1/class/pear\.mk'],
-    [debhelper => qr'^include\s+/usr/share/cdbs/1/rules/debhelper\.mk'],
-    [debhelper => qr'^include\s+/usr/share/R/debian/r-cran\.mk'],
+    ['debhelper | debhelper-compat' => qr'^include\s+/usr/share/cdbs/1/rules/debhelper\.mk'],
+    ['debhelper | debhelper-compat' => qr'^include\s+/usr/share/R/debian/r-cran\.mk'],
     [dpatch => qr'^include\s+/usr/share/cdbs/1/rules/dpatch\.mk'],
     ['gnome-pkg-tools' => qr'^include\s+/usr/share/gnome-pkg-tools/'],
     [quilt => qr'^include\s+/usr/share/cdbs/1/rules/patchsys-quilt\.mk'],
@@ -89,7 +89,7 @@ my @GLOBAL_DEPENDS=(
 # depend on, this package is allowed (and required) in Build-Depends.
 my @RULE_CLEAN_DEPENDS =(
     [ant => qr'^\t\s*(\S+=\S+\s+)*ant\s'],
-    [debhelper => qr'^\t\s*dh_.+'],
+    ['debhelper | debhelper-compat' => qr'^\t\s*dh_.+'],
     ['dh-ocaml, ocaml-nox | ocaml' => qr'^\t\s*dh_ocamlinit\s'],
     [dpatch => qr'^\t\s*(\S+=\S+\s+)*dpatch\s'],
     ['po-debconf' => qr'^\t\s*debconf-updatepo\s'],
diff --git a/data/debhelper/dh_addons-manual b/data/debhelper/dh_addons-manual
index 573e1393f..1b8ce71d1 100644
--- a/data/debhelper/dh_addons-manual
+++ b/data/debhelper/dh_addons-manual
@@ -4,10 +4,10 @@
 #
 # Please keep this sorted.
 apache2||dh-apache2 | apache2-dev
-autoreconf||dh-autoreconf | debhelper (>= 9.20160403~)
+autoreconf||dh-autoreconf | debhelper (>= 9.20160403~) | debhelper-compat
 lv2config||lv2core
 python2||python:any | python-all:any | python-dev:any | python-all-dev:any | python2:any | python2-dev:any
 python3||python3:any | python3-all:any | python3-dev:any | python3-all-dev:any
 scour||scour | python-scour
 sphinxdoc||python-sphinx | python3-sphinx
-systemd||debhelper (>= 9.20160709~) || dh-systemd
+systemd||debhelper (>= 9.20160709~) | debhelper-compat || dh-systemd
diff --git a/data/debhelper/dh_commands-manual b/data/debhelper/dh_commands-manual
index eba917376..e1707e1a3 100644
--- a/data/debhelper/dh_commands-manual
+++ b/data/debhelper/dh_commands-manual
@@ -13,8 +13,8 @@
 # Please keep this sorted.
 
 dh_apache2||dh-apache2 | apache2-dev
-dh_autoreconf_clean||dh-autoreconf | debhelper (>= 9.20160403~)
-dh_autoreconf||dh-autoreconf | debhelper (>= 9.20160403~)
+dh_autoreconf_clean||dh-autoreconf | debhelper (>= 9.20160403~) | debhelper-compat
+dh_autoreconf||dh-autoreconf | debhelper (>= 9.20160403~) | debhelper-compat
 dh_lv2config||lv2core
 dh_nativejava||gcj-native-helper | default-jdk-builddep
 dh_python2||dh-python
-- 
2.18.0

Attachment: signature.asc
Description: PGP signature


Reply to: