r73824 - in /trunk/libxml-parser-perl: ./ Expat/ Parser/Encodings/ Parser/Style/ debian/ inc/ samples/ t/
periapt-guest at users.alioth.debian.org
periapt-guest at users.alioth.debian.org
Fri Apr 29 10:16:10 UTC 2011
Author: periapt-guest
Date: Fri Apr 29 10:15:41 2011
New Revision: 73824
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=73824
Log:
New upstream release
Added:
trunk/libxml-parser-perl/Parser/Encodings/ibm866.enc
- copied unchanged from r73823, branches/upstream/libxml-parser-perl/current/Parser/Encodings/ibm866.enc
trunk/libxml-parser-perl/Parser/Encodings/koi8-r.enc
- copied unchanged from r73823, branches/upstream/libxml-parser-perl/current/Parser/Encodings/koi8-r.enc
trunk/libxml-parser-perl/Parser/Encodings/windows-1251.enc
- copied unchanged from r73823, branches/upstream/libxml-parser-perl/current/Parser/Encodings/windows-1251.enc
trunk/libxml-parser-perl/Parser/Encodings/windows-1255.enc
- copied unchanged from r73823, branches/upstream/libxml-parser-perl/current/Parser/Encodings/windows-1255.enc
trunk/libxml-parser-perl/inc/
- copied from r73823, branches/upstream/libxml-parser-perl/current/inc/
Modified:
trunk/libxml-parser-perl/Changes
trunk/libxml-parser-perl/Expat/Expat.pm
trunk/libxml-parser-perl/Expat/Expat.xs
trunk/libxml-parser-perl/MANIFEST
trunk/libxml-parser-perl/META.yml
trunk/libxml-parser-perl/Makefile.PL
trunk/libxml-parser-perl/Parser.pm
trunk/libxml-parser-perl/Parser/Encodings/README
trunk/libxml-parser-perl/Parser/Encodings/iso-8859-7.enc
trunk/libxml-parser-perl/Parser/Style/Debug.pm
trunk/libxml-parser-perl/Parser/Style/Objects.pm
trunk/libxml-parser-perl/Parser/Style/Stream.pm
trunk/libxml-parser-perl/Parser/Style/Subs.pm
trunk/libxml-parser-perl/Parser/Style/Tree.pm
trunk/libxml-parser-perl/README
trunk/libxml-parser-perl/debian/changelog
trunk/libxml-parser-perl/samples/canonical
trunk/libxml-parser-perl/samples/xmlcomments
trunk/libxml-parser-perl/samples/xmlfilter
trunk/libxml-parser-perl/samples/xmlstats
trunk/libxml-parser-perl/t/encoding.t
Modified: trunk/libxml-parser-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Changes?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Changes (original)
+++ trunk/libxml-parser-perl/Changes Fri Apr 29 10:15:41 2011
@@ -1,9 +1,17 @@
Revision history for Perl extension XML::Parser.
+
+2.40 2010-09-16 (by Alexandr Ciornii)
+ - Add windows-1251.enc, ibm866.enc, koi8-r.enc (Russian)
+ - Add windows-1255.enc (Hebrew)
+ - Update iso-8859-7.enc (RT#40712)
+ - Use Devel::CheckLib
+ - Better description of expat packages
+ - Better Perl style in both code and docs
2.36
- Fix for Carp::Heavy bugs
-2.35
+2.35 (mostly by Alexandr Ciornii)
- Works in 5.10 (Andreas J. Koenig)
- Added license in Makefile.PL (Alexandr Ciornii)
- Makefile.PL also searches for expat in C:/lib/Expat-2.0.0 (Alexandr Ciornii)
Modified: trunk/libxml-parser-perl/Expat/Expat.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Expat/Expat.pm?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Expat/Expat.pm (original)
+++ trunk/libxml-parser-perl/Expat/Expat.pm Fri Apr 29 10:15:41 2011
@@ -10,7 +10,7 @@
require DynaLoader;
@ISA = qw(DynaLoader);
-$VERSION = "2.36" ;
+$VERSION = "2.40";
$have_File_Spec = $INC{'File/Spec.pm'} || do 'File/Spec.pm';
@@ -495,7 +495,8 @@
}
################################################################
-package XML::Parser::ContentModel;
+package #hide from PAUSE
+ XML::Parser::ContentModel;
use overload '""' => \&asString, 'eq' => \&thiseq;
sub EMPTY () {1}
@@ -582,7 +583,8 @@
}
################################################################
-package XML::Parser::ExpatNB;
+package #hide from PAUSE
+ XML::Parser::ExpatNB;
use vars qw(@ISA);
use Carp;
@@ -648,7 +650,8 @@
################################################################
-package XML::Parser::Encinfo;
+package #hide from PAUSE
+ XML::Parser::Encinfo;
sub DESTROY {
my $self = shift;
@@ -667,11 +670,11 @@
use XML::Parser::Expat;
- $parser = new XML::Parser::Expat;
+ $parser = XML::Parser::Expat->new;
$parser->setHandlers('Start' => \&sh,
'End' => \&eh,
'Char' => \&ch);
- open(FOO, 'info.xml') or die "Couldn't open";
+ open(FOO, '<', 'info.xml') or die "Couldn't open";
$parser->parse(*FOO);
close(FOO);
# $parser->parse('<foo id="me"> here <em>we</em> go </foo>');
Modified: trunk/libxml-parser-perl/Expat/Expat.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Expat/Expat.xs?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Expat/Expat.xs (original)
+++ trunk/libxml-parser-perl/Expat/Expat.xs Fri Apr 29 10:15:41 2011
@@ -291,6 +291,7 @@
char * linebuff;
STRLEN lblen;
STRLEN br = 0;
+ int buffsize;
int done = 0;
int ret = 1;
char * msg = NULL;
@@ -335,27 +336,33 @@
}
PUTBACK ;
+ buffsize = lblen;
done = lblen == 0;
}
else {
tbuff = newSV(0);
tsiz = newSViv(BUFSIZE);
+ buffsize = BUFSIZE;
}
while (! done)
{
- char *buffer, *tb;
+ char *buffer = XML_GetBuffer(parser, buffsize);
+
+ if (! buffer)
+ croak("Ran out of memory for input buffer");
SAVETMPS;
if (cbv->delim) {
- tb = linebuff;
+ Copy(linebuff, buffer, lblen, char);
br = lblen;
done = 1;
}
else {
int cnt;
SV * rdres;
+ char * tb;
PUSHMARK(SP);
EXTEND(SP, 3);
@@ -377,21 +384,13 @@
croak("read error");
tb = SvPV(tbuff, br);
- /* br == number of bytes read from stream
- Note that it is possible that br > BUFSIZE if the input stream
- is decoding a non-ASCII source. */
- if (br <= 0)
+ if (br > 0)
+ Copy(tb, buffer, br, char);
+ else
done = 1;
PUTBACK ;
}
-
- buffer = XML_GetBuffer(parser, br);
- if (! buffer)
- croak("Ran out of memory for input buffer");
-
- if (br > 0)
- Copy(tb, buffer, br, char);
ret = XML_ParseBuffer(parser, br, done);
@@ -496,7 +495,7 @@
}
}
- if (cbv->st_serial_stackptr + 1 >= cbv->st_serial_stacksize) {
+ if (cbv->st_serial_stackptr >= cbv->st_serial_stacksize) {
unsigned int newsize = cbv->st_serial_stacksize + 512;
Renew(cbv->st_serial_stack, newsize, unsigned int);
Modified: trunk/libxml-parser-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/MANIFEST?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/MANIFEST (original)
+++ trunk/libxml-parser-perl/MANIFEST Fri Apr 29 10:15:41 2011
@@ -1,60 +1,65 @@
-Changes Change log
-Expat/Expat.pm XML::Parser::Expat module
-Expat/Expat.xs Extension library
-Expat/Makefile.PL perl MakeMaker script for XML::Parser::Expat
-Expat/encoding.h Header file; describes *.enc structure
-Expat/typemap XS typemap
-MANIFEST This file
-Makefile.PL perl MakeMaker script for XML::Parser
-Parser.pm XML::Parser module
-Parser/LWPExternEnt.pl LWP based external entity handler
-Parser/Encodings/Japanese_Encodings.msg Message about Japanese encodings.
-Parser/Encodings/README Info about encoding maps
-Parser/Encodings/big5.enc Big5 binary encoding map
-Parser/Encodings/euc-kr.enc EUC-KR binary encoding map
-Parser/Encodings/iso-8859-2.enc ISO-8859-2 binary encoding map
-Parser/Encodings/iso-8859-3.enc ISO-8859-3 binary encoding map
-Parser/Encodings/iso-8859-4.enc ISO-8859-4 binary encoding map
-Parser/Encodings/iso-8859-5.enc ISO-8859-5 binary encoding map
-Parser/Encodings/iso-8859-7.enc ISO-8859-7 binary encoding map
-Parser/Encodings/iso-8859-8.enc ISO-8859-8 binary encoding map
-Parser/Encodings/iso-8859-9.enc ISO-8859-9 binary encoding map
-Parser/Encodings/windows-1250.enc cp1250-WinLatin2 binary encoding map
-Parser/Encodings/windows-1252.enc cp1252-WinLatin1 binary encoding map
-Parser/Encodings/x-euc-jp-jisx0221.enc X-euc-jp-jisx0221 encoding map
-Parser/Encodings/x-euc-jp-unicode.enc X-euc-jp-unicde encoding map
-Parser/Encodings/x-sjis-cp932.enc x-sjis-cp932 encoding map
-Parser/Encodings/x-sjis-jdk117.enc x-sjis-jdk117 encoding map
-Parser/Encodings/x-sjis-jisx0221.enc x-sjis-jisx0221 encoding map
-Parser/Encodings/x-sjis-unicode.enc x-sjis-unicode encoding map
-Parser/Style/Debug.pm Debug style parser
-Parser/Style/Objects.pm Objects style parser
-Parser/Style/Stream.pm Stream style parser
-Parser/Style/Subs.pm Subs style parser
-Parser/Style/Tree.pm Tree style parser
-README Short explanation
-samples/canonical A utility to generate canonical XML
-samples/canontst.xml An xml document to demonstrate canonical
-samples/ctest.dtd An external DTD used by canontst.xml
-samples/REC-xml-19980210.xml The XML spec in xml form
-samples/xmlcomments A utility to extract comments
-samples/xmlfilter A utility to filter elements
-samples/xmlstats A utility to report on element statistics
-t/astress.t Test script
-t/cdata.t Test script
-t/decl.t Test script
-t/defaulted.t Test script
-t/encoding.t Test script
-t/external_ent.t Test script
-t/file.t Test script
-t/finish.t Test script
-t/ext.ent External entity for parament.t test
-t/ext2.ent External entity for parament.t test
-t/foo.dtd External DTD for parament.t test
-t/namespaces.t Test script
-t/parament.t Test script
-t/partial.t Test script
-t/skip.t Test script
-t/stream.t Test script
-t/styles.t Test script
+inc/Devel/CheckLib.pm
+Changes Change log
+Expat/Expat.pm XML::Parser::Expat module
+Expat/Expat.xs Extension library
+Expat/Makefile.PL perl MakeMaker script for XML::Parser::Expat
+Expat/encoding.h Header file; describes *.enc structure
+Expat/typemap XS typemap
+MANIFEST This file
+Makefile.PL perl MakeMaker script for XML::Parser
+Parser.pm XML::Parser module
+Parser/LWPExternEnt.pl LWP based external entity handler
+Parser/Encodings/Japanese_Encodings.msg Message about Japanese encodings.
+Parser/Encodings/README Info about encoding maps
+Parser/Encodings/big5.enc Big5 binary encoding map
+Parser/Encodings/euc-kr.enc EUC-KR binary encoding map
+Parser/Encodings/iso-8859-2.enc ISO-8859-2 binary encoding map
+Parser/Encodings/iso-8859-3.enc ISO-8859-3 binary encoding map
+Parser/Encodings/iso-8859-4.enc ISO-8859-4 binary encoding map
+Parser/Encodings/iso-8859-5.enc ISO-8859-5 binary encoding map
+Parser/Encodings/iso-8859-7.enc ISO-8859-7 binary encoding map
+Parser/Encodings/iso-8859-8.enc ISO-8859-8 binary encoding map
+Parser/Encodings/iso-8859-9.enc ISO-8859-9 binary encoding map
+Parser/Encodings/windows-1250.enc cp1250-WinLatin2 binary encoding map
+Parser/Encodings/windows-1251.enc cp1251-Russian binary encoding map
+Parser/Encodings/windows-1252.enc cp1252-WinLatin1 binary encoding map
+Parser/Encodings/windows-1255.enc hebrew
+Parser/Encodings/x-euc-jp-jisx0221.enc X-euc-jp-jisx0221 encoding map
+Parser/Encodings/x-euc-jp-unicode.enc X-euc-jp-unicde encoding map
+Parser/Encodings/x-sjis-cp932.enc x-sjis-cp932 encoding map
+Parser/Encodings/x-sjis-jdk117.enc x-sjis-jdk117 encoding map
+Parser/Encodings/x-sjis-jisx0221.enc x-sjis-jisx0221 encoding map
+Parser/Encodings/x-sjis-unicode.enc x-sjis-unicode encoding map
+Parser/Encodings/ibm866.enc
+Parser/Encodings/koi8-r.enc
+Parser/Style/Debug.pm Debug style parser
+Parser/Style/Objects.pm Objects style parser
+Parser/Style/Stream.pm Stream style parser
+Parser/Style/Subs.pm Subs style parser
+Parser/Style/Tree.pm Tree style parser
+README Short explanation
+samples/canonical A utility to generate canonical XML
+samples/canontst.xml An xml document to demonstrate canonical
+samples/ctest.dtd An external DTD used by canontst.xml
+samples/REC-xml-19980210.xml The XML spec in xml form
+samples/xmlcomments A utility to extract comments
+samples/xmlfilter A utility to filter elements
+samples/xmlstats A utility to report on element statistics
+t/astress.t Test script
+t/cdata.t Test script
+t/decl.t Test script
+t/defaulted.t Test script
+t/encoding.t Test script
+t/external_ent.t Test script
+t/file.t Test script
+t/finish.t Test script
+t/ext.ent External entity for parament.t test
+t/ext2.ent External entity for parament.t test
+t/foo.dtd External DTD for parament.t test
+t/namespaces.t Test script
+t/parament.t Test script
+t/partial.t Test script
+t/skip.t Test script
+t/stream.t Test script
+t/styles.t Test script
META.yml Module meta-data (added by MakeMaker)
Modified: trunk/libxml-parser-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/META.yml?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/META.yml (original)
+++ trunk/libxml-parser-perl/META.yml Fri Apr 29 10:15:41 2011
@@ -1,11 +1,25 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: XML-Parser
-version: 2.36
-version_from: Parser.pm
-installdirs: site
-requires:
- LWP: 0
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+--- #YAML:1.0
+name: XML-Parser
+version: 2.40
+abstract: A perl module for parsing XML documents
+author:
+ - Clark Cooper (coopercc at netheaven.com)
+license: perl
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
+build_requires:
+ ExtUtils::MakeMaker: 0
+requires:
+ LWP: 0
+ perl: 5.00405
+resources:
+ repository: http://github.com/chorny/XML-Parser
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.56
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: trunk/libxml-parser-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Makefile.PL?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Makefile.PL (original)
+++ trunk/libxml-parser-perl/Makefile.PL Fri Apr 29 10:15:41 2011
@@ -1,114 +1,201 @@
-use 5.004;
-use ExtUtils::MakeMaker;
-use Config;
-
-$expat_libpath = '';
-$expat_incpath = '';
-
-my @replacement_args;
-
-foreach (@ARGV) {
- if (/^EXPAT(LIB|INC)PATH=(.+)/) {
- if ($1 eq 'LIB') {
- $expat_libpath = $2;
- }
- else {
- $expat_incpath = $2;
- }
- }
- else {
- push(@replacement_args, $_);
- }
-}
-
- at ARGV = @replacement_args;
-if (not $expat_libpath and $] >= 5.006001 and $^O ne 'MSWin32') {
- require ExtUtils::Liblist; # Buggy before this
- ($expat_libpath) = ExtUtils::Liblist->ext('-lexpat');
-}
-
-unless ($expat_libpath) {
- # Test for existence of libexpat
- my $found = 0;
- foreach (split(/\s+/, $Config{libpth})) {
- if (-f "$_/libexpat." . $Config{so}) {
- $found = 1;
- last;
- }
- }
-
- if (!$found and $^O eq 'MSWin32') {
- if (-f 'C:/lib/Expat-2.0.0/Libs/libexpat.dll') {
- $expat_libpath = 'C:/lib/Expat-2.0.0/Libs';
- $expat_incpath = 'C:/lib/Expat-2.0.0/Source/lib';
- $found = 1;
- }
-
- }
-
- unless ($found) {
- die <<'Expat_Not_Installed;';
-
-Expat must be installed prior to building XML::Parser and I can't find
-it in the standard library directories. You can download expat from:
-
-http://sourceforge.net/projects/expat/
-
-If expat is installed, but in a non-standard directory, then use the
-following options to Makefile.PL:
-
- EXPATLIBPATH=... To set the directory in which to find libexpat
-
- EXPATINCPATH=... To set the directory in which to find expat.h
-
-For example:
-
- perl Makefile.PL EXPATLIBPATH=/home/me/lib EXPATINCPATH=/home/me/include
-
-Note that if you build against a shareable library in a non-standard location
-you may (on some platforms) also have to set your LD_LIBRARY_PATH environment
-variable at run time for perl to find the library.
-
-Expat_Not_Installed;
- }
-}
-
-# Don't try to descend into Expat directory for testing
-
-sub MY::test
-{
- my $self = shift;
-
- my $hold = delete $self->{DIR};
- my $ret = $self->MM::test(@_);
- $self->{DIR} = $hold if defined($hold);
- $ret;
-}
-
-my @extras = ();
-
-push(@extras,
- CAPI => 'TRUE')
- if ($PERL_VERSION >= 5.005 and $OSNAME eq 'MSWin32'
- and $Config{archname} =~ /-object\b/i);
-
-push(@extras,
- ABSTRACT_FROM => 'Parser.pm',
- AUTHOR => 'Clark Cooper (coopercc at netheaven.com)')
- if ($ExtUtils::MakeMaker::VERSION >= 5.4301);
-
-push(@extras,
- LICENSE => 'perl')
- if ($ExtUtils::MakeMaker::VERSION gt '6.30');
-
-WriteMakefile(
- NAME => 'XML::Parser',
- DIR => [qw(Expat)],
- dist => {COMPRESS => 'gzip', SUFFIX => '.gz'},
- VERSION_FROM => 'Parser.pm',
- PREREQ_PM => {
- LWP => 0, #for tests
- },
- @extras
- );
-
+
+use 5.004005; #Devel::CheckLib
+use ExtUtils::MakeMaker;
+use lib qw(inc);
+use Devel::CheckLib;
+
+use Config;
+
+$expat_libpath = '';
+$expat_incpath = '';
+
+my @replacement_args;
+
+foreach (@ARGV) {
+ if (/^EXPAT(LIB|INC)PATH=(.+)/) {
+ if ($1 eq 'LIB') {
+ $expat_libpath = $2;
+ }
+ else {
+ $expat_incpath = $2;
+ }
+ #push(@replacement_args, "$1=$2");
+ }
+ else {
+ push(@replacement_args, $_);
+ }
+}
+
+ at ARGV = @replacement_args;
+
+unless (
+ check_lib( # fill in what you prompted the user for here
+ lib => [qw(expat)],
+ header => ['expat.h'],
+ incpath => $expat_incpath,
+ ($expat_libpath?
+ (libpath => $expat_libpath):()),
+ )) {
+ warn <<'Expat_Not_Installed;';
+
+Expat must be installed prior to building XML::Parser and I can't find
+it in the standard library directories. Install 'expat-devel' package with your
+OS package manager.
+
+Or you can download expat from:
+
+http://sourceforge.net/projects/expat/
+
+If expat is installed, but in a non-standard directory, then use the
+following options to Makefile.PL:
+
+ EXPATLIBPATH=... To set the directory in which to find libexpat
+
+ EXPATINCPATH=... To set the directory in which to find expat.h
+
+For example:
+
+ perl Makefile.PL EXPATLIBPATH=/home/me/lib EXPATINCPATH=/home/me/include
+
+Note that if you build against a shareable library in a non-standard location
+you may (on some platforms) also have to set your LD_LIBRARY_PATH environment
+variable at run time for perl to find the library.
+
+Expat_Not_Installed;
+ #exit;
+}
+
+if (not $expat_libpath and $] >= 5.006001 and $^O ne 'MSWin32') {
+ require ExtUtils::Liblist; # Buggy before this
+ ($expat_libpath) = ExtUtils::Liblist->ext('-lexpat');
+}
+
+=for cmt
+
+unless ($expat_libpath) {
+ # Test for existence of libexpat
+ my $found = 0;
+ foreach (split(/\s+/, $Config{libpth})) {
+ if (-f "$_/libexpat." . $Config{so}) {
+ $expat_libpath=$_;
+ $found = 1;
+ last;
+ }
+ }
+
+ if (!$found and $^O eq 'MSWin32') {
+ if (-f 'C:/lib/Expat-2.0.0/Libs/libexpat.dll') {
+ $expat_libpath = 'C:/lib/Expat-2.0.0/Libs';
+ $expat_incpath = 'C:/lib/Expat-2.0.0/Source/lib';
+ $found = 1;
+ }
+
+ }
+ if ($found) {
+ print "libexpat found in $expat_libpath\n";
+ }
+
+ unless ($found) {
+ warn <<'Expat_Not_Installed;';
+
+Expat must be installed prior to building XML::Parser and I can't find
+it in the standard library directories. Install 'expat-devel' package with your
+OS package manager.
+
+Or you can download expat from:
+
+http://sourceforge.net/projects/expat/
+
+If expat is installed, but in a non-standard directory, then use the
+following options to Makefile.PL:
+
+ EXPATLIBPATH=... To set the directory in which to find libexpat
+
+ EXPATINCPATH=... To set the directory in which to find expat.h
+
+For example:
+
+ perl Makefile.PL EXPATLIBPATH=/home/me/lib EXPATINCPATH=/home/me/include
+
+Note that if you build against a shareable library in a non-standard location
+you may (on some platforms) also have to set your LD_LIBRARY_PATH environment
+variable at run time for perl to find the library.
+
+Expat_Not_Installed;
+ exit 0;
+ }
+}
+=cut
+
+# Don't try to descend into Expat directory for testing
+
+sub MY::test
+{
+ my $self = shift;
+
+ my $hold = delete $self->{DIR};
+ my $ret = $self->MM::test(@_);
+ $self->{DIR} = $hold if defined($hold);
+ $ret;
+}
+
+my @extras = ();
+
+push(@extras,
+ CAPI => 'TRUE')
+ if ($PERL_VERSION >= 5.005 and $OSNAME eq 'MSWin32'
+ and $Config{archname} =~ /-object\b/i);
+
+WriteMakefile1(
+ ABSTRACT_FROM => 'Parser.pm',
+ AUTHOR => 'Clark Cooper (coopercc at netheaven.com)',
+ LICENSE => 'perl',
+ MIN_PERL_VERSION => '5.00405',
+ META_MERGE => {
+ resources => {
+ repository => 'http://github.com/chorny/XML-Parser',
+ },
+ },
+ #BUILD_REQUIRES => {
+ #},
+
+ NAME => 'XML::Parser',
+ DIR => [qw(Expat)],
+ dist => {COMPRESS => 'gzip', SUFFIX => '.gz'},
+ VERSION_FROM => 'Parser.pm',
+ PREREQ_PM => {
+ LWP => 0, #for tests
+ },
+ $^O =~/win/i ? (
+ dist => {
+ TAR => 'ptar',
+ TARFLAGS => '-c -C -f',
+ },
+ ) : (),
+ @extras
+);
+
+
+sub WriteMakefile1 { #Written by Alexandr Ciornii, version 0.21. Added by eumm-upgrade.
+ my %params=@_;
+ my $eumm_version=$ExtUtils::MakeMaker::VERSION;
+ $eumm_version=eval $eumm_version;
+ die "EXTRA_META is deprecated" if exists $params{EXTRA_META};
+ die "License not specified" if not exists $params{LICENSE};
+ if ($params{BUILD_REQUIRES} and $eumm_version < 6.5503) {
+ #EUMM 6.5502 has problems with BUILD_REQUIRES
+ $params{PREREQ_PM}={ %{$params{PREREQ_PM} || {}} , %{$params{BUILD_REQUIRES}} };
+ delete $params{BUILD_REQUIRES};
+ }
+ delete $params{CONFIGURE_REQUIRES} if $eumm_version < 6.52;
+ delete $params{MIN_PERL_VERSION} if $eumm_version < 6.48;
+ delete $params{META_MERGE} if $eumm_version < 6.46;
+ delete $params{META_ADD} if $eumm_version < 6.46;
+ delete $params{LICENSE} if $eumm_version < 6.31;
+ delete $params{AUTHOR} if $] < 5.005;
+ delete $params{ABSTRACT_FROM} if $] < 5.005;
+ delete $params{BINARY_LOCATION} if $] < 5.005;
+
+ WriteMakefile(%params);
+}
+
Modified: trunk/libxml-parser-perl/Parser.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Parser.pm?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Parser.pm (original)
+++ trunk/libxml-parser-perl/Parser.pm Fri Apr 29 10:15:41 2011
@@ -8,18 +8,18 @@
package XML::Parser;
+use strict;
+
+use vars qw($VERSION $LWP_load_failed);
+
use Carp;
BEGIN {
require XML::Parser::Expat;
- $VERSION = '2.36';
+ $VERSION = '2.40';
die "Parser.pm and Expat.pm versions don't match"
unless $VERSION eq $XML::Parser::Expat::VERSION;
}
-
-use strict;
-
-use vars qw($VERSION $LWP_load_failed);
$LWP_load_failed = 0;
@@ -143,7 +143,7 @@
my $init = delete $handlers{Init};
my $final = delete $handlers{Final};
- my $expatnb = new XML::Parser::ExpatNB(@expat_options, @_);
+ my $expatnb = XML::Parser::ExpatNB->new(@expat_options, @_);
$expatnb->setHandlers(%handlers);
&$init($expatnb)
@@ -167,7 +167,7 @@
unless exists $self->{Non_Expat_Options}->{$key};
}
- my $expat = new XML::Parser::Expat(@expat_options, @_);
+ my $expat = XML::Parser::Expat->new(@expat_options, @_);
my %handlers = %{$self->{Handlers}};
my $init = delete $handlers{Init};
my $final = delete $handlers{Final};
@@ -297,7 +297,7 @@
}
require IO::File;
- my $fh = new IO::File($path);
+ my $fh = IO::File->new($path);
unless (defined $fh) {
$xp->{ErrorMessage}
.= "Failed to open $path:\n$!";
@@ -336,19 +336,19 @@
=head1 SYNOPSIS
use XML::Parser;
-
- $p1 = new XML::Parser(Style => 'Debug');
+
+ $p1 = XML::Parser->new(Style => 'Debug');
$p1->parsefile('REC-xml-19980210.xml');
$p1->parse('<foo id="me">Hello World</foo>');
# Alternative
- $p2 = new XML::Parser(Handlers => {Start => \&handle_start,
+ $p2 = XML::Parser->new(Handlers => {Start => \&handle_start,
End => \&handle_end,
Char => \&handle_char});
$p2->parse($socket);
# Another alternative
- $p3 = new XML::Parser(ErrorContext => 2);
+ $p3 = XML::Parser->new(ErrorContext => 2);
$p3->setHandlers(Char => \&text,
Default => \&other);
Modified: trunk/libxml-parser-perl/Parser/Encodings/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Parser/Encodings/README?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Parser/Encodings/README (original)
+++ trunk/libxml-parser-perl/Parser/Encodings/README Fri Apr 29 10:15:41 2011
@@ -1,5 +1,5 @@
This directory contains binary encoding maps for some selected encodings.
-If they are placed in a directoy listed in @XML::Parser::Expat::Encoding_Path,
+If they are placed in a directory listed in @XML::Parser::Expat::Encoding_Path,
then they are automaticly loaded by the XML::Parser::Expat::load_encoding
function as needed. Otherwise you may load what you need directly by
explicity calling this function.
Modified: trunk/libxml-parser-perl/Parser/Encodings/iso-8859-7.enc
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Parser/Encodings/iso-8859-7.enc?rev=73824&op=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/libxml-parser-perl/Parser/Style/Debug.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Parser/Style/Debug.pm?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Parser/Style/Debug.pm (original)
+++ trunk/libxml-parser-perl/Parser/Style/Debug.pm Fri Apr 29 10:15:41 2011
@@ -1,4 +1,4 @@
-# $Id: Debug.pm,v 1.1 2003/07/27 16:07:49 matt Exp $
+# $Id: Debug.pm,v 1.1 2003-07-27 16:07:49 matt Exp $
package XML::Parser::Style::Debug;
use strict;
Modified: trunk/libxml-parser-perl/Parser/Style/Objects.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Parser/Style/Objects.pm?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Parser/Style/Objects.pm (original)
+++ trunk/libxml-parser-perl/Parser/Style/Objects.pm Fri Apr 29 10:15:41 2011
@@ -1,4 +1,4 @@
-# $Id: Objects.pm,v 1.1 2003/08/18 20:20:51 matt Exp $
+# $Id: Objects.pm,v 1.1 2003-08-18 20:20:51 matt Exp $
package XML::Parser::Style::Objects;
use strict;
Modified: trunk/libxml-parser-perl/Parser/Style/Stream.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Parser/Style/Stream.pm?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Parser/Style/Stream.pm (original)
+++ trunk/libxml-parser-perl/Parser/Style/Stream.pm Fri Apr 29 10:15:41 2011
@@ -1,4 +1,4 @@
-# $Id: Stream.pm,v 1.1 2003/07/27 16:07:49 matt Exp $
+# $Id: Stream.pm,v 1.1 2003-07-27 16:07:49 matt Exp $
package XML::Parser::Style::Stream;
use strict;
Modified: trunk/libxml-parser-perl/Parser/Style/Subs.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Parser/Style/Subs.pm?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Parser/Style/Subs.pm (original)
+++ trunk/libxml-parser-perl/Parser/Style/Subs.pm Fri Apr 29 10:15:41 2011
@@ -1,4 +1,4 @@
-# $Id: Subs.pm,v 1.1 2003/07/27 16:07:49 matt Exp $
+# $Id: Subs.pm,v 1.1 2003-07-27 16:07:49 matt Exp $
package XML::Parser::Style::Subs;
Modified: trunk/libxml-parser-perl/Parser/Style/Tree.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/Parser/Style/Tree.pm?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/Parser/Style/Tree.pm (original)
+++ trunk/libxml-parser-perl/Parser/Style/Tree.pm Fri Apr 29 10:15:41 2011
@@ -1,4 +1,4 @@
-# $Id: Tree.pm,v 1.2 2003/07/31 07:54:51 matt Exp $
+# $Id: Tree.pm,v 1.2 2003-07-31 07:54:51 matt Exp $
package XML::Parser::Style::Tree;
$XML::Parser::Built_In_Styles{Tree} = 1;
Modified: trunk/libxml-parser-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/README?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/README (original)
+++ trunk/libxml-parser-perl/README Fri Apr 29 10:15:41 2011
@@ -1,4 +1,4 @@
- XML::Parser Version 2.31
+ XML::Parser Version 2.40
Copyright (c) 1998-2000 Larry Wall and Clark Cooper.
All rights reserved.
@@ -11,6 +11,10 @@
from:
http://sourceforge.net/projects/expat/
+
+Install 'expat-devel' package with your OS package manager.
+Debian: expat-dev
+Xubuntu 6.06: libexpat1-dev
The documentation for this extension can be found in pod format at the end
of the files Parser.pm and Expat/Expat.pm. The perldoc program, provided with
Modified: trunk/libxml-parser-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/debian/changelog?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/debian/changelog (original)
+++ trunk/libxml-parser-perl/debian/changelog Fri Apr 29 10:15:41 2011
@@ -1,11 +1,12 @@
-libxml-parser-perl (2.36-2) UNRELEASED; urgency=low
+libxml-parser-perl (2.40-1) UNRELEASED; urgency=low
* Moved package to Debian Perl Group (affects Vcs fields)
* Raised standards version to 3.9.2
* Reviewed dependencies
* Raised debhelper version and compat level to 7
-
- -- Nicholas Bamber <nicholas at periapt.co.uk> Fri, 29 Apr 2011 11:02:12 +0100
+ * New upstream release
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk> Fri, 29 Apr 2011 11:15:43 +0100
libxml-parser-perl (2.36-1.1) unstable; urgency=low
Modified: trunk/libxml-parser-perl/samples/canonical
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/samples/canonical?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/samples/canonical (original)
+++ trunk/libxml-parser-perl/samples/canonical Fri Apr 29 10:15:41 2011
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
#
# Copyright 1999 Clark Cooper <coopercc at netheaven.com>
# All rights reserved.
@@ -8,7 +8,7 @@
#
# $Revision: 1.1.1.1 $
#
-# $Date: 2003/07/27 11:07:11 $
+# $Date: 2003-07-27 11:07:11 $
#
# This program take an XML document (either on standard input or
# from a filename supplied as an argument) and generates corresponding
@@ -120,5 +120,5 @@
# Tell emacs that this is really a perl script
#Local Variables:
-#Mode: perl
+#mode: perl
#End:
Modified: trunk/libxml-parser-perl/samples/xmlcomments
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/samples/xmlcomments?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/samples/xmlcomments (original)
+++ trunk/libxml-parser-perl/samples/xmlcomments Fri Apr 29 10:15:41 2011
@@ -1,8 +1,8 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
#
# $Revision: 1.1.1.1 $
#
-# $Date: 2003/07/27 11:07:11 $
+# $Date: 2003-07-27 11:07:11 $
use XML::Parser;
Modified: trunk/libxml-parser-perl/samples/xmlfilter
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/samples/xmlfilter?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/samples/xmlfilter (original)
+++ trunk/libxml-parser-perl/samples/xmlfilter Fri Apr 29 10:15:41 2011
@@ -1,8 +1,8 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
#
# $Revision: 1.1.1.1 $
#
-# $Date: 2003/07/27 11:07:11 $
+# $Date: 2003-07-27 11:07:11 $
use XML::Parser;
Modified: trunk/libxml-parser-perl/samples/xmlstats
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/samples/xmlstats?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/samples/xmlstats (original)
+++ trunk/libxml-parser-perl/samples/xmlstats Fri Apr 29 10:15:41 2011
@@ -1,8 +1,8 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
#
# $Revision: 1.1.1.1 $
#
-# $Date: 2003/07/27 11:07:11 $
+# $Date: 2003-07-27 11:07:11 $
package Elinfo;
Modified: trunk/libxml-parser-perl/t/encoding.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-parser-perl/t/encoding.t?rev=73824&op=diff
==============================================================================
--- trunk/libxml-parser-perl/t/encoding.t (original)
+++ trunk/libxml-parser-perl/t/encoding.t Fri Apr 29 10:15:41 2011
@@ -31,7 +31,7 @@
$lastel = $el;
}
-my $p = new XML::Parser(Handlers => {Start => \&start, Char => \&text});
+my $p = XML::Parser->new(Handlers => {Start => \&start, Char => \&text});
$p->parse($doc);
@@ -91,7 +91,7 @@
%attr = @list;
}
-$p = new XML::Parser(Handlers => {Start => \&get_attr});
+$p = XML::Parser->new(Handlers => {Start => \&get_attr});
eval{ $p->parse($docstring) };
More information about the Pkg-perl-cvs-commits
mailing list