[SCM] Debian package checker branch, master, updated. 2.5.14-82-g11df701
The following commit has been merged in the master branch:
commit 11df70141dfb8fc64e8d9c534b29e1329162e867
Author: Niels Thykier <niels@thykier.net>
Date: Mon Jul 22 14:15:21 2013 +0200
c/manpages.pm: Skip some checks on empty manpages
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/manpages.pm b/checks/manpages.pm
index ebe7558..d2099b5 100644
--- a/checks/manpages.pm
+++ b/checks/manpages.pm
@@ -179,6 +179,7 @@ foreach my $file ($info->sorted_index) {
unless ($first) {
tag 'empty-manual-page', $file;
+ next;
} elsif ($first =~ /^\.so\s+(.+)?$/) {
my $dest = $1;
if ($dest =~ m,^([^/]+)/(.+)$,) {
diff --git a/debian/changelog b/debian/changelog
index ede476b..5e484de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ lintian (2.5.15) UNRELEASED; urgency=low
+ [NT] Apply patch from Bastien Roucariès to test for
manpages named after their build path.
(Closes: #713884)
+ + [NT] Skip some checks on empty manpages.
+ (Closes: #700502)
* checks/phppear.{desc,pm}:
+ [NT] New check based on patches from Mathieu Parent.
(Closes: #708551)
diff --git a/t/tests/manpages-general/debian/debian/rules b/t/tests/manpages-general/debian/debian/rules
index 2dd7774..20d4e3c 100755
--- a/t/tests/manpages-general/debian/debian/rules
+++ b/t/tests/manpages-general/debian/debian/rules
@@ -33,8 +33,8 @@ override_dh_auto_install:
ln -s undocumented.7.gz $(tmp)/usr/share/man/man1/sbin-binary.1.gz
ln -s undocumented.3.gz $(tmp)/usr/share/man/man3/function.3.gz
- touch $(tmp)/usr/share/man/man1/usr-bin-binary.1
- chmod 644 $(tmp)/usr/share/man/man1/usr-bin-binary.1
+ install -m 0644 usr-bin-binary.1 \
+ $(tmp)/usr/share/man/man1/usr-bin-binary.1
touch $(tmp)/usr/share/man/man1/usr-sbin-binary.1.gz
chmod 644 $(tmp)/usr/share/man/man1/usr-sbin-binary.1.gz
cd $(tmp)/usr/share/man/man1 \
diff --git a/t/tests/manpages-general/debian/usr-bin-binary.1 b/t/tests/manpages-general/debian/usr-bin-binary.1
new file mode 100644
index 0000000..dc553f4
--- /dev/null
+++ b/t/tests/manpages-general/debian/usr-bin-binary.1
@@ -0,0 +1,3 @@
+.TH PROGRAM 1 "2013-07-22"
+.SH NAME
+usr-bin-binary
diff --git a/t/tests/manpages-general/tags b/t/tests/manpages-general/tags
index 5e3e3df..fd0b28a 100644
--- a/t/tests/manpages-general/tags
+++ b/t/tests/manpages-general/tags
@@ -2,7 +2,6 @@ E: manpages-general: bad-link-to-undocumented-manpage usr/share/man/man1/sbin-bi
E: manpages-general: bad-so-link-within-manual-page usr/share/man/man1/bad-so.1.gz
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/share/man/man6/simple.pod.gz
@@ -34,10 +33,7 @@ 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/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
-W: manpages-general: manpage-has-bad-whatis-entry usr/share/man/man6/usr-games-binary.6.gz
W: manpages-general: manpage-has-errors-from-man usr/share/man/man1/test.1p.gz 14: warning: macro `dep' not defined (possibly missing space after `de')
W: manpages-general: manpage-has-errors-from-man usr/share/man/man3/included.3.gz 6: warning: macro `zY' not defined
W: manpages-general: manpage-has-errors-from-pod2man usr/share/man/man1/test.1p.gz:19
--
Debian package checker
Reply to: