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

[lintian] 01/01: Finetune exceptions for and rename depends-on-perl-modules



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

abe pushed a commit to branch ppt-lc-mover
in repository lintian.

commit a5a4cde01bbe978874d80b926b2a1cb3db075171
Author: Axel Beckert <abe@deuxchevaux.org>
Date:   Thu Aug 13 21:03:59 2015 +0200

    Finetune exceptions for and rename depends-on-perl-modules
    
    * Rename it to package-relation-with-perl-modules
    * Do not emit that tag for all packages from the source package perl,
      not just for the binary package perl.
    
    Suggestions by nthykier.
    
    Signed-off-by: Axel Beckert <abe@deuxchevaux.org>
---
 checks/fields.desc                                      |  2 +-
 checks/fields.pm                                        |  8 ++++++--
 debian/changelog                                        |  5 ++---
 t/tests/fields-depends-general/debian/debian/control.in | 14 --------------
 t/tests/fields-depends-general/tags                     |  4 ++--
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/checks/fields.desc b/checks/fields.desc
index c52b285..8ceafb3 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -1259,7 +1259,7 @@ Certainty: certain
 Info: libmodule-build-tiny-perl needs to be in <tt>Build-Depends</tt>, not
  in Build-Depends-Indep, since it's used in the clean target.
 
-Tag: depends-on-perl-modules
+Tag: package-relation-with-perl-modules
 Severity: important
 Certainty: certain
 Info: No package should depend on 'perl-modules'. Instead, a suitable
diff --git a/checks/fields.pm b/checks/fields.pm
index 65f3f27..87beff2 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -829,8 +829,12 @@ sub run {
                       && perl_core_has_version($d_pkg, $d_version->[0],
                         $d_version->[1]);
 
-                    tag 'depends-on-perl-modules', $field
-                      if $d_pkg =~ /^perl-modules/ && $pkg ne 'perl';
+                    tag 'package-relation-with-perl-modules', "$field: $d_pkg"
+                      # matches "perl-modules" (<= 5.20) as well as
+                      # perl-modules-5.xx (>> 5.20)
+                      if $d_pkg =~ /^perl-modules/
+                      && $field ne 'replaces'
+                      && $info->field('source', $pkg) ne 'perl';
 
                     tag 'depends-exclusively-on-makedev', $field,
                       if ( $field eq 'depends'
diff --git a/debian/changelog b/debian/changelog
index 7f406b3..efe4b12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,9 +23,8 @@ lintian (2.5.36) UNRELEASED; urgency=medium
       dummy package to check for depends-on-old-emacs false positives.
     + [AB] Add libmodule-build(-tiny)-perl-needs-to-be-in-build-depends
       tags from pkg-perl-tools by gregor herrmann.
-    + [AB] Add depends-on-perl-modules tag from pkg-perl-tools by Damyan
-      Ivanov. Extend check to also recognize future versioned
-      perl-modules-5.* package names.
+    + [AB] Add new tag package-relation-with-perl-modules based on
+      pkg-perl-tools' depends-on-perl-modules by Damyan Ivanov.
   * checks/files.desc:
     + [BR] Correct a few typos.  (Closes: #794953)
     + [BR] Rename files-privacybreach-may-use-debian-package
diff --git a/t/tests/fields-depends-general/debian/debian/control.in b/t/tests/fields-depends-general/debian/debian/control.in
index ab82479..870f98a 100644
--- a/t/tests/fields-depends-general/debian/debian/control.in
+++ b/t/tests/fields-depends-general/debian/debian/control.in
@@ -54,17 +54,3 @@ Description: {$description} - Fake Doc package
  be an empty package.
  .
  The fake doc package.
-
-Package: perl
-Section: perl
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, perl-modules
-Description: {$description} - Fake Perl package
- This is a test package designed to exercise some feature or tag of
- Lintian.  It is part of the Lintian test suite and may do very odd
- things.  It should not be installed like a regular package.  It may
- be an empty package.
- .
- The fake Perl package which is only there to make sure
- depends-on-perl-modules does not issue a false positive for the
- dependency to perl-modules by perl.
diff --git a/t/tests/fields-depends-general/tags b/t/tests/fields-depends-general/tags
index a36c187..bcb65e3 100644
--- a/t/tests/fields-depends-general/tags
+++ b/t/tests/fields-depends-general/tags
@@ -2,11 +2,11 @@ E: fields-depends-general: conflicts-with-dependency depends conflict-dep
 E: fields-depends-general: depends-on-essential-package-without-using-version depends: bash
 E: fields-depends-general: depends-on-metapackage depends: xorg
 E: fields-depends-general: depends-on-obsolete-package depends: gaim (>= 0.1)
-E: fields-depends-general: depends-on-perl-modules depends
 E: fields-depends-general: needlessly-depends-on-awk depends
 E: fields-depends-general: package-depends-on-an-x-font-package depends: xfont-a
+E: fields-depends-general: package-relation-with-perl-modules depends: perl-modules
 E: libfields-depends-general: depends-on-libdb1-compat depends
-E: libfields-depends-general: depends-on-perl-modules depends
+E: libfields-depends-general: package-relation-with-perl-modules depends: perl-modules-5.22
 E: py-fields-depends-general: depends-on-python-minimal depends
 I: fields-depends-general: conflicts-with-version package-with-version (<< 3.0)
 I: fields-depends-general: ored-depends-on-obsolete-package depends: xbase-clients (>= 0.1)

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


Reply to: