Author: rra
Date: 2006-04-29 10:01:50 +0200 (Sat, 29 Apr 2006)
New Revision: 645

Modified:
   trunk/checks/files
   trunk/checks/files.desc
   trunk/debian/changelog
   trunk/testset/manpages/debian/rules
   trunk/testset/tags.manpages
Log:
  + [RA] Report directories under /usr/share/man that don't match the
    directory layout specified in the FHS.  (Closes: #176683)
  + [RA] Fix a very long-standing bug that caused the check for
    executable manpages to be silently skipped.

Modified: trunk/checks/files
===================================================================
--- trunk/checks/files  2006-04-28 04:43:37 UTC (rev 644)
+++ trunk/checks/files  2006-04-29 08:01:50 UTC (rev 645)
@@ -286,11 +286,14 @@
            }
        }
        # ---------------- /usr/share/man and /usr/X11R6/man
-       elsif ($file =~ m,^usr/X11R6/man/\S+, or m,^usr/share/man/\S+, ) {
+       elsif ($file =~ m,^usr/X11R6/man/\S+, or $file =~ 
m,^usr/share/man/\S+,) {
            if ($type eq 'udeb') {
                tag "documentation-file", "$file";
            }
-           if ($perm =~ m/^-.*[xt]/) {
+           if ($perm =~ m/^d/) {
+               tag "stray-directory-in-manpage-directory", "$file"
+                   if ($file !~ 
m,^usr/(X11R6|share)/man/(?:[^/]+/(?:[^/]+/)?)?(man\d/)?$,);
+           } elsif ($perm =~ m/^-.*[xt]/) {
                tag "executable-manpage", "$file";
            }
        }

Modified: trunk/checks/files.desc
===================================================================
--- trunk/checks/files.desc     2006-04-28 04:43:37 UTC (rev 644)
+++ trunk/checks/files.desc     2006-04-29 08:01:50 UTC (rev 645)
@@ -131,6 +131,13 @@
 Type: error
 Info: The package installs a file in <tt>/opt/...</tt> which is not allowed.
 
+Tag: stray-directory-in-manpage-directory
+Type: error
+Info: This package installs a directory under <tt>/usr/share/man</tt> or
+ <tt>/usr/X11R6/man</tt> that isn't a manual section directory or locale
+ directory.
+Ref: fhs 4.11.5
+
 Tag: executable-manpage
 Type: error
 Info: Manual pages are not meant to be executed.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2006-04-28 04:43:37 UTC (rev 644)
+++ trunk/debian/changelog      2006-04-29 08:01:50 UTC (rev 645)
@@ -17,6 +17,10 @@
       states they should be installed in /usr/lib/cgi-lib.
     + [RA] Warn about scripts installed on the user's PATH with names that
       include language extensions (.sh, .pl, .py), per Policy 10.4.
+    + [RA] Report directories under /usr/share/man that don't match the
+      directory layout specified in the FHS.  (Closes: #176683)
+    + [RA] Fix a very long-standing bug that caused the check for
+      executable manpages to be silently skipped.
   * checks/scripts:
     + [RA] Debian etch release policy explicitly forbids scripts without
       #! magic and they rely on being run from a shell.  Revert the change
@@ -34,7 +38,7 @@
     + [RA] Update standards version to 3.7.0 (no changes required).
     + [RA] Update description to note calibration for Policy 3.7.0.
 
- -- Russ Allbery <[EMAIL PROTECTED]>  Thu, 27 Apr 2006 10:30:09 -0700
+ -- Russ Allbery <[EMAIL PROTECTED]>  Sat, 29 Apr 2006 01:01:04 -0700
 
 lintian (1.23.18) unstable; urgency=low
 

Modified: trunk/testset/manpages/debian/rules
===================================================================
--- trunk/testset/manpages/debian/rules 2006-04-28 04:43:37 UTC (rev 644)
+++ trunk/testset/manpages/debian/rules 2006-04-29 08:01:50 UTC (rev 645)
@@ -40,15 +40,17 @@
        touch $(tmp)/usr/X11R6/man/man6/X11R6-binary.man
        chmod 644 $(tmp)/usr/X11R6/man/man6/X11R6-binary.man
        touch $(tmp)/usr/share/man/de/man1/binary-without-english-manpage.1
-       chmod 644 $(tmp)/usr/share/man/de/man1/binary-without-english-manpage.1
+       chmod 755 $(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/man/man1/not-a-man-page.1.gz
+
        install -d $(tmp)/usr/share/lintian/overrides
        install -m644 debian/overrides 
$(tmp)/usr/share/lintian/overrides/manpages
-       
+
        install -d $(tmp)/usr/share/doc/manpages
        cp debian/changelog $(tmp)/usr/share/doc/manpages/changelog
        gzip -9 $(tmp)/usr/share/doc/manpages/changelog

Modified: trunk/testset/tags.manpages
===================================================================
--- trunk/testset/tags.manpages 2006-04-28 04:43:37 UTC (rev 644)
+++ trunk/testset/tags.manpages 2006-04-29 08:01:50 UTC (rev 645)
@@ -6,6 +6,7 @@
 E: manpages: empty-manual-page usr/share/man/man1/usr-bin-binary.1
 E: manpages: empty-manual-page usr/share/man/man1/usr-sbin-binary.1.gz
 E: manpages: empty-manual-page usr/share/man/man6/usr-games-binary.6.gz
+E: manpages: executable-manpage 
usr/share/man/de/man1/binary-without-english-manpage.1
 E: manpages: manpage-has-wrong-extension usr/X11R6/man/man6/X11R6-binary.man
 E: manpages: manpage-not-compressed usr/X11R6/man/man6/X11R6-binary.man
 E: manpages: manpage-not-compressed 
usr/share/man/de/man1/binary-without-english-manpage.1
@@ -22,6 +23,7 @@
 E: manpages: package-installs-file-to-usr-x11r6 
usr/X11R6/man/man6/X11R6-binary.man
 E: manpages: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/
 E: manpages: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/rstartd
+E: manpages: stray-directory-in-manpage-directory 
usr/share/man/man1/not-a-man-page.1.gz/
 E: manpages: x11-games-should-be-in-usr-games 
usr/X11R6/man/man6/X11R6-binary.man
 W: manpages source: ancient-standards-version 3.2.1
 W: manpages source: binary-nmu-debian-revision-in-source 4-0.0.1
@@ -31,6 +33,7 @@
 W: manpages: executable-not-elf-or-script 
./usr/bin/binary-without-english-manpage
 W: manpages: executable-not-elf-or-script ./usr/bin/usr-bin-binary-alt
 W: manpages: executable-not-elf-or-script ./usr/sbin/usr-sbin-binary
+W: manpages: executable-not-elf-or-script 
./usr/share/man/de/man1/binary-without-english-manpage.1
 W: manpages: link-to-undocumented-manpage usr/share/man/man1/bin-binary.1.gz
 W: manpages: link-to-undocumented-manpage usr/share/man/man3/function.3.gz
 W: manpages: manpage-has-bad-whatis-entry usr/X11R6/man/man1/rstartd.1x.gz


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to