r66397 - in /branches/upstream/libhtml-tidy-perl/current: Changes MANIFEST META.yml Makefile.PL README README.markdown lib/HTML/Tidy.pm t/00-load.t t/version.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Dec 25 21:42:21 UTC 2010
Author: jawnsy-guest
Date: Sat Dec 25 21:42:15 2010
New Revision: 66397
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=66397
Log:
[svn-upgrade] new version libhtml-tidy-perl (1.54)
Added:
branches/upstream/libhtml-tidy-perl/current/README.markdown
Removed:
branches/upstream/libhtml-tidy-perl/current/README
Modified:
branches/upstream/libhtml-tidy-perl/current/Changes
branches/upstream/libhtml-tidy-perl/current/MANIFEST
branches/upstream/libhtml-tidy-perl/current/META.yml
branches/upstream/libhtml-tidy-perl/current/Makefile.PL
branches/upstream/libhtml-tidy-perl/current/lib/HTML/Tidy.pm
branches/upstream/libhtml-tidy-perl/current/t/00-load.t
branches/upstream/libhtml-tidy-perl/current/t/version.t
Modified: branches/upstream/libhtml-tidy-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-tidy-perl/current/Changes?rev=66397&op=diff
==============================================================================
--- branches/upstream/libhtml-tidy-perl/current/Changes (original)
+++ branches/upstream/libhtml-tidy-perl/current/Changes Sat Dec 25 21:42:15 2010
@@ -1,9 +1,23 @@
Revision history for Perl extension HTML::Tidy.
-1.52 Wed May 12 23:40:09 CDT 2010
-------------------------------------
+1.54 Fri Sep 17 00:44:36 CDT 2010
+====================================
+Please note that the bug tracker for HTML::Tidy is now at
+http://github.com/petdance/html-tidy.
+
+[FIXES]
+Fixed incorrect calls to croak(). Thanks, Steve Grazzini.
+
+[DOCUMENTATION]
+Updating all docs referring to libtidyp and Alien::Libtidyp.
+
+
+1.52 Wed May 12 2010
+=======================
+First release since the major overhaul that relies on libtidyp.
+
Now relies on Perl 5.8. I'm not at all interested in supporting
-ancient Perl versions.
+ancient Perl version.
HTML::Tidy now relies on the libtidyp that Andy Lester maintains
on github.
@@ -19,5 +33,3 @@
Fixed a segfault if there are no errors.
Allow for either "tidyp" or "HTML Tidy" as a program name in tests.
-
-
Modified: branches/upstream/libhtml-tidy-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-tidy-perl/current/MANIFEST?rev=66397&op=diff
==============================================================================
--- branches/upstream/libhtml-tidy-perl/current/MANIFEST (original)
+++ branches/upstream/libhtml-tidy-perl/current/MANIFEST Sat Dec 25 21:42:15 2010
@@ -6,7 +6,7 @@
MANIFEST
perlcriticrc
ppport.h
-README
+README.markdown
t/00-load.t
t/cfg-for-parse.cfg
t/cfg-for-parse.t
Modified: branches/upstream/libhtml-tidy-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-tidy-perl/current/META.yml?rev=66397&op=diff
==============================================================================
--- branches/upstream/libhtml-tidy-perl/current/META.yml (original)
+++ branches/upstream/libhtml-tidy-perl/current/META.yml Sat Dec 25 21:42:15 2010
@@ -1,10 +1,10 @@
--- #YAML:1.0
name: HTML-Tidy
-version: 1.52
+version: 1.54
abstract: (X)HTML validation in a Perl object
author:
- Andy Lester <andy at petdance.com>
-license: unknown
+license: artistic_2
distribution_type: module
configure_requires:
ExtUtils::MakeMaker: 0
@@ -15,8 +15,14 @@
constant: 0
Exporter: 0
overload: 0
+ perl: 5.008
Test::Builder: 0
Test::More: 0
+resources:
+ bugtracker: http://github.com/petdance/html-tidy/issues
+ homepage: http://github.com/petdance/html-tidy
+ license: http://www.opensource.org/licenses/artistic-license-2.0.php
+ Repository: http://github.com/petdance/html-tidy
no_index:
directory:
- t
Modified: branches/upstream/libhtml-tidy-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-tidy-perl/current/Makefile.PL?rev=66397&op=diff
==============================================================================
--- branches/upstream/libhtml-tidy-perl/current/Makefile.PL (original)
+++ branches/upstream/libhtml-tidy-perl/current/Makefile.PL Sat Dec 25 21:42:15 2010
@@ -15,12 +15,12 @@
eval { require Alien::Tidyp; };
if ( !$@ ) {
- print "Gonna use tidyp via Alien::Tidyp\n";
+ print "Using tidyp via Alien::Tidyp\n";
$libs = Alien::Tidyp->config('LIBS');
$inc = Alien::Tidyp->config('INC');
}
else {
- print "Alien::Tidyp not found, gonna look for tidyp on your system\n";
+ 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 );
$libs = $vars[2];
@@ -28,15 +28,15 @@
$libs = '-ltidyp';
print <<'EOF';
-It seems that you don't have libtidyp installed. HTML::Tidy does no
-real work on its own. It's just a wrapper aound libtidyp.
+It seems that you don't have tidyp installed. HTML::Tidy does no
+real work on its own. It's just a wrapper aound tidyp.
-HTML::Tidy is only tested to work with libtidyp hosted at
-http://github.com/petdance/libtidyp. This is mostly the same as the one
+HTML::Tidy is only tested to work with tidyp hosted at
+http://github.com/petdance/tidyp. This is mostly the same as the one
at http://tidy.sourceforge.net/, with some changes, such as adding a
version number so that we can tell what version we're working with.
-If you do have libtidyp installed, and I just haven't detected it,
+If you do have tidyp installed, and I just haven't detected it,
go ahead and try building. If HTML::Tidy builds and tests correctly,
then please let Andy Lester know at andy at petdance.com so that he can
fix the library detection code.
@@ -56,7 +56,7 @@
EOF
}
-WriteMakefile(
+my $parms = {
NAME => 'HTML::Tidy',
AUTHOR => 'Andy Lester <andy at petdance.com>',
VERSION_FROM => 'lib/HTML/Tidy.pm',
@@ -77,8 +77,24 @@
EXE_FILES => [qw(bin/webtidy)],
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
clean => { FILES => 'HTML-Tidy-*' },
-);
+};
+if ( $ExtUtils::MakeMaker::VERSION ge '6.45_01' ) {
+ $parms->{META_MERGE} = {
+ resources => {
+ license => 'http://www.opensource.org/licenses/artistic-license-2.0.php',
+ homepage => 'http://github.com/petdance/html-tidy',
+ bugtracker => 'http://github.com/petdance/html-tidy/issues',
+ Repository => 'http://github.com/petdance/html-tidy',
+ }
+ };
+ $parms->{LICENSE} = 'artistic_2',
+}
+if ( $ExtUtils::MakeMaker::VERSION ge '6.47_02' ) {
+ $parms->{MIN_PERL_VERSION} = 5.008;
+}
+
+WriteMakefile( %{$parms} );
sub MY::postamble {
return <<'MAKE_FRAG';
Added: branches/upstream/libhtml-tidy-perl/current/README.markdown
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-tidy-perl/current/README.markdown?rev=66397&op=file
==============================================================================
--- branches/upstream/libhtml-tidy-perl/current/README.markdown (added)
+++ branches/upstream/libhtml-tidy-perl/current/README.markdown Sat Dec 25 21:42:15 2010
@@ -1,0 +1,33 @@
+HTML::Tidy
+==========
+HTML::Tidy is an HTML checker in a handy dandy object. It's meant as
+a replacement for HTML::Lint.
+
+
+INSTALLING TIDYP
+================
+You need the tidyp library to build HTML::Tidy. If you
+haven't installed it, you can get a source distribution at
+[Github](http://github.com/petdance/tidyp/downloads).
+
+You can also try installing the CPAN module Alien::Tidyp, which
+encapsulates the tidyp installation.
+
+
+INSTALLATION
+============
+Once you have libtidyp installed, install HTML::Tidy like any standard
+Perl module.
+
+ perl Makefile.PL
+ make
+ make test
+ make install
+
+
+COPYRIGHT AND LICENSE
+=====================
+Copyright (C) 2004-2010 by Andy Lester
+
+This library is free software. It may be redistributed and modified
+under the Artistic License v2.0.
Modified: branches/upstream/libhtml-tidy-perl/current/lib/HTML/Tidy.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-tidy-perl/current/lib/HTML/Tidy.pm?rev=66397&op=diff
==============================================================================
--- branches/upstream/libhtml-tidy-perl/current/lib/HTML/Tidy.pm (original)
+++ branches/upstream/libhtml-tidy-perl/current/lib/HTML/Tidy.pm Sat Dec 25 21:42:15 2010
@@ -13,11 +13,11 @@
=head1 VERSION
-Version 1.52
-
-=cut
-
-our $VERSION = '1.52';
+Version 1.54
+
+=cut
+
+our $VERSION = '1.54';
=head1 SYNOPSIS
@@ -67,14 +67,14 @@
This configuration file will be read and used when you clean or parse an HTML file.
-You can also pass options directly to libtidyp.
+You can also pass options directly to tidyp.
my $tidy = HTML::Tidy->new( {
output_xhtml => 1,
tidy_mark => 0,
} );
-See C<tidyp -help-config> for the list of options supported by libtidyp.
+See C<tidyp -help-config> for the list of options supported by tidyp.
The following options are not supported by C<HTML::Tidy>:
@@ -117,7 +117,7 @@
$newkey =~ tr/_/-/;
if ( grep {$newkey eq $_} @unsupported_options ) {
- croak( "Unsupported option: $newkey" );
+ Carp::croak( "Unsupported option: $newkey" );
}
$self->{tidy_options}->{$newkey} = $args->{$key};
@@ -219,7 +219,7 @@
my $self = shift;
my $filename = shift;
if (@_ == 0) {
- croak('Usage: parser($filename,$str [, $str...])') ## no critic
+ Carp::croak('Usage: parser($filename,$str [, $str...])') ## no critic
}
my $html = join( '', @_ );
@@ -304,7 +304,7 @@
sub clean {
my $self = shift;
if (@_ == 0) {
- croak('Usage: clean($str [, $str...])') ## no critic
+ Carp::croak('Usage: clean($str [, $str...])') ## no critic
}
my $text = join( '', @_ );
@@ -343,13 +343,18 @@
return 1;
}
+=head2 tidyp_version()
+
=head2 libtidyp_version()
-Returns the version of the underling tidy library.
-
-=cut
-
-sub libtidyp_version {
+Returns the version of the underling tidyp library.
+
+=cut
+
+# backcompat
+sub libtidyp_version { shift->tidyp_version }
+
+sub tidyp_version {
my $version_str = _tidyp_version();
return $version_str;
@@ -362,12 +367,12 @@
__END__
-=head1 INSTALLING LIBTIDYP
-
-L<HTML::Tidy|HTML::Tidy> requires that C<libtidyp> be installed on your system.
-You can obtain libtidyp through your distribution's package manager
+=head1 INSTALLING TIDYP
+
+L<HTML::Tidy|HTML::Tidy> requires that C<tidyp> be installed on your system.
+You can obtain tidyp through your distribution's package manager
(make sure you install the development package with headers), or from
-the libtidyp website at L<http://github.com/petdance/libtidyp>.
+the tidyp Git repository at L<http://github.com/petdance/tidyp>.
=head1 CONVERTING FROM C<HTML::Lint>
@@ -377,11 +382,11 @@
=item * It's not pure Perl
-C<HTML::Tidy> is mostly a happy wrapper around libtidyp.
+C<HTML::Tidy> is mostly a happy wrapper around tidyp.
=item * The real work is done by someone else
-Changes to libtidyp may come down the pipe that I don't have control over.
+Changes to tidyp may come down the pipe that I don't have control over.
That's the price we pay for having it do a darn good job.
=item * It's no longer bundled with its C<Test::> counterpart
@@ -412,6 +417,10 @@
=over 4
+=item * HTML::Tidy's issue queue at github
+
+L<http://github.com/petdance/html-tidy/issues>
+
=item * AnnoCPAN: Annotated CPAN documentation
L<http://annocpan.org/dist/HTML-Tidy>
@@ -420,15 +429,11 @@
L<http://cpanratings.perl.org/d/HTML-Tidy>
-=item * HTML::Tidy's issue queue at github
-
-L<http://github.com/petdance/html-tidy/issues>
-
-=item * Search CPAN
+=item * search.cpan.org
L<http://search.cpan.org/dist/HTML-Tidy>
-=item * Subversion source code repository
+=item * Git source code repository
L<http://github.com/petdance/html-tidy>
@@ -446,8 +451,7 @@
Copyright (C) 2005-2010 by Andy Lester
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.1 or,
-at your option, any later version of Perl 5 you may have available.
-
-=cut
+This library is free software. You mean modify or distribute it under
+the Artistic License v2.0.
+
+=cut
Modified: branches/upstream/libhtml-tidy-perl/current/t/00-load.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-tidy-perl/current/t/00-load.t?rev=66397&op=diff
==============================================================================
--- branches/upstream/libhtml-tidy-perl/current/t/00-load.t (original)
+++ branches/upstream/libhtml-tidy-perl/current/t/00-load.t Sat Dec 25 21:42:15 2010
@@ -12,5 +12,5 @@
}
eval {
# For better test reporting
- diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $]; libtidyp " . HTML::Tidy->libtidyp_version() );
+ diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $]; tidyp " . HTML::Tidy->tidyp_version() );
}
Modified: branches/upstream/libhtml-tidy-perl/current/t/version.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-tidy-perl/current/t/version.t?rev=66397&op=diff
==============================================================================
--- branches/upstream/libhtml-tidy-perl/current/t/version.t (original)
+++ branches/upstream/libhtml-tidy-perl/current/t/version.t Sat Dec 25 21:42:15 2010
@@ -5,11 +5,12 @@
use Test::More;
BEGIN {
- plan tests => 3;
+ plan tests => 5;
use_ok( 'HTML::Tidy' );
}
-my $version_string = 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' );
+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' );
+}
More information about the Pkg-perl-cvs-commits
mailing list