lintian: r888 - in trunk: checks debian

[rra@debian.org]

Author: rra
Date: 2007-05-19 07:17:11 +0200 (Sat, 19 May 2007)
New Revision: 888

Modified:
   trunk/checks/manpages
   trunk/debian/changelog
Log:
* checks/manpages:
  + [RA] Avoid false positives on binaries with X11 in the name.  Patch
    from Kevin B. McCarty.  (Closes: #423229)

Modified: trunk/checks/manpages
===================================================================
--- trunk/checks/manpages	2007-05-15 16:40:56 UTC (rev 887)
+++ trunk/checks/manpages	2007-05-19 05:17:11 UTC (rev 888)
@@ -324,11 +324,11 @@
     if (exists $manpage{$f}) {
 	# 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
+	if ($binary{$f} =~ m,usr/X11R6, or
+	     ($link{$f} && $link{$f} =~ m,(\.\.|usr)/X11R6,)) {
 	    # yes. manpage in X11 too?
 	    for my $manp_info (@{$manpage{$f}}) {
-		if ($manp_info->{file} =~ m/X11/) {
+		if ($manp_info->{file} =~ m/X11R6/) {
 		    # ok.
 		} else {
 		    tag "manpage-for-x11-binary-in-wrong-directory", "$binary{$f} $manp_info->{file}";
@@ -338,7 +338,7 @@
 	} else {
 	    for my $manp_info (@{$manpage{$f}}) {
 		# no. manpage in X11?
-		if ($manp_info->{file} =~ m/X11/) {
+		if ($manp_info->{file} =~ m/X11R6/) {
 		    tag "manpage-for-non-x11-binary-in-wrong-directory", "$binary{$f} $manp_info->{file}";
 		} else {
 		    # ok.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-05-15 16:40:56 UTC (rev 887)
+++ trunk/debian/changelog	2007-05-19 05:17:11 UTC (rev 888)
@@ -14,6 +14,9 @@
     + [RA] Require libmodule-build-perl in Build-Depends if the clean rule
       runs perl Build.  Hopefully this isn't too aggressive.  Thanks, Ian
       Beckwith.  (Closes: #421549)
+  * checks/manpages:
+    + [RA] Avoid false positives on binaries with X11 in the name.  Patch
+      from Kevin B. McCarty.  (Closes: #423229)
   * checks/menus:
     + [RA] Allow multiple blank lines between doc-base sections and
       trailing blank lines in the file.  fine with this.  Reported by Luis
@@ -26,7 +29,7 @@
   * frontend/lintian-info:
     + [CW] Fix uninitialized value warning after reading a blank line.
 
- -- Russ Allbery <rra@debian.org>  Wed,  9 May 2007 12:01:09 -0700
+ -- Russ Allbery <rra@debian.org>  Fri, 18 May 2007 22:14:39 -0700
 
 lintian (1.23.30) unstable; urgency=low