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

[SCM] Debian package checker branch, master, updated. 2.2.14-1-g84258ee



The following commit has been merged in the master branch:
commit 84258eea287c7f5a9574f46b8f392e598933ada2
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Wed Aug 26 21:16:35 2009 +0100

    Don't complain about overly long HTTPS URLs in manpages
    
    * checks/manpages:
      + [ADB] Add HTTPS to the list of recognised protocols for URLs in manpages
        which should not cause manpage-has-errors-from-man to be emitted.
        (Closes: #543641)

diff --git a/checks/manpages b/checks/manpages
index 2884b90..2a0d3f0 100644
--- a/checks/manpages
+++ b/checks/manpages
@@ -262,7 +262,7 @@ foreach my $file (sort keys %{$info->index}) {
 	    }
 	    # ignore wrapping failures if they contain URLs
 	    next if /:(\d+): warning \[.*\]: (can\'t break|cannot adjust) line/
-		and $manfile[$1 - 1] =~ m,(?:http|ftp)://.+,i;
+		and $manfile[$1 - 1] =~ m,(?:https?|ftp)://.+,i;
 	    # ignore common undefined macros from pod2man << Perl 5.10
 	    next if /warning: \`(Tr|IX)\' not defined/;
 	    chomp;
diff --git a/debian/changelog b/debian/changelog
index 4f7d70f..a7fc02f 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lintian (2.2.15) UNRELEASED; urgency=low
+
+  * checks/manpages:
+    + [ADB] Add HTTPS to the list of recognised protocols for URLs in manpages
+      which should not cause manpage-has-errors-from-man to be emitted.
+      (Closes: #543641)
+
+ -- Adam D. Barratt <adam@adam-barratt.org.uk>  Wed, 26 Aug 2009 21:13:12 +0100
+
 lintian (2.2.14) unstable; urgency=low
 
   The "Policy 3.8.3" release.
diff --git a/t/tests/manpages-general/debian/debian/rules b/t/tests/manpages-general/debian/debian/rules
index ced9e29..bb472b4 100755
--- a/t/tests/manpages-general/debian/debian/rules
+++ b/t/tests/manpages-general/debian/debian/rules
@@ -21,6 +21,7 @@ override_dh_auto_install:
 	chmod 755 $(tmp)/usr/bin/binary-without-english-manpage
 
 	gzip -c9 < test.1p > $(tmp)/usr/share/man/man1/test.1p.gz
+	gzip -c9 < test.3p > $(tmp)/usr/share/man/man3/test.3p.gz
 	gzip -c9 < true.1 > $(tmp)/usr/share/man/man1/true.1.gz
 	gzip -c9 < program.1 > $(tmp)/usr/share/man/man1/program.1.gz
 
diff --git a/t/tests/manpages-general/debian/test.3p b/t/tests/manpages-general/debian/test.3p
new file mode 100644
index 0000000..b2067a0
--- /dev/null
+++ b/t/tests/manpages-general/debian/test.3p
@@ -0,0 +1,11 @@
+.IX Title "TEST 3"
+.TH TEST 3P "2009-08-26" "Debian Project" "Debian GNU/Linux manual"
+.SH "NAME"
+\&\fBTEST\fR \- A test manpage with a .3P extension.
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+.PP
+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

-- 
Debian package checker


Reply to: