[SCM] Debian packaging of w3c-linkchecker branch, master, updated. 576cdf19d24f8a9b1042ae069a64fad25c3577bf
Nicholas Bamber
nicholas at periapt.co.uk
Wed Oct 19 23:27:58 UTC 2011
The following commit has been merged in the master branch:
commit d80aea26c93156d22d98937d95dab2022ea8aefc
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date: Wed Oct 19 08:44:09 2011 +0100
* New uptream release
* Added override for dh_pysupport to silence false warning
* Added lintian override concerning DEP-5 format
* Raised compat level and debhelper version to 8
diff --git a/META.yml b/META.yml
index 3b824d7..c233fcb 100644
--- a/META.yml
+++ b/META.yml
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: W3C-LinkChecker
-version: 4.8
+version: 4.81
abstract: W3C Link Checker
author:
- W3C QA-dev Team <public-qa-dev at w3.org>
diff --git a/NEWS b/NEWS
index dc6e4bd..f112392 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
This document contains information about high level changes between
Link Checker releases.
+Version 4.81 - 2011-10-16
+- Work around some <base> related problems (#12720, rt.cpan.org#54361).
+- Eliminate some warnings (emitted by code, not from results).
+
Version 4.8 - 2011-04-02
- Avoid some robot delays by improving the order in which links are checked.
- Avoid some unnecessary HEAD requests in recursive mode.
diff --git a/SIGNATURE b/SIGNATURE
index 47a608a..fed6bf9 100644
--- a/SIGNATURE
+++ b/SIGNATURE
@@ -1,5 +1,5 @@
This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.64.
+signed via the Module::Signature module, version 0.68.
To verify the content in this distribution, first make sure you have
Module::Signature installed, then type:
@@ -15,11 +15,11 @@ not run its Makefile.PL or Build.PL.
Hash: SHA1
SHA1 b075772a968f5694bfbb4ce33eadf26566a25f47 MANIFEST
-SHA1 2c2e46c15a894e6fdb6360a96d3e46fef368ea13 META.yml
+SHA1 e8175087619cebc9d0e0ead8ca06b9d8ee73b678 META.yml
SHA1 ab9150095a45776c2020e5781d19054c7018da8b Makefile.PL
-SHA1 0e45d552ca655a7aa616b5580fe26360194c7b25 NEWS
+SHA1 05b3e35c8352063f2c99efa9cd3881c208fa1bb0 NEWS
SHA1 f1f868ea73db7d39ab491ebb50c84de76cce4b44 README
-SHA1 75b87d400f5656fa36865cbb8638ae761ef8a045 bin/checklink
+SHA1 619d90efc63090552be8926418d69a0364989501 bin/checklink
SHA1 4406433ae670dd4f7be3f2c76d55aefb239e9bc9 bin/checklink.pod
SHA1 b188063249c820f0aa5a34b5f735e8f334a536e1 docs/checklink.html
SHA1 fa101fed018fc8e41beca63a0a667fb94c10a557 docs/linkchecker.css
@@ -38,16 +38,16 @@ SHA1 1631ed7d5b20c2c036e61225854134f0674cb10a images/no_w3c.png
SHA1 401b5fba02d0d8484775a4a77503fa0d136b96ce images/round-br.png
SHA1 9eb1ee6188391715284a3db080e6e92d163864d9 images/round-tr.png
SHA1 cc01bd358bc1d6d42ca350ad0a4a42778ca4440e images/textbg.png
-SHA1 993d4a54cd4a6672afeaa938d15cd9154f94aa44 lib/W3C/LinkChecker.pm
+SHA1 7587466f1487eb446fe5da1a70d445e7b33efd36 lib/W3C/LinkChecker.pm
SHA1 962ba9fff082c4087239b55618ada2a8f1564464 t/00compile.t
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
-iQEVAwUBTZdffId580Rxl2NsAQIQgwf/VFvg4vg7KvODiSA5vkfmGJU56Pr9Oxbq
-MCkmCpWfVHo3i4Dzxz7QTubELk6nksKHaoUfVdDCmgRaG9XNVZBb59WCPzedFYsS
-7BoUpzB0u580fOfBO0FhxbEIfEVoGplFN/9BTMBHzJxO/fSRNwHnqsZ1nn1yeCN4
-j23yqibBQapFnd8NFyNHSEzTDEsqtV7cLLYljJlljYP5au2IChaV3hAJ3gsRs0OL
-KVLGGoPQSHR/MhxzIWfituh8MwB4ttjZ5Z0AQibiUfcCfxBA+rgrsT61rquLJOmk
-wUQQHXZVBj9xXdB7fbbezi44+kqOf4U2GTgmNr1quexHm1W24YPd9w==
-=yFBd
+iQEVAwUBTpqXHId580Rxl2NsAQJqPAf/XrqTWrlZa9DFkWrnOSxIYsyDGPl14fCl
+ohGFL7jBYxdKndEHo2aA7bA95EOypZVxakUIFcizpC5ujbrqasGPEnxinhJQYLqA
+S+4G+yzen3DqbbLndd5eIWVLPS5992gXwuLaeZrNFlGv/kG892NSLGfu3JQiePlc
+jNNUZ4dvwe+MHSSvs3DEkAPJqeIR7bx55tp+O7n5HX3ab/sqYIaqI2V3tXP/EHFy
+PA/Ig9QFQmfB7SY3TFN7iUFuIDRqIQOzC/Ij/WqY1Uj9885zZJvq0GWT/huFvyVG
+IGFM+sZp8gr6fr/bkB7de5xCoVUpkCz+mFkIJFQCu1cwJcP9pa81+g==
+=W5f6
-----END PGP SIGNATURE-----
diff --git a/bin/checklink b/bin/checklink
index f514e2b..86fd502 100755
--- a/bin/checklink
+++ b/bin/checklink
@@ -238,6 +238,7 @@ use constant LINK_ATTRS => {
a => ['href'],
# base/@href intentionally not checked
+ # http://www.w3.org/mid/200802091439.27764.ville.skytta%40iki.fi
area => ['href'],
audio => ['src'],
blockquote => ['cite'],
@@ -294,7 +295,7 @@ BEGIN {
# Version info
$PACKAGE = 'W3C Link Checker';
$PROGRAM = 'W3C-checklink';
- $VERSION = '4.8';
+ $VERSION = '4.81';
$REVISION = sprintf('version %s (c) 1999-2011 W3C', $VERSION);
$AGENT = sprintf(
'%s/%s %s',
@@ -1180,8 +1181,8 @@ EOF
$processed{$response->{absolute_uri}} = 1;
# Parse the document
- my $p = &parse_document($uri, $response->{absolute_uri},
- $response, 1, ($depth != 0));
+ my $p =
+ &parse_document($uri, $response->base(), $response, 1, ($depth != 0));
my $base = URI->new($p->{base});
# Check anchors
@@ -1235,9 +1236,10 @@ EOF
my $fragment = $canon_uri->fragment(undef);
if (!defined($Opts{Exclude}) || $canon_uri !~ $Opts{Exclude}) {
if (!exists($links{$canon_uri})) {
- my $hostport =
- $canon_uri->can('host_port') ? $canon_uri->host_port() :
- '';
+ my $hostport;
+ $hostport = $canon_uri->host_port()
+ if $canon_uri->can('host_port');
+ $hostport = '' unless defined $hostport;
push(@{$hostlinks{$hostport}}, $canon_uri);
}
for my $line_num (keys(%$lines)) {
@@ -1301,22 +1303,22 @@ EOF
# List the broken fragments
while (my ($fragment, $lines) = each(%{$ulinks->{fragments}})) {
+
+ my $fragment_ok = $results{$u}{fragments}{$fragment};
+
if ($Opts{Verbose}) {
my @line_nums = sort { $a <=> $b } keys(%$lines);
&hprintf(
"\t\t%s %s - Line%s: %s\n",
$fragment,
- ($results{$u}{fragments}{$fragment}) ? 'OK' :
- 'Not found',
- (scalar(@line_nums) > 1) ? 's' : '',
+ $fragment_ok ? 'OK' : 'Not found',
+ (scalar(@line_nums) > 1) ? 's' : '',
join(', ', @line_nums)
);
}
# A broken fragment?
- if ($results{$u}{fragments}{$fragment} == 0) {
- $broken{$u}{fragments}{$fragment} += 2;
- }
+ $broken{$u}{fragments}{$fragment} += 2 unless $fragment_ok;
}
}
elsif (!($Opts{Quiet} && &informational($results{$u}{location}{code})))
@@ -2032,8 +2034,19 @@ sub start
my $tag_local_base = undef;
+ # Special case: base/@href
+ # @@@TODO: The reason for handling <base href> ourselves is that LWP's
+ # head parsing magic fails at least for responses that have
+ # Content-Encodings: https://rt.cpan.org/Ticket/Display.html?id=54361
+ if ($tag eq 'base') {
+
+ # Ignore <base> with missing/empty href.
+ $self->{base} = $attr->{href}
+ if (defined($attr->{href}) && length($attr->{href}));
+ }
+
# Special case: meta[@http-equiv=Refresh]/@content
- if ($tag eq 'meta') {
+ elsif ($tag eq 'meta') {
if ($attr->{'http-equiv'} &&
lc($attr->{'http-equiv'}) eq 'refresh')
{
diff --git a/debian/changelog b/debian/changelog
index bae3176..a7c81e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-w3c-linkchecker (4.8-3) UNRELEASED; urgency=low
+w3c-linkchecker (4.81-1) UNRELEASED; urgency=low
[ Ansgar Burchardt ]
* debian/control: Convert Vcs-* fields to Git.
@@ -7,7 +7,13 @@ w3c-linkchecker (4.8-3) UNRELEASED; urgency=low
* debian/copyright: Replace DEP5 Format-Specification URL from
svn.debian.org to anonscm.debian.org URL.
- -- Ansgar Burchardt <ansgar at debian.org> Wed, 27 Jul 2011 18:49:56 +0200
+ [ Nicholas Bamber ]
+ * New uptream release
+ * Added override for dh_pysupport to silence false warning
+ * Added lintian override concerning DEP-5 format
+ * Raised compat level and debhelper version to 8
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk> Wed, 19 Oct 2011 08:28:43 +0100
w3c-linkchecker (4.8-2) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 8fa5e53..e447333 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: w3c-linkchecker
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 8)
Build-Depends-Indep: perl, libcss-dom-perl, po-debconf, libhtml-parser-perl,
libwww-perl (>= 5.833), liburi-perl (>= 1.53), libencode-locale-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
diff --git a/debian/rules b/debian/rules
index d9570d1..cf5704a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,3 +17,6 @@ override_dh_auto_clean:
override_dh_installchangelogs:
dh_installchangelogs NEWS
+# silence irrelevant python warning
+override_dh_pysupport:
+
diff --git a/lib/W3C/LinkChecker.pm b/lib/W3C/LinkChecker.pm
index f651e66..8ce8699 100644
--- a/lib/W3C/LinkChecker.pm
+++ b/lib/W3C/LinkChecker.pm
@@ -2,5 +2,5 @@
package W3C::LinkChecker;
use strict;
use vars qw($VERSION);
-$VERSION = "4.8";
+$VERSION = "4.81";
1;
--
Debian packaging of w3c-linkchecker
More information about the Pkg-perl-cvs-commits
mailing list