[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



Author: he
Date: 2004-04-11 16:52:05 +0200 (Sun, 11 Apr 2004)
New Revision: 147

Modified:
   trunk/checks/manpages
   trunk/debian/changelog
   trunk/testset/info_tags.manpages
   trunk/testset/manpages/debian/changelog
   trunk/testset/manpages/debian/rules
   trunk/testset/tags.manpages
Log:
checks/manpages:
 + [FL, HE] Fix false positives of
   manpage-for-non-x11-binary-in-wrong-directory when a link
   from a normal bin/ is pointing to a binary in an X11 dir. Based 
   on patch by FL. (Closes: #203389)
					  


Modified: trunk/checks/manpages
===================================================================
--- trunk/checks/manpages	2004-04-11 11:02:25 UTC (rev 146)
+++ trunk/checks/manpages	2004-04-11 14:52:05 UTC (rev 147)
@@ -29,6 +29,7 @@
 
 my %file_info;
 my %binary;
+my %link;
 my %sect_by_binary;
 my %sect_by_manpage;
 my %manpage;
@@ -77,6 +78,7 @@
 	my $bin = $fname;
 	
 	$binary{$bin} = $file;
+	$link{$bin} = $link if $link;
 
 	for ($path) {
 	    m,^(usr/(X11R6/)?)?bin/,o && do {
@@ -262,7 +264,8 @@
 for my $f (sort keys %binary) {
     if (exists $manpage{$f}) {
 	# X11 binary?
-	if ($binary{$f} =~ m/X11/) {
+	if ($binary{$f} =~ m/X11/ or 
+	     ($link{$f} && $link{$f} =~ m/X11/)) { #Link to a X11 dir
 	    # yes. manpage in X11 too?
 	    if ($manpage{$f} =~ m/X11/) {
 		# ok.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-04-11 11:02:25 UTC (rev 146)
+++ trunk/debian/changelog	2004-04-11 14:52:05 UTC (rev 147)
@@ -67,6 +67,10 @@
         regex by Josip Rodin.
       - Search for FSSTND directories referenced in man pages. Only
         an info tag. (Closes: #111098)
+    + [FL, HE] Fix false positives of
+      manpage-for-non-x11-binary-in-wrong-directory when a link
+      from a normal bin/ is pointing to a binary in an X11 dir. Based 
+      on patch by FL. (Closes: #203389)
   * checks/menu-format:
     + [FL] Only issue one warning about needs=dwww, not two
     + [HE] Check if the command given with command= is in the package

Modified: trunk/testset/info_tags.manpages
===================================================================
--- trunk/testset/info_tags.manpages	2004-04-11 11:02:25 UTC (rev 146)
+++ trunk/testset/info_tags.manpages	2004-04-11 14:52:05 UTC (rev 147)
@@ -72,6 +72,9 @@
 N:
 E: manpages: empty-manual-page usr/X11R6/man/man6/X11R6-binary.man
 E: manpages: manpage-has-bad-whatis-entry usr/X11R6/man/man6/X11R6-binary.man
+E: manpages: manpage-not-compressed-with-gzip usr/X11R6/man/man1/rstartd.1x.gz
+E: manpages: empty-manual-page usr/X11R6/man/man1/rstartd.1x.gz
+E: manpages: manpage-has-bad-whatis-entry usr/X11R6/man/man1/rstartd.1x.gz
 W: manpages: link-to-undocumented-manpage usr/share/man/man1/bin-binary.1.gz
 N:
 N:   Symbolic links to the undocumented(7) manual page may be provided if
@@ -96,6 +99,17 @@
 N:   in /usr/X11R6/man.
 N:
 W: manpages: link-to-undocumented-manpage usr/share/man/man3/function.3.gz
+W: manpages: no-manpage-in-correct-directory usr/sbin/usr-sbin-binary (1)
+N:
+N:   Manpages for executables in /sbin and /usr/sbin should be placed in
+N:   section 8; manpages for executables in /bin and /usr/bin in section 1;
+N:   manpages for executables in /usr/games in section 6. For the noted
+N:   executable some probable manpages were found but none in the right
+N:   section.
+N:   
+N:   This could either mean there is no manpage for the executable or that
+N:   its manpage is placed in the wrong section.
+N:
 W: manpages: package-contains-hardlink usr/share/man/man1/usr-bin-binary-alt.1.gz
 N:
 N:   Hardlinks are bad mkay, don't use hardlinks.

Modified: trunk/testset/manpages/debian/changelog
===================================================================
--- trunk/testset/manpages/debian/changelog	2004-04-11 11:02:25 UTC (rev 146)
+++ trunk/testset/manpages/debian/changelog	2004-04-11 14:52:05 UTC (rev 147)
@@ -1,3 +1,10 @@
+manpages (3) unstable; urgency=low
+
+  * Add X11 binary to check the manpage-for-non-x11-binary-in-wrong-directory
+    and friends.
+
+ -- Marc 'HE' Brockschmidt <he@debian.org>  Sun, 11 Apr 2004 16:39:04 +0200
+
 manpages (2) unstable; urgency=low
 
   * Add a hardlink check after the recent hardlink breackage

Modified: trunk/testset/manpages/debian/rules
===================================================================
--- trunk/testset/manpages/debian/rules	2004-04-11 11:02:25 UTC (rev 146)
+++ trunk/testset/manpages/debian/rules	2004-04-11 14:52:05 UTC (rev 147)
@@ -9,11 +9,16 @@
 binary-indep:
 	install -d $(tmp)/usr/share/man/man1 $(tmp)/usr/share/man/man3 \
                   $(tmp)/usr/share/man/man6 $(tmp)/usr/X11R6/man/man6 \
-		  $(tmp)/usr/bin $(tmp)/usr/sbin
+                  $(tmp)/usr/bin $(tmp)/usr/sbin $(tmp)/usr/X11R6/bin \
+                  $(tmp)/usr/X11R6/man/man1/
 	touch $(tmp)/usr/bin/usr-bin-binary-alt
 	chmod 755 $(tmp)/usr/bin/usr-bin-binary-alt
 	touch $(tmp)/usr/sbin/usr-sbin-binary
 	chmod 755 $(tmp)/usr/sbin/usr-sbin-binary
+	touch 755 $(tmp)/usr/X11R6/bin/rstartd
+	
+	ln -s ../X11R6/bin/rstartd $(tmp)/usr/bin/rstartd
+	touch $(tmp)/usr/X11R6/man/man1/rstartd.1x.gz
 
 	ln -s ../man7/undocumented.7.gz \
              $(tmp)/usr/share/man/man1/bin-binary.1.gz

Modified: trunk/testset/tags.manpages
===================================================================
--- trunk/testset/tags.manpages	2004-04-11 11:02:25 UTC (rev 146)
+++ trunk/testset/tags.manpages	2004-04-11 14:52:05 UTC (rev 147)
@@ -16,10 +16,13 @@
 W: manpages: x11-games-should-be-in-usr-games usr/X11R6/man/man6/X11R6-binary.man
 E: manpages: empty-manual-page usr/X11R6/man/man6/X11R6-binary.man
 E: manpages: manpage-has-bad-whatis-entry usr/X11R6/man/man6/X11R6-binary.man
+E: manpages: manpage-not-compressed-with-gzip usr/X11R6/man/man1/rstartd.1x.gz
+E: manpages: empty-manual-page usr/X11R6/man/man1/rstartd.1x.gz
+E: manpages: manpage-has-bad-whatis-entry usr/X11R6/man/man1/rstartd.1x.gz
 W: manpages: link-to-undocumented-manpage usr/share/man/man1/bin-binary.1.gz
 E: manpages: bad-link-to-undocumented-manpage usr/share/man/man1/sbin-binary.1.gz
 W: manpages: link-to-undocumented-manpage usr/share/man/man3/function.3.gz
-E: manpages: no-manpage-in-correct-directory usr/sbin/usr-sbin-binary (1)
+W: manpages: no-manpage-in-correct-directory usr/sbin/usr-sbin-binary (1)
 W: manpages: package-contains-hardlink usr/share/man/man1/usr-bin-binary-alt.1.gz
 W: manpages: executable-not-elf-or-script ./usr/sbin/usr-sbin-binary
 W: manpages: executable-not-elf-or-script ./usr/bin/usr-bin-binary-alt



Reply to: