[SCM] Debian package checker branch, master, updated. 2.5.6-13-gbcb26a0
The following commit has been merged in the master branch:
commit a2c390b9c7912cd4652d50849dfd22865cdca861
Author: Niels Thykier <niels@thykier.net>
Date: Wed Mar 14 22:31:41 2012 +0100
manpages: Drop X11 manpage tags
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/manpages b/checks/manpages
index 3224eb6..d3e9c2b 100644
--- a/checks/manpages
+++ b/checks/manpages
@@ -127,11 +127,6 @@ foreach my $file (@{$info->sorted_index}) {
tag 'manpage-has-wrong-extension', $file;
}
- # special check for manual pages for X11 games
- if ($path =~ m,^usr/X11R6/man/man6/,o) {
- tag 'x11-games-should-be-in-usr-games', $file;
- }
-
# check symbolic links to other manual pages
if ($perm =~ m,^l,o) {
if ($link =~ m,(^|/)undocumented,o) {
@@ -352,29 +347,6 @@ foreach my $depproc (@{ $ginfo->direct_dependencies ($proc) }) {
for my $f (sort keys %binary) {
if (exists $manpage{$f}) {
- # X11 binary? This shouldn't happen any more; these are no longer
- # allowed.
- 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/X11R6/) {
- # ok.
- } else {
- tag 'manpage-for-x11-binary-in-wrong-directory', "$binary{$f} $manp_info->{file}";
- }
- }
- } else {
- for my $manp_info (@{$manpage{$f}}) {
- # no. manpage in X11?
- if ($manp_info->{file} =~ m/X11R6/) {
- tag 'manpage-for-non-x11-binary-in-wrong-directory', "$binary{$f} $manp_info->{file}";
- } else {
- # ok.
- }
- }
- }
-
if (not grep { $_->{lang} eq '' } @{$manpage{$f}}) {
tag 'binary-without-english-manpage', "$binary{$f}";
}
diff --git a/checks/manpages.desc b/checks/manpages.desc
index d7d1443..e9c7c3e 100644
--- a/checks/manpages.desc
+++ b/checks/manpages.desc
@@ -78,15 +78,6 @@ Certainty: certain
Info: Manual pages have to be installed compressed (using "<tt>gzip -9</tt>").
Ref: policy 12.1
-Tag: x11-games-should-be-in-usr-games
-Severity: important
-Certainty: certain
-Info: Since X11 games should be installed in <tt>/usr/games</tt> (and
- not in <tt>/usr/X11R6/bin</tt>) and the game's manual pages should be
- installed in <tt>/usr/share/man/man6</tt>, the directory
- <tt>/usr/X11R6/man/man6</tt> should be empty.
-Ref: policy 11.11
-
Tag: manpage-not-compressed-with-gzip
Severity: important
Certainty: certain
@@ -183,28 +174,6 @@ Info: This man page contains a section "POD ERRORS" generated by pod2man.
This sections lists errors in the POD syntax found by pod2man during the
generation of the man page.
-Tag: manpage-for-x11-binary-in-wrong-directory
-Severity: important
-Certainty: certain
-Info: Manual pages for binaries which are located in <tt>/usr/X11R6/bin</tt>
- should be installed below <tt>/usr/X11R6/man</tt>.
- .
- Note that normally only packages that are part of X itself and those that
- are using some arcane Imakefiles should actually install binaries into
- <tt>/usr/X11R6/bin</tt>.
-Ref: fhs usrsharemanmanualpages
-
-Tag: manpage-for-non-x11-binary-in-wrong-directory
-Severity: important
-Certainty: certain
-Info: Manual pages for binaries that are not located in <tt>/usr/X11R6/bin</tt>
- should not be installed below <tt>/usr/X11R6/man</tt>, but below
- <tt>/usr/share/man</tt>.
- .
- Note that moving a binary into <tt>/usr/X11R6/bin</tt> is almost never the
- proper solution for this problem; move the manual page instead.
-Ref: fhs usrsharemanmanualpages
-
Tag: bad-so-link-within-manual-page
Severity: important
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 1b46446..02f4865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
lintian (2.5.7) UNRELEASED; urgency=low
+ * Summary of tag changes:
+ + Removed:
+ - manpage-for-non-x11-binary-in-wrong-directory
+ - manpage-for-x11-binary-in-wrong-directory
+ - x11-games-should-be-in-usr-games
+
* checks/files:
+ [NT] Remove "manual" lazy loads of data files.
+ * checks/manpages{,.desc}:
+ + [NT] Remove old tags.
* checks/menus:
+ [NT] Remove "manual" lazy load of data file.
diff --git a/t/COVERAGE b/t/COVERAGE
index 75cebc5..33db75c 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2012-02-09
-Coverage: 792/960 (82.50%), w. legacy tests: 898/960 (93.54%)
+Last generated 2012-03-14
+Coverage: 791/958 (82.57%), w. legacy tests: 896/958 (93.53%)
The following tags are not tested by the test suite:
@@ -119,7 +119,6 @@ debconf using-question-in-extended-description-in-templates
files desktop-file-in-wrong-dir
files package-contains-devhelp-file-without-symlink
-files package-contains-hardlink
files package-contains-upstream-install-documentation
files package-installs-packlist
files script-in-usr-share-doc
@@ -225,7 +224,6 @@ binary
menu-method-should-include-menu-h
non-wm-module-in-wm-modules-menu-section
old-fsf-address-in-copyright-file
- package-contains-hardlink
package-contains-upstream-install-documentation
postinst-does-not-call-updatemenus
postrm-does-not-call-updatemenus
diff --git a/t/tests/manpages-general/debian/debian/rules b/t/tests/manpages-general/debian/debian/rules
index bb472b4..03d0f76 100755
--- a/t/tests/manpages-general/debian/debian/rules
+++ b/t/tests/manpages-general/debian/debian/rules
@@ -1,13 +1,13 @@
#!/usr/bin/make -f
-tmp = $(CURDIR)/debian/$(shell dh_listpackages)
+tmp := $(CURDIR)/debian/$(shell dh_listpackages)
%:
dh $@
override_dh_auto_install:
install -d $(tmp)/usr/share/man/man1 $(tmp)/usr/share/man/man3 \
- $(tmp)/usr/share/man/man6 $(tmp)/usr/X11R6/man/man6 \
+ $(tmp)/usr/share/man/man6 \
$(tmp)/usr/bin $(tmp)/usr/sbin $(tmp)/usr/X11R6/bin \
$(tmp)/usr/share/man/de/man1 $(tmp)/usr/X11R6/man/man1
printf '#!/bin/sh\ntrue\n' > $(tmp)/usr/bin/usr-bin-binary-alt
@@ -42,10 +42,11 @@ override_dh_auto_install:
touch $(tmp)/usr/share/man/man6/usr-games-binary.6
chmod 644 $(tmp)/usr/share/man/man6/usr-games-binary.6
gzip -1 $(tmp)/usr/share/man/man6/usr-games-binary.6
- 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
+ pod2man --section 6 simple.pod | gzip -c --best > \
+ $(tmp)/usr/share/man/man6/simple.pod.gz
+
gzip -c9 < test.1p.de \
> $(tmp)/usr/share/man/man1/test-latin1-chars.1p.gz
gzip -c9 < test.1p.de \
diff --git a/t/tests/manpages-general/debian/simple.pod b/t/tests/manpages-general/debian/simple.pod
new file mode 100644
index 0000000..822815b
--- /dev/null
+++ b/t/tests/manpages-general/debian/simple.pod
@@ -0,0 +1,18 @@
+=head1 NAME
+
+simple - some interesting manpage
+
+=head1 SYNOPSIS
+
+Explains something interesting
+
+=head1 DESCRIPTION
+
+A very long description of something very interesting. Really!
+
+=head1 AUTHORS
+
+Niels Thykier <niels@thykier.net>
+
+=cut
+
diff --git a/t/tests/manpages-general/desc b/t/tests/manpages-general/desc
index bf2f169..5fb7760 100644
--- a/t/tests/manpages-general/desc
+++ b/t/tests/manpages-general/desc
@@ -20,4 +20,3 @@ Test-For:
manpage-not-compressed-with-max-compression
manpage-section-mismatch
spelling-error-in-manpage
- x11-games-should-be-in-usr-games
diff --git a/t/tests/manpages-general/tags b/t/tests/manpages-general/tags
index e62659e..d4216b9 100644
--- a/t/tests/manpages-general/tags
+++ b/t/tests/manpages-general/tags
@@ -1,14 +1,12 @@
E: manpages-general: bad-link-to-undocumented-manpage usr/share/man/man1/sbin-binary.1.gz
-E: manpages-general: empty-manual-page usr/X11R6/man/man6/X11R6-binary.man
E: manpages-general: empty-manual-page usr/share/man/de/man1/binary-without-english-manpage.1
E: manpages-general: empty-manual-page usr/share/man/man1/usr-bin-binary-alt.1.gz
E: manpages-general: empty-manual-page usr/share/man/man1/usr-bin-binary.1
E: manpages-general: empty-manual-page usr/share/man/man1/usr-sbin-binary.1.gz
E: manpages-general: empty-manual-page usr/share/man/man6/usr-games-binary.6.gz
-E: manpages-general: manpage-has-wrong-extension usr/X11R6/man/man6/X11R6-binary.man
+E: manpages-general: manpage-has-wrong-extension usr/share/man/man6/simple.pod.gz
E: manpages-general: manpage-is-dh_make-template usr/X11R6/man/man1/rstartd.1x.gz
E: manpages-general: manpage-is-dh_make-template usr/share/man/man1/program.1.gz
-E: manpages-general: manpage-not-compressed usr/X11R6/man/man6/X11R6-binary.man
E: manpages-general: manpage-not-compressed usr/share/man/de/man1/binary-without-english-manpage.1
E: manpages-general: manpage-not-compressed usr/share/man/man1/usr-bin-binary.1
E: manpages-general: manpage-not-compressed-with-gzip usr/share/man/man1/usr-bin-binary-alt.1.gz
@@ -18,11 +16,8 @@ E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/
E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/man/
E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/
E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/rstartd.1x.gz
-E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/man/man6/
-E: manpages-general: package-installs-file-to-usr-x11r6 usr/X11R6/man/man6/X11R6-binary.man
E: manpages-general: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/
E: manpages-general: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/rstartd
-E: manpages-general: x11-games-should-be-in-usr-games usr/X11R6/man/man6/X11R6-binary.man
I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:11
I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:12
I: manpages-general: hyphen-used-as-minus-sign usr/share/man/man3/include.3.gz:13
@@ -35,7 +30,6 @@ W: manpages-general: gz-file-not-gzip usr/share/man/man1/usr-bin-binary-alt.1.gz
W: manpages-general: gz-file-not-gzip usr/share/man/man1/usr-sbin-binary.1.gz
W: manpages-general: link-to-undocumented-manpage usr/share/man/man1/bin-binary.1.gz
W: manpages-general: link-to-undocumented-manpage usr/share/man/man3/function.3.gz
-W: manpages-general: manpage-has-bad-whatis-entry usr/X11R6/man/man6/X11R6-binary.man
W: manpages-general: manpage-has-bad-whatis-entry usr/share/man/man1/usr-bin-binary-alt.1.gz
W: manpages-general: manpage-has-bad-whatis-entry usr/share/man/man1/usr-bin-binary.1
W: manpages-general: manpage-has-bad-whatis-entry usr/share/man/man1/usr-sbin-binary.1.gz
@@ -46,3 +40,4 @@ W: manpages-general: manpage-has-errors-from-pod2man usr/share/man/man1/test.1p.
W: manpages-general: manpage-has-useless-whatis-entry usr/share/man/man1/true.1.gz
W: manpages-general: manpage-locale-dir-country-specific usr/share/man/de_DE/man1/test-utf8-chars.1p.gz
W: manpages-general: manpage-section-mismatch usr/X11R6/man/man1/rstartd.1x.gz:5 1x != 1
+W: manpages-general: manpage-section-mismatch usr/share/man/man6/simple.pod.gz:127 pod != 6
diff --git a/t/tests/manpages-wrong-dir/debian/Makefile b/t/tests/manpages-wrong-dir/debian/Makefile
index d1b57af..cff6c32 100644
--- a/t/tests/manpages-wrong-dir/debian/Makefile
+++ b/t/tests/manpages-wrong-dir/debian/Makefile
@@ -1,4 +1,4 @@
-all: pecho.1.gz jecho jecho.1 zecho.1.gz
+all: pecho.1.gz zecho.1.gz
%.gz: %
gzip --best $<
@@ -6,9 +6,9 @@ all: pecho.1.gz jecho jecho.1 zecho.1.gz
%.1: %
pod2man --section 1 $< > $@
-jecho zecho: pecho
+zecho: pecho
sed s/$</$@/g $< > $@
chmod 0755 $@
clean:
- rm -f pecho.1.gz jecho jecho.1 zecho*
+ rm -f pecho.1.gz zecho*
diff --git a/t/tests/manpages-wrong-dir/debian/debian/install b/t/tests/manpages-wrong-dir/debian/debian/install
index dd2488c..ad89b63 100644
--- a/t/tests/manpages-wrong-dir/debian/debian/install
+++ b/t/tests/manpages-wrong-dir/debian/debian/install
@@ -1,5 +1,2 @@
-jecho usr/X11R6/bin
-pecho usr/bin
-pecho.1.gz usr/X11R6/man/man1/
zecho.1.gz usr/share/man
zecho.1.gz usr/share/man/man-lintian
diff --git a/t/tests/manpages-wrong-dir/debian/debian/manpages b/t/tests/manpages-wrong-dir/debian/debian/manpages
deleted file mode 100644
index 4cd11dc..0000000
--- a/t/tests/manpages-wrong-dir/debian/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-jecho.1
diff --git a/t/tests/manpages-wrong-dir/desc b/t/tests/manpages-wrong-dir/desc
index 43f138d..df76507 100644
--- a/t/tests/manpages-wrong-dir/desc
+++ b/t/tests/manpages-wrong-dir/desc
@@ -2,7 +2,4 @@ Testname: manpages-wrong-dir
Sequence: 6000
Version: 1.0
Description: Test for manpages in wrong dirs
-Test-For:
- manpage-for-non-x11-binary-in-wrong-directory
- manpage-for-x11-binary-in-wrong-directory
- manpage-in-wrong-directory
+Test-For: manpage-in-wrong-directory
diff --git a/t/tests/manpages-wrong-dir/tags b/t/tests/manpages-wrong-dir/tags
index 7a47c8c..44cd883 100644
--- a/t/tests/manpages-wrong-dir/tags
+++ b/t/tests/manpages-wrong-dir/tags
@@ -1,10 +1,2 @@
-E: manpages-wrong-dir: manpage-for-non-x11-binary-in-wrong-directory usr/bin/pecho usr/X11R6/man/man1/pecho.1.gz
-E: manpages-wrong-dir: manpage-for-x11-binary-in-wrong-directory usr/X11R6/bin/jecho usr/share/man/man1/jecho.1.gz
E: manpages-wrong-dir: manpage-in-wrong-directory usr/share/man/man-lintian/zecho.1.gz
E: manpages-wrong-dir: manpage-in-wrong-directory usr/share/man/zecho.1.gz
-E: manpages-wrong-dir: package-installs-file-to-usr-x11r6 usr/X11R6/
-E: manpages-wrong-dir: package-installs-file-to-usr-x11r6 usr/X11R6/man/
-E: manpages-wrong-dir: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/
-E: manpages-wrong-dir: package-installs-file-to-usr-x11r6 usr/X11R6/man/man1/pecho.1.gz
-E: manpages-wrong-dir: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/
-E: manpages-wrong-dir: package-installs-file-to-usr-x11r6-bin usr/X11R6/bin/jecho
--
Debian package checker
Reply to: