lintian: r1180 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2008-02-06 07:12:27 +0100 (Wed, 06 Feb 2008)
New Revision: 1180

Modified:
   trunk/checks/fields
   trunk/checks/fields.desc
   trunk/debian/changelog
Log:
  + [RA] Remove the package-has-duplicate-relation test.  It gets
    relations with different version strictness in different levels of
    dependency wrong and what it gets right dpkg-gencontrol strips out.

Also finalize changes for 1.23.43 (hopefully).


Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields	2008-02-05 06:18:12 UTC (rev 1179)
+++ trunk/checks/fields	2008-02-06 06:12:27 UTC (rev 1180)
@@ -459,12 +459,6 @@
 				for my $part_d (@alternatives) {
 					my ($d_pkg, $d_version, $d_arch, $rest, $part_d_orig) = @$part_d;
 
-					#Save the type of relationship (<<, <=, ...) and the field name:
-					if (&$is_dep_field($field) && scalar @alternatives == 1) {
-						$deps{$d_pkg} = [] if ! $deps{$d_pkg};
-						push @{$deps{$d_pkg}}, [$field, $d_version];
-					}
-
 					# We have found a Depends: on our non-dbg equivalent.
 					if ($debugpackage && $field eq "depends" && $d_pkg =~ /^\Q$debugbase/) {
 						$debugfound = 1;
@@ -544,45 +538,12 @@
 			}
 		}
 	}
-
-	for my $d_pkg_name (keys %deps) {
-		my $d_pkg = $deps{$d_pkg_name};
-		if (scalar @$d_pkg > 1) {
-			#Allow things like Depends: package1 (>= 1.3), package1 (<= 5.2)
-			unless ((scalar @$d_pkg == 2) &&
-			        (($d_pkg->[0]->[1]->[0] =~ />=|>>|>/ && $d_pkg->[1]->[1]->[0] =~ /<=|<<|</) or
-			         ($d_pkg->[0]->[1]->[0] =~ /<=|<<|</ && $d_pkg->[1]->[1]->[0] =~ />=|>>|>/))) {
-				my @relations;
-				my $extra = '';
-			 	if ($d_pkg->[0][0] eq $d_pkg->[1][0]) {
-					$extra .= "$d_pkg->[0][0]: ";
-					for (@$d_pkg) {
-						if ($_->[1][0]) {
-							push @relations, "$d_pkg_name (".$_->[1][0]." ".$_->[1][1].")";
-						} else {
-							push @relations, "$d_pkg_name";
-						}
-					}
-				} else {
-					for (@$d_pkg) {
-						if ($_->[1][0]) {
-							push @relations, "$_->[0]: $d_pkg_name (".$_->[1][0]." ".$_->[1][1].")";
-						} else {
-							push @relations, "$_->[0]: $d_pkg_name";
-						}
-					}
-				}
-				$extra .= join( ", ", @relations );
-				tag "package-has-a-duplicate-relation", $extra;
-			}
-		}
-	}
 }
 
 #---- Package relations (source package)
 
 if ($type eq "source") {
-	
+
 	#Get number of arch-indep packages:
 	my $arch_indep_packages = 0;
 	my $arch_dep_packages = 0;
@@ -590,10 +551,10 @@
 		fail("Can't open debfiles/control: $!");
 	} else {
 		local $/ = "\n"; #Read this linewise
-		while (<CONTROL>) {	
-			if (/^Architecture: all/) {			
+		while (<CONTROL>) {
+			if (/^Architecture: all/) {
 				$arch_indep_packages++;
-			} elsif (/^Architecture:/) {		
+			} elsif (/^Architecture:/) {
 				$arch_dep_packages++;
 			}
 		}

Modified: trunk/checks/fields.desc
===================================================================
--- trunk/checks/fields.desc	2008-02-05 06:18:12 UTC (rev 1179)
+++ trunk/checks/fields.desc	2008-02-06 06:12:27 UTC (rev 1180)
@@ -551,16 +551,6 @@
 Info: The package build-conflicts with a package that it also
  build-depends on.
 
-Tag: package-has-a-duplicate-relation
-Type: warning
-Info: The package seems to declare a relation on another package which is
- already implied by other relations it declares, and is therefore redundant.
- .
- Note that when using ${shlibs:Depends}, this is sometimes unavoidable (unless
- you're in a mood for ugly kludges), feel free to ignore/override this warning
- in that case, as it can only be fixed at the package-tools level (e.g., in
- dpkg)
-
 Tag: package-has-a-duplicate-build-relation
 Type: warning
 Info: The package declares the given build relations on the same package

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-05 06:18:12 UTC (rev 1179)
+++ trunk/debian/changelog	2008-02-06 06:12:27 UTC (rev 1180)
@@ -1,5 +1,7 @@
-lintian (1.23.43) UNRELEASED; urgency=low
+lintian (1.23.43) unstable; urgency=low
 
+  The "37 bug fixes is enough for one release" release.
+
   * checks/binaries{.desc,}:
     + [RA] Don't require objdump's errors on files with bad dynamic tables
       to start at the beginning of the line.  Patch from Chris Lamb.
@@ -44,6 +46,9 @@
     + [RA] Check the value of Dm-Upload-Allowed.
     + [RA] Warn about packages with a list as the maintainer and no
       Uploaders.  Thanks, Sune Vuorela.  (Closes: #462635)
+    + [RA] Remove the package-has-duplicate-relation test.  It gets
+      relations with different version strictness in different levels of
+      dependency wrong and what it gets right dpkg-gencontrol strips out.
   * checks/files{.desc,}:
     + [RA] In many of the long descriptions for symlink-related tags,
       mention that running dh_link will fix symlink problems.
@@ -134,7 +139,7 @@
     + [RA] Add spelling corrections for PostgreSQL and OCaml and lots of
       new capitalization corrections.  (Closes: #460347)
 
- -- Russ Allbery <rra@debian.org>  Mon, 21 Jan 2008 17:36:01 -0800
+ -- Russ Allbery <rra@debian.org>  Tue, 05 Feb 2008 21:07:30 -0800
 
 lintian (1.23.42) unstable; urgency=low