[lintian] 02/02: Check multiarch-support even if no debhelper

[Bastien ROUCARIES <broucaries-guest@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

broucaries-guest pushed a commit to branch master
in repository lintian.

commit 48177cead274c88bc8946bc2f5427096f10f0156
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date:   Mon Aug 3 17:35:53 2015 +0200

    Check multiarch-support even if no debhelper
    
    Will help removal of this package
---
 checks/control-file.desc |  3 +++
 checks/control-file.pm   | 12 +++++-------
 debian/changelog         |  4 +++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/checks/control-file.desc b/checks/control-file.desc
index 470a4a5..2967fc5 100644
--- a/checks/control-file.desc
+++ b/checks/control-file.desc
@@ -231,6 +231,9 @@ Info: The control file mentions multiarch-support in a Pre-Depends line.
  should be used instead. Then multiarch-support can be removed by a change
  in debhelper followed by a binNMU of all affected packages.
  .
+ Please also ensure that source package at least build-depends to
+ debhelper version >=9.
+ .
  In order to ease the multiarch-support removal the severity of
  this tag is important.
 
diff --git a/checks/control-file.pm b/checks/control-file.pm
index 0c5cc34..32d2f8e 100644
--- a/checks/control-file.pm
+++ b/checks/control-file.pm
@@ -379,13 +379,11 @@ sub run {
     # find binary packages that Pre-Depend on multiarch-support without going
     # via ${misc:Pre-Depends}
     if ($info->source_field('build-depends')) {
-        if ($info->source_field('build-depends') =~ /debhelper/) {
-            for my $bin (@package_names) {
-                my $raw = $info->binary_field($bin, 'pre-depends');
-                next unless $raw;
-                if($raw =~ /multiarch-support/) {
-                    tag 'pre-depends-directly-on-multiarch-support',$bin;
-                }
+        for my $bin (@package_names) {
+            my $raw = $info->binary_field($bin, 'pre-depends');
+            next unless $raw;
+            if($raw =~ /multiarch-support/) {
+                tag 'pre-depends-directly-on-multiarch-support',$bin;
             }
         }
     }
diff --git a/debian/changelog b/debian/changelog
index 1012ed9..e3f2329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,10 +10,12 @@ lintian (2.5.35) UNRELEASED; urgency=medium
       Jover for the report.  (Closes: #787853)
   * checks/changelog-file.{desc,pm}:
     + [BR] Detect non consecutive debian revision.  (Closes: #789820)
-  * checks/control-file.desc:
+  * checks/control-file.{desc,pm}:
     + [BR] In order to ease the multiarch-support removal the severity of
       pre-depends-directly-on-multiarch-support is raised to important.
       Thanks to Helmut Grohne remainder.
+    + [BR] pre-depends-directly-on-multiarch-support does not need debhelper
+      for being raised. Suggest to depends to debhelper >= 9.
   * checks/fields.desc:
     + [JW] Fix spelling of the word "indicate".
   * checks/scripts.desc:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git