lintian: r863 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2007-04-27 04:58:15 +0200 (Fri, 27 Apr 2007)
New Revision: 863

Modified:
   trunk/checks/fields
   trunk/checks/manpages
   trunk/debian/changelog
Log:
  + [RA] Allow the Python core packages themselves to depend on
    python-minimal.
  + [RA] Don't consider a binary an X binary if it's a symlink into
    /etc/X11.  (seyon does something weird but probably legitimate.)
  + [RA] Fix manpage-for-non-x11-binary-in-wrong-directory and
    manpage-for-x11-binary-in-wrong-directory output.

Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields	2007-04-27 02:35:36 UTC (rev 862)
+++ trunk/checks/fields	2007-04-27 02:58:15 UTC (rev 863)
@@ -438,7 +438,8 @@
 					    if ($d_pkg eq "libdb1-compat" && $pkg !~ /^libc(6|6.1|0.3)/ && $field =~ /^(pre-)depends$/);
 
 					tag "depends-on-python-minimal", "$field",
-					    if ($d_pkg =~ /^python[\d.]*-minimal$/ && &$is_dep_field($field));
+					    if ($d_pkg =~ /^python[\d.]*-minimal$/ && &$is_dep_field($field)
+						&& $pkg !~ /^python[\d.]*-minimal$/);
 
 					tag "doc-package-depends-on-main-package", "$field"
 					    if ("$d_pkg-doc" eq $pkg && $field =~ /^(pre-)depends$/);

Modified: trunk/checks/manpages
===================================================================
--- trunk/checks/manpages	2007-04-27 02:35:36 UTC (rev 862)
+++ trunk/checks/manpages	2007-04-27 02:58:15 UTC (rev 863)
@@ -322,15 +322,16 @@
 
 for my $f (sort keys %binary) {
     if (exists $manpage{$f}) {
-	# X11 binary?
-	if ($binary{$f} =~ m/X11/ or 
-	     ($link{$f} && $link{$f} =~ m/X11/)) { #Link to a X11 dir
+	# X11 binary?  This shouldn't happen any more; these are no longer
+	# allowed.
+	if ($binary{$f} =~ m,usr/X11, or 
+	     ($link{$f} && $link{$f} =~ m,(\.\.|usr)/X11,)) { #Link to a X11 dir
 	    # yes. manpage in X11 too?
 	    for my $manp_info (@{$manpage{$f}}) {
 		if ($manp_info->{file} =~ m/X11/) {
 		    # ok.
 		} else {
-		    tag "manpage-for-x11-binary-in-wrong-directory", "$binary{$f} $$manp_info{$f}";
+		    tag "manpage-for-x11-binary-in-wrong-directory", "$binary{$f} $manp_info->{file}";
 		}
 	    }
 	
@@ -338,7 +339,7 @@
 	    for my $manp_info (@{$manpage{$f}}) {
 		# no. manpage in X11?
 		if ($manp_info->{file} =~ m/X11/) {
-		    tag "manpage-for-non-x11-binary-in-wrong-directory", "$binary{$f} $$manp_info{$f}";
+		    tag "manpage-for-non-x11-binary-in-wrong-directory", "$binary{$f} $manp_info->{file}";
 		} else {
 		    # ok.
 		}

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-04-27 02:35:36 UTC (rev 862)
+++ trunk/debian/changelog	2007-04-27 02:58:15 UTC (rev 863)
@@ -16,6 +16,8 @@
       Build-Depends-Indep.  Still allow them in Build-Depends, though,
       since that's where CDBS likes to put them.  Thanks, Tristan
       Seligmann.  (Closes: #420526)
+    + [RA] Allow the Python core packages themselves to depend on
+      python-minimal.
   * checks/files{.desc,}:
     + [RA] Check for svk commit message files.
     + [RA] Don't consider {copying,license}.dtd extra license files; the
@@ -30,6 +32,10 @@
   * checks/manpages:
     + [RA] Cope with more uses of - in *roff escapes that don't need
       hyphen warnings.
+    + [RA] Don't consider a binary an X binary if it's a symlink into
+      /etc/X11.  (seyon does something weird but probably legitimate.)
+    + [RA] Fix manpage-for-non-x11-binary-in-wrong-directory and
+      manpage-for-x11-binary-in-wrong-directory output.
   * checks/rules:
     + [RA] Listing a rule as a dependency of .PHONY is sufficient to mark
       it as present for GNU make and hence sufficient for Policy's
@@ -47,7 +53,7 @@
     + [RA] Diagnose use of /bin/env with a more specific message than the
       generic unusual interpreter tag.
 
- -- Russ Allbery <rra@debian.org>  Thu, 26 Apr 2007 19:26:18 -0700
+ -- Russ Allbery <rra@debian.org>  Thu, 26 Apr 2007 19:58:01 -0700
 
 lintian (1.23.29) unstable; urgency=low