lintian: r573 - in trunk: checks debian testset/manpages testset/manpages/debian

[rra@debian.org]

Author: rra
Date: 2006-03-12 04:18:20 +0100 (Sun, 12 Mar 2006)
New Revision: 573

Added:
   trunk/testset/manpages/include.3
   trunk/testset/manpages/included.3
Modified:
   trunk/checks/manpages
   trunk/debian/changelog
   trunk/testset/manpages/debian/rules
Log:
  + [RA] cd into the parent directory before checking man pages with man
    so that .so inclusions are processed correctly.  Based on a patch by
    Nicolas Francois.  (Closes: #349614)


Modified: trunk/checks/manpages
===================================================================
--- trunk/checks/manpages	2006-03-12 02:35:12 UTC (rev 572)
+++ trunk/checks/manpages	2006-03-12 03:18:20 UTC (rev 573)
@@ -240,7 +240,17 @@
 	    }
 	}
 	# If it's not a .so link, run it through "man" to check for errors.
-	open MANERRS, '-|', "(LANG=C man -l unpacked/\Q$file\E >/dev/null) 2>&1"
+	# If it is in a directory with the standard man layout, cd to the
+	# parent directory before running man so that .so directives are
+	# processed properly.  (Yes, there are man pages that include other
+	# pages with .so but aren't simple links; rbash, for instance.)
+        my $cmd;
+        if ($file =~ m,^(.*)/(man\d/.*)$,) {
+            $cmd = "cd unpacked/\Q$1\E && LANG=C man -l \Q$2\E";
+        } else {
+            $cmd = "LANG=C man -l unpacked/\Q$file\E";
+        }
+	open MANERRS, '-|', "($cmd >/dev/null) 2>&1"
 	    or fail("cannot run man -l: $!");
 	while (<MANERRS>) {
 	    # ignore progress information from man

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-03-12 02:35:12 UTC (rev 572)
+++ trunk/debian/changelog	2006-03-12 03:18:20 UTC (rev 573)
@@ -25,6 +25,9 @@
   * checks/manpages:
     + [FL] Ignore more warnings ("cannot adjust line", "can't break
       line") in non-English manpages. (Closes: #349792)
+    + [RA] cd into the parent directory before checking man pages with man
+      so that .so inclusions are processed correctly.  Based on a patch by
+      Nicolas François.  (Closes: #349614)
   * checks/menu-format:
     + [RA] Look for binaries in /usr/X11R6/bin, not /usr/bin/X11, per
       Policy 11.8.7.  Thanks, Matej Vela.  (Closes: #354890)

Modified: trunk/testset/manpages/debian/rules
===================================================================
--- trunk/testset/manpages/debian/rules	2006-03-12 02:35:12 UTC (rev 572)
+++ trunk/testset/manpages/debian/rules	2006-03-12 03:18:20 UTC (rev 573)
@@ -43,6 +43,9 @@
 	chmod 644 $(tmp)/usr/share/man/de/man1/binary-without-english-manpage.1
 	gzip -c9 <test.1p.de >$(tmp)/usr/share/man/de/man1/test-latin1-chars.1p.gz
 
+	gzip -c9 <include.3 >$(tmp)/usr/share/man/man3/include.3.gz
+	gzip -c9 <included.3 >$(tmp)/usr/share/man/man3/included.3.gz
+
 	install -d $(tmp)/usr/share/lintian/overrides
 	install -m644 debian/overrides $(tmp)/usr/share/lintian/overrides/manpages
 	

Added: trunk/testset/manpages/include.3
===================================================================
--- trunk/testset/manpages/include.3	2006-03-12 02:35:12 UTC (rev 572)
+++ trunk/testset/manpages/include.3	2006-03-12 03:18:20 UTC (rev 573)
@@ -0,0 +1,8 @@
+.TH INCLUDE 3
+.SH NAME
+include \- include another chunk of a man page
+.SH INCLUDED BIT
+.nr zY 1
+.so man3/included.3
+.SH SEE ALSO
+included(3)

Added: trunk/testset/manpages/included.3
===================================================================
--- trunk/testset/manpages/included.3	2006-03-12 02:35:12 UTC (rev 572)
+++ trunk/testset/manpages/included.3	2006-03-12 03:18:20 UTC (rev 573)
@@ -0,0 +1,10 @@
+.if \n(zY=1 .ig zY
+.TH INCLUDED 3
+.SH NAME
+included \- both a man page and a dessert topping
+.SH INCLUDED BIT
+.zY
+This stuff ends up in both man pages.  Isn't it neat?
+.if \n(zY=1 .ig zY
+.SH SEE ALSO
+include(3)