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

[SCM] Debian package checker branch, master, updated. 2.5.4-105-ga1470f2



The following commit has been merged in the master branch:
commit a1470f2fdbe4cb9e5046e6168b47c434ace7615b
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jan 23 17:44:03 2012 +0100

    Allow self relations in Replaces and Provides (per §7.6.2)
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/fields b/checks/fields
index 4cefe26..800bda2 100644
--- a/checks/fields
+++ b/checks/fields
@@ -609,7 +609,7 @@ if (($type eq 'binary') || ($type eq 'udeb')) {
                     if ($d_version->[0] && ! version_check($d_version->[1]));
 
                 tag 'package-relation-with-self', "$field: $part_d_orig"
-                    if ($pkg eq $d_pkg) && ($field ne 'conflicts');
+                    if ($pkg eq $d_pkg) && ($field ne 'conflicts' && $field ne 'replaces' && $field ne 'provides');
 
                 tag 'bad-relation', "$field: $part_d_orig"
                     if $rest;
diff --git a/debian/changelog b/debian/changelog
index 010bf5a..44f98e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,8 @@ lintian (2.5.5) UNRELEASED; urgency=low
     + [NT] Use new Lintian::Architecture API.
     + [JW] Include ssh:// as a valid protocol for hg.
       (Closes: #655907)
+    + [NT] Ignore self relations in Replaces and Provides.  This
+      is allowed according to §7.6.2.  (Closes: #657034)
   * checks/files:
     + [JW,NT] Skip "Multi-Arch: same" check of gzip files if their
       install path contains the architecture.  (Closes: #650665)
diff --git a/testset/tags.relations b/testset/tags.relations
index 6a3b958..c19884c 100644
--- a/testset/tags.relations
+++ b/testset/tags.relations
@@ -59,7 +59,6 @@ W: relations: bad-homepage lintian.debian.org
 W: relations: depends-exclusively-on-makedev depends
 W: relations: depends-on-old-emacs recommends: emacs21
 W: relations: package-relation-with-self depends: relations (<< 3)
-W: relations: package-relation-with-self replaces: relations
 W: relations: redundant-bugs-field
 W: relations: redundant-origin-field
 W: relations: versioned-dependency-satisfied-by-perl depends: libfile-temp-perl (>= 0.18)

-- 
Debian package checker


Reply to: