[SCM] Debian package checker branch, master, updated. 2.2.17-27-g51b4691
The following commit has been merged in the master branch:
commit 51b4691e72f44d2fc7233e317314af5f376529df
Author: Russ Allbery <rra@debian.org>
Date: Thu Nov 12 13:14:09 2009 -0800
Suppress man line break errors for .UE macros
* checks/manpages.desc:
+ [RA] Also suppress failures to break lines if the reported line is
a .UE macro, which marks the end of a block defining a URL. Thanks,
Martin Stigge.
diff --git a/checks/manpages b/checks/manpages
index 51b637c..261920f 100644
--- a/checks/manpages
+++ b/checks/manpages
@@ -260,9 +260,11 @@ foreach my $file (sort keys %{$info->index}) {
next if /warning \[.*\]: cannot adjust line/;
next if /warning \[.*\]: can\'t break line/;
}
- # ignore wrapping failures if they contain URLs
+ # ignore wrapping failures if they contain URLs (.UE is an
+ # extension for marking the end of a URL).
next if /:(\d+): warning \[.*\]: (can\'t break|cannot adjust) line/
- and $manfile[$1 - 1] =~ m,(?:https?|ftp)://.+,i;
+ and ( $manfile[$1 - 1] =~ m,(?:https?|ftp)://.+,i
+ or $manfile[$1 - 1] =~ m,^\s*\.\s*UE\b,);
# ignore common undefined macros from pod2man << Perl 5.10
next if /warning: (?:macro )?\`(Tr|IX)\' not defined/;
chomp;
diff --git a/debian/changelog b/debian/changelog
index b0e75c2..7b8f99f 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,9 @@ lintian (2.2.18) UNRELEASED; urgency=low
+ [ADB] Mention in the description for manpage-has-errors-from-man
that Lintian passes "-E UTF-8" to man when running checks. Thanks,
Raphaël Hertzog. (Closes: #555320)
+ + [RA] Also suppress failures to break lines if the reported line is
+ a .UE macro, which marks the end of a block defining a URL. Thanks,
+ Martin Stigge.
* checks/scripts.desc:
+ [RA] Add some more details to executable-not-elf-or-script about
possible causes and how to correct them.
diff --git a/t/tests/manpages-general/debian/test.3p b/t/tests/manpages-general/debian/test.3p
index b2067a0..c8a8680 100644
--- a/t/tests/manpages-general/debian/test.3p
+++ b/t/tests/manpages-general/debian/test.3p
@@ -9,3 +9,8 @@ Use more up-level tools like human brains to understand lintian.
.PP
.nh
https://example.org/really/long/url/that/cannot/be/wrapped/and/will/produce/errors/from/man
+.\" URL extension, copied from wmweather+. Should not be tagged as too
+.\" long of a line.
+.UR http://weather.noaa.gov/pub/data/observations/metar/stations/
+http://weather.noaa.gov/pub/data/observations/metar/stations/
+.UE
--
Debian package checker
Reply to: