debian/0000755000000000000000000000000012223632644007172 5ustar debian/patches/0000755000000000000000000000000012223631352010614 5ustar debian/patches/series0000644000000000000000000000011412223626332012027 0ustar fix-error-message-in-webtidy remove-tidy_version.patch tidy-not-tidyp.patch debian/patches/fix-error-message-in-webtidy0000644000000000000000000000071312223631145016150 0ustar Description: make webtidy error message more debianish Author: Ryan Niebur Forwarded: not-needed --- a/bin/webtidy +++ b/bin/webtidy @@ -29,7 +29,7 @@ my @lines; if ( $url =~ /^https?:/ ) { if ( !eval { require LWP::Simple; 1; } ) { - warn q{Can't retrieve URLs without LWP::Simple installed}; + warn q{Can't retrieve URLs without the libwww-perl package installed}; next; } debian/patches/tidy-not-tidyp.patch0000644000000000000000000000206712223631352014540 0ustar Description: look for and use tidy.h in /usr/include/tidy (from libtidy-dev) Author: Florian Schlichting Forwarded: not-needed --- a/Makefile.PL +++ b/Makefile.PL @@ -10,7 +10,7 @@ use Config; my $libs = '-ltidyp'; -my $inc = "-I. -I/usr/include/tidyp -I/usr/local/include/tidyp -I$Config{usrinc}/tidyp"; +my $inc = "-I. -I/usr/include/tidy -I/usr/local/include/tidy -I$Config{usrinc}/tidy"; eval { require Alien::Tidyp; }; @@ -20,8 +20,8 @@ $inc = Alien::Tidyp->config('INC'); } else { - print "Alien::Tidyp not found. Looking for for tidyp on your system.\n"; - my @vars = ExtUtils::Liblist->ext( '-L/usr/lib -L/usr/local/lib -ltidyp', 0, 1 ); + print "Alien::Tidyp not found. Looking for for tidy on your system.\n"; + my @vars = ExtUtils::Liblist->ext( '-L/usr/lib -L/usr/local/lib -ltidy', 0, 1 ); $libs = $vars[2]; if ( !$libs ) { --- a/Tidy.xs +++ b/Tidy.xs @@ -2,7 +2,7 @@ #include "perl.h" #include "XSUB.h" -#include +#include #include #include #include debian/patches/remove-tidy_version.patch0000644000000000000000000000401012223630311015633 0ustar Description: remove tidyVersion as it is a special call to Andy Lester's modified version of libtidy. Also remove the corresponding call from Perl, the documentation, and the tests. Author: gregor herrmann Reviewed-by: Jonathan Yu Origin: vendor Forwarded: not-needed --- a/Tidy.xs +++ b/Tidy.xs @@ -189,14 +189,3 @@ if ( rc < 0 ) { XSRETURN_UNDEF; } - - -SV* -_tidyp_version() - PREINIT: - const char* version; - CODE: - version = tidyVersion(); - RETVAL = newSVpv(version,0); /* will be automatically "mortalized" */ - OUTPUT: - RETVAL --- a/t/version.t +++ b/t/version.t @@ -7,7 +7,12 @@ use HTML::Tidy; +SKIP: { + skip 'libtidy_version has been removed in Debian', 4; + for my $version_string (HTML::Tidy->tidyp_version, HTML::Tidy->libtidyp_version) { like( $version_string, qr/^\d\.\d{2,}$/, 'Valid version string' ); cmp_ok( $version_string, '>=', '0.90', 'Version is greater than 0.90, which is the one I maintain' ); } + +} --- a/lib/HTML/Tidy.pm +++ b/lib/HTML/Tidy.pm @@ -341,23 +341,6 @@ return 1; } -=head2 tidyp_version() - -=head2 libtidyp_version() - -Returns the version of the underling tidyp library. - -=cut - -# backcompat -sub libtidyp_version { return shift->tidyp_version } - -sub tidyp_version { - my $version_str = _tidyp_version(); - - return $version_str; -} - require XSLoader; XSLoader::load('HTML::Tidy', $VERSION); --- a/t/00-load.t +++ b/t/00-load.t @@ -8,5 +8,5 @@ use HTML::Tidy; use HTML::Tidy::Message; -diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $]; tidyp " . HTML::Tidy->tidyp_version() ); +diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $];" ); pass( 'Modules loaded' ); --- a/bin/webtidy +++ b/bin/webtidy @@ -19,7 +19,7 @@ ) or $help = 1; if ( !@ARGV || $help ) { - print "webtidy v$HTML::Tidy::VERSION using tidyp v" . HTML::Tidy::tidyp_version() . "\n"; + print "webtidy v$HTML::Tidy::VERSION \n"; print ; exit 1; } debian/webtidy0000755000000000000000000000070511671745174010602 0ustar #!/bin/sh run(){ perl -Iblib/arch -Iblib/lib ./bin/webtidy --help } case "$1" in --help) run | sed '1 d' ;; --version) run | head -1 ;; --help2man) chmod +x $0 help2man -n "show errors in an (X)HTML document" -o $0.1 -N $0 | sed 's/DESCRIPTION/OPTIONS/' ;; --man) sh $0 --help2man man $0.1 ;; *) echo "huh?" exit 1 ;; esac debian/watch0000644000000000000000000000016012101264423010207 0ustar version=3 https://metacpan.org/release/HTML-Tidy/ .*/HTML-Tidy-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ debian/copyright0000644000000000000000000000336112223632604011124 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: HTML-Tidy Upstream-Contact: Andy Lester Source: https://metacpan.org/release/HTML-Tidy/ Files: * Copyright: 2005-2013, Andy Lester License: Artistic or GPL-1+ Files: ppport.h Copyright: 2004-2009, Marcus Holland-Moritz 2001, Paul Marquess (Version 2.x) 1999, Kenneth Albanowski (Version 1.x) License: Artistic or GPL-1+ Files: t/unicode.t Copyright: 2006 Jonathan Rockway License: Artistic or GPL-1+ Comment: This file does not have an explicit license. According to lib/HTML/Tidy.pm it is a contribution to the HTML-Tidy distribution, therefore the same license as for the rest of the module is assumed. Additionally putting code "under the same terms as Perl itself" is what the author usually does for his Perl code. Files: debian/* Copyright: 2009, Ryan Niebur 2010, Jonathan Yu 2013, Florian Schlichting License: Artistic or GPL-1+ License: Artistic This program is free software; you can redistribute it and/or modify it under the terms of the Artistic License, which comes with Perl. . On Debian systems, the complete text of the Artistic License can be found in `/usr/share/common-licenses/Artistic'. License: GPL-1+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. . On Debian systems, the complete text of version 1 of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-1'. debian/control0000644000000000000000000000243312223632566010602 0ustar Source: libhtml-tidy-perl Maintainer: Debian Perl Group Uploaders: Ryan Niebur , Jonathan Yu , Florian Schlichting Section: perl Priority: optional Build-Depends: debhelper (>= 9.20120312), help2man, libtidy-dev, libtest-pod-perl, libtest-pod-coverage-perl, perl (>= 5.13.11) | libtest-more-perl (>= 0.98), perl Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libhtml-tidy-perl.git Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libhtml-tidy-perl.git Homepage: https://metacpan.org/release/HTML-Tidy/ Package: libhtml-tidy-perl Architecture: any Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} Suggests: libwww-perl Description: module for (X)HTML validation HTML::Tidy is a Perl module useful for performing cleanup and providing basic validation of input. It is based on Perl bindings to the HTML Tidy Project, also known as libtidy; for details, see: . . This module is intended to replace HTML::Lint and includes documentation for easing the migration from that module. debian/compat0000644000000000000000000000000212223632415010364 0ustar 9 debian/changelog0000644000000000000000000000364312223632644011052 0ustar libhtml-tidy-perl (1.56-1) unstable; urgency=low [ Jonathan Yu ] * New upstream release (1.54) [ Ansgar Burchardt ] * debian/control: Convert Vcs-* fields to Git. [ gregor herrmann ] * debian/control: update {versioned,alternative} (build) dependencies. [ Salvatore Bonaccorso ] * Change Vcs-Git to canonical URI (git://anonscm.debian.org) * Change search.cpan.org based URIs to metacpan.org based URIs [ Axel Beckert ] * debian/copyright: migrate pre-1.0 format to 1.0 using "cme fix dpkg- copyright" [ Florian Schlichting ] * Import Upstream version 1.56 * Refresh patches * Add new tidy-not-tidyp.patch * Bump years of upstream copyright * Update stand-alone license paragraphs to commonly used version (not limiting Debian to GNU/Linux, directly linking to GPL-1) * Add build-dependency on Test::More 0.98 * Switch to source format 3.0 (quilt) * Sort build-dependencies * Switch dh compatibility to level 9 to enable passing of hardening flags * Declare compliance with Debian Policy 3.9.4 * Add myself to uploaders and copyright -- Florian Schlichting Fri, 04 Oct 2013 23:39:39 +0200 libhtml-tidy-perl (1.50-1) unstable; urgency=low [ Jonathan Yu ] * New upstream release * Standards-Version 3.8.4 (no changes) * Rewrite control description * Add myself to Uploaders and Copyright * Remove fix-segfault patch, it has been applied upstream * Add a patch to remove dependency on modified libtidy [ Nathan Handler ] * debian/watch: Update to ignore development releases. [ Ryan Niebur ] * Update ryan52's email address [ gregor herrmann ] * debian/copyright: update formatting and years of upstream copyright. -- Jonathan Yu Sat, 20 Feb 2010 09:50:30 -0500 libhtml-tidy-perl (1.08-1) unstable; urgency=low * Initial Release. (Closes: #531138) -- Ryan Niebur Tue, 02 Jun 2009 21:15:36 -0700 debian/source/0000755000000000000000000000000012223624463010472 5ustar debian/source/format0000644000000000000000000000001412223624463011700 0ustar 3.0 (quilt) debian/rules0000755000000000000000000000023312223632147010246 0ustar #!/usr/bin/make -f debian/webtidy.1: sh ./debian/webtidy --help2man override_dh_installman: debian/webtidy.1 dh_installman debian/webtidy.1 %: dh $@ debian/clean0000644000000000000000000000002111671745174010201 0ustar debian/webtidy.1