[libpod-pom-perl] 01/07: Imported Upstream version 0.29
gregor herrmann
gregoa at debian.org
Thu Jan 2 21:04:56 UTC 2014
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libpod-pom-perl.
commit 991bd87fea5e2c48bfc1e9cac28a445f65a9c0d0
Author: gregor herrmann <gregoa at debian.org>
Date: Thu Jan 2 21:55:54 2014 +0100
Imported Upstream version 0.29
---
Changes | 10 ++++-
MANIFEST | 12 ------
META.yml | 8 ++--
inc/Module/Install.pm | 4 +-
inc/Module/Install/Base.pm | 2 +-
inc/Module/Install/Can.pm | 85 +++++++++++++++++++++++++++++++++++---
inc/Module/Install/Fetch.pm | 2 +-
inc/Module/Install/Makefile.pm | 22 ++++++----
inc/Module/Install/Metadata.pm | 2 +-
inc/Module/Install/Scripts.pm | 2 +-
inc/Module/Install/Win32.pm | 2 +-
inc/Module/Install/WriteAll.pm | 2 +-
lib/Pod/POM.pm | 8 ++--
lib/Pod/POM/Node.pm | 4 +-
t/30-seq-delimiter-warnings.t | 19 ---------
t/90-pod.t | 8 ----
t/91-pod-coverage.t | 12 ------
t/92-perlcritic.t | 24 -----------
t/93-kwalitee.t | 12 ------
t/94-distribution.t | 26 ------------
t/testcases/101-bare-para.pod | 5 ---
t/testcases/101-bare-para.pom-dump | 4 --
t/testcases/101-bare-para.view-pod | 2 -
t/testcases/240-encoding.pom-dump | 10 -----
t/testcases/300-entities.pod | 21 ----------
t/testcases/300-entities.view-pod | 20 ---------
26 files changed, 119 insertions(+), 209 deletions(-)
diff --git a/Changes b/Changes
index 6635b96..26ef681 100644
--- a/Changes
+++ b/Changes
@@ -10,10 +10,18 @@
# Andrew Ford <A.Ford at ford-mason.co.uk>
#
#------------------------------------------------------------------------
-# $Id: Changes 89 2013-05-30 07:41:52Z ford $
+# $Id: Changes 91 2013-12-31 07:36:02Z ford $
#========================================================================
#------------------------------------------------------------------------
+# Version 0.29 2013-12-31
+#------------------------------------------------------------------------
+
+* fixed bug 87124 (upgrade Module::Install)
+
+* fixed bug 90010 (typos)
+
+#------------------------------------------------------------------------
# Version 0.28 2013-05-30
#------------------------------------------------------------------------
diff --git a/MANIFEST b/MANIFEST
index 94fa7ac..087ac2a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -45,12 +45,6 @@ t/10-parser.t
t/11-view-pod.t
t/12-view-text.t
t/13-view-html.t
-t/30-seq-delimiter-warnings.t
-t/90-pod.t
-t/91-pod-coverage.t
-t/92-perlcritic.t
-t/93-kwalitee.t
-t/94-distribution.t
t/PodPOMTestLib.pm
t/YAML/Tiny.pm
t/code.t
@@ -67,9 +61,6 @@ t/testcases/100-simple-document.pom-dump
t/testcases/100-simple-document.view-html
t/testcases/100-simple-document.view-pod
t/testcases/100-simple-document.view-text
-t/testcases/101-bare-para.pod
-t/testcases/101-bare-para.pom-dump
-t/testcases/101-bare-para.view-pod
t/testcases/120-verbatim-paragraphs.pod
t/testcases/120-verbatim-paragraphs.pom-dump
t/testcases/120-verbatim-paragraphs.view-html
@@ -121,9 +112,6 @@ t/testcases/230-alternate-delimters.view-pod
t/testcases/230-alternate-delimters.view-text
t/testcases/240-encoding.pod
t/testcases/240-encoding.view-html
-t/testcases/240-encoding.pom-dump
-t/testcases/300-entities.pod
-t/testcases/300-entities.view-pod
t/text.t
t/textview.t
t/view.t
diff --git a/META.yml b/META.yml
index fe382bb..f3ca4f7 100644
--- a/META.yml
+++ b/META.yml
@@ -3,14 +3,14 @@ abstract: 'POD Object Model'
author:
- 'Andy Wardley <abw at kfs.org>'
build_requires:
- ExtUtils::MakeMaker: 6.62
+ ExtUtils::MakeMaker: 6.59
File::Slurp: 0
Test::More: 0
configure_requires:
- ExtUtils::MakeMaker: 6.62
+ ExtUtils::MakeMaker: 6.59
distribution_type: module
dynamic_config: 1
-generated_by: 'Module::Install version 1.04'
+generated_by: 'Module::Install version 1.06'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -27,4 +27,4 @@ requires:
perl: 5.6.0
resources:
license: http://dev.perl.org/licenses/
-version: 0.28
+version: 0.29
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index c685ca4..4ecf46b 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -31,7 +31,7 @@ BEGIN {
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '1.04';
+ $VERSION = '1.06';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -467,4 +467,4 @@ sub _CLASS ($) {
1;
-# Copyright 2008 - 2011 Adam Kennedy.
+# Copyright 2008 - 2012 Adam Kennedy.
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index b520616..802844a 100644
--- a/inc/Module/Install/Base.pm
+++ b/inc/Module/Install/Base.pm
@@ -4,7 +4,7 @@ package Module::Install::Base;
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.04';
+ $VERSION = '1.06';
}
# Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index a162ad4..22167b8 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -3,13 +3,12 @@ package Module::Install::Can;
use strict;
use Config ();
-use File::Spec ();
use ExtUtils::MakeMaker ();
use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.04';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -29,7 +28,7 @@ sub can_use {
eval { require $mod; $pkg->VERSION($ver || 0); 1 };
}
-# check if we can run some command
+# Check if we can run some command
sub can_run {
my ($self, $cmd) = @_;
@@ -38,14 +37,88 @@ sub can_run {
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
next if $dir eq '';
- my $abs = File::Spec->catfile($dir, $_[1]);
+ require File::Spec;
+ my $abs = File::Spec->catfile($dir, $cmd);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
return;
}
-# can we locate a (the) C compiler
+# Can our C compiler environment build XS files
+sub can_xs {
+ my $self = shift;
+
+ # Ensure we have the CBuilder module
+ $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 );
+
+ # Do we have the configure_requires checker?
+ local $@;
+ eval "require ExtUtils::CBuilder;";
+ if ( $@ ) {
+ # They don't obey configure_requires, so it is
+ # someone old and delicate. Try to avoid hurting
+ # them by falling back to an older simpler test.
+ return $self->can_cc();
+ }
+
+ # Do we have a working C compiler
+ my $builder = ExtUtils::CBuilder->new(
+ quiet => 1,
+ );
+ unless ( $builder->have_compiler ) {
+ # No working C compiler
+ return 0;
+ }
+
+ # Write a C file representative of what XS becomes
+ require File::Temp;
+ my ( $FH, $tmpfile ) = File::Temp::tempfile(
+ "compilexs-XXXXX",
+ SUFFIX => '.c',
+ );
+ binmode $FH;
+ print $FH <<'END_C';
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+int main(int argc, char **argv) {
+ return 0;
+}
+
+int boot_sanexs() {
+ return 1;
+}
+
+END_C
+ close $FH;
+
+ # Can the C compiler access the same headers XS does
+ my @libs = ();
+ my $object = undef;
+ eval {
+ local $^W = 0;
+ $object = $builder->compile(
+ source => $tmpfile,
+ );
+ @libs = $builder->link(
+ objects => $object,
+ module_name => 'sanexs',
+ );
+ };
+ my $result = $@ ? 0 : 1;
+
+ # Clean up all the build files
+ foreach ( $tmpfile, $object, @libs ) {
+ next unless defined $_;
+ 1 while unlink;
+ }
+
+ return $result;
+}
+
+# Can we locate a (the) C compiler
sub can_cc {
my $self = shift;
my @chunks = split(/ /, $Config::Config{cc}) or return;
@@ -78,4 +151,4 @@ if ( $^O eq 'cygwin' ) {
__END__
-#line 156
+#line 236
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index a412576..bee0c4f 100644
--- a/inc/Module/Install/Fetch.pm
+++ b/inc/Module/Install/Fetch.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.04';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 035cef2..7052f36 100644
--- a/inc/Module/Install/Makefile.pm
+++ b/inc/Module/Install/Makefile.pm
@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.04';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -215,13 +215,17 @@ sub write {
require ExtUtils::MakeMaker;
if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
- # MakeMaker can complain about module versions that include
- # an underscore, even though its own version may contain one!
- # Hence the funny regexp to get rid of it. See RT #35800
- # for details.
- my ($v) = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
- $self->build_requires( 'ExtUtils::MakeMaker' => $v );
- $self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+ # This previous attempted to inherit the version of
+ # ExtUtils::MakeMaker in use by the module author, but this
+ # was found to be untenable as some authors build releases
+ # using future dev versions of EU:MM that nobody else has.
+ # Instead, #toolchain suggests we use 6.59 which is the most
+ # stable version on CPAN at time of writing and is, to quote
+ # ribasushi, "not terminally fucked, > and tested enough".
+ # TODO: We will now need to maintain this over time to push
+ # the version up as new versions are released.
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 );
} else {
# Allow legacy-compatibility with 5.005 by depending on the
# most recent EU:MM that supported 5.005.
@@ -411,4 +415,4 @@ sub postamble {
__END__
-#line 540
+#line 544
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index 31c953e..58430f3 100644
--- a/inc/Module/Install/Metadata.pm
+++ b/inc/Module/Install/Metadata.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.04';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Scripts.pm b/inc/Module/Install/Scripts.pm
index 12f5a1b..419286f 100644
--- a/inc/Module/Install/Scripts.pm
+++ b/inc/Module/Install/Scripts.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.04';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index 99d9631..eeaa3fe 100644
--- a/inc/Module/Install/Win32.pm
+++ b/inc/Module/Install/Win32.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.04';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index 86bb25e..85d8018 100644
--- a/inc/Module/Install/WriteAll.pm
+++ b/inc/Module/Install/WriteAll.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.04';
+ $VERSION = '1.06';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
diff --git a/lib/Pod/POM.pm b/lib/Pod/POM.pm
index 40ec3a8..3dc3bda 100644
--- a/lib/Pod/POM.pm
+++ b/lib/Pod/POM.pm
@@ -19,7 +19,7 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: POM.pm 89 2013-05-30 07:41:52Z ford $
+# $Id: POM.pm 91 2013-12-31 07:36:02Z ford $
#
#========================================================================
@@ -35,7 +35,7 @@ use Pod::POM::View::Pod;
use parent qw( Exporter );
-our $VERSION = '0.28';
+our $VERSION = '0.29';
our $DEBUG = 0 unless defined $DEBUG;
our $ROOT = 'Pod::POM::Node::Pod'; # root node class
our $TEXTSEQ = 'Pod::POM::Node::Sequence'; # text sequence class
@@ -980,7 +980,7 @@ as well as regular, formatted text blocks to contain code sequences,
such like C<BE<lt>thisE<gt>> and C<IE<lt>thisE<gt>>. These are used
to indicate different markup styles, mark external references or index
items, and so on. What's more, they can be C<BE<lt>nested
-IE<lt>indefinatelyE<gt>E<gt>>. Pod::POM takes care of all this by
+IE<lt>indefinitelyE<gt>E<gt>>. Pod::POM takes care of all this by
parsing such text, along with any embedded sequences, into Yet Another
Tree, the root node of which is a Pod::POM::Node::Text object,
possibly containing other Pod::POM::Node::Sequence objects. When the
@@ -1403,7 +1403,7 @@ Content elements: over, begin, for, verbatim, text, code.
The C<over> node encloses the Pod content in a list starting at an C<=over>
tag and continuing up to the matching C<=back> tag. Lists may be nested
-indefinately.
+indefinitely.
Attributes: indent (default: 4)
diff --git a/lib/Pod/POM/Node.pm b/lib/Pod/POM/Node.pm
index c2ab3b7..6c4568c 100644
--- a/lib/Pod/POM/Node.pm
+++ b/lib/Pod/POM/Node.pm
@@ -15,7 +15,7 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: Node.pm 89 2013-05-30 07:41:52Z ford $
+# $Id: Node.pm 91 2013-12-31 07:36:02Z ford $
#
#========================================================================
@@ -228,7 +228,7 @@ sub metadata {
# package variable $ERROR (class method) or internal member
# $self->{ _ERROR } (object method). The presence of parameters indicates
# that the error value should be set. Undef is then returned. In the
-# abscence of parameters, the current error value is returned.
+# absence of parameters, the current error value is returned.
#------------------------------------------------------------------------
sub error {
diff --git a/t/30-seq-delimiter-warnings.t b/t/30-seq-delimiter-warnings.t
deleted file mode 100755
index a7e9b50..0000000
--- a/t/30-seq-delimiter-warnings.t
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/perl
-
-use Test::More tests => 1;
-use Pod::POM qw();
-
-my $parser = Pod::POM->new;
-
-diag "checking [rt.cpan.org #48812]";
-my $pom = $parser->parse_text('=head2 clone
-
-C<< $obj->clone >> makes a deep copy of the object.');
-
-TODO: {
- local $TODO = 'known parser bug';
-
- ok !$parser->warnings, q(should not emit warning "expected '>>' not '>'");
-}
-
-exit(0);
diff --git a/t/90-pod.t b/t/90-pod.t
deleted file mode 100755
index d70ae7d..0000000
--- a/t/90-pod.t
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/perl
-# $Id: 90-pod.t 4092 2009-02-24 17:46:48Z andrew $
-
-use Test::More;
-eval "use Test::Pod 1.00";
-plan skip_all => "pod not yet complete";
-plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
-all_pod_files_ok();
diff --git a/t/91-pod-coverage.t b/t/91-pod-coverage.t
deleted file mode 100755
index a67e733..0000000
--- a/t/91-pod-coverage.t
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/perl
-# $Id: 91-pod-coverage.t 4092 2009-02-24 17:46:48Z andrew $
-
-use Test::More;
-eval "use Test::Pod::Coverage";
-plan skip_all => "pod not yet complete";
-plan skip_all => "Test::Pod::Coverage required for testing pod coverage" if $@;
-all_pod_coverage_ok();
-
-
-
-
diff --git a/t/92-perlcritic.t b/t/92-perlcritic.t
deleted file mode 100755
index 4d5562c..0000000
--- a/t/92-perlcritic.t
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/perl
-# $Id: 92-perlcritic.t 4092 2009-02-24 17:46:48Z andrew $
-
-use strict;
-use warnings;
-use File::Spec;
-use Test::More;
-use English qw(-no_match_vars);
-
-if ( not $ENV{TEST_AUTHOR} ) {
- my $msg = 'Author test. Set $ENV{TEST_AUTHOR} to a true value to run.';
- plan( skip_all => $msg );
-}
-
-eval { require Test::Perl::Critic; };
-
-if ( $EVAL_ERROR ) {
- my $msg = 'Test::Perl::Critic required to criticise code';
- plan( skip_all => $msg );
-}
-
-my $rcfile = File::Spec->catfile( 't', 'perlcriticrc' );
-Test::Perl::Critic->import( -profile => $rcfile );
-all_critic_ok();
diff --git a/t/93-kwalitee.t b/t/93-kwalitee.t
deleted file mode 100755
index 33d0c03..0000000
--- a/t/93-kwalitee.t
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/perl
-# $Id: 93-kwalitee.t 4105 2009-03-03 09:50:27Z andrew $
-
-use Test::More;
-
-eval {
- require Test::Kwalitee;
-
- # Skip Pod tests - they are tested by other unit tests anyway
- Test::Kwalitee->import( tests => [ qw( -no_pod_errors -has_test_pod -has_test_pod_coverage ) ] ) };
-
-plan( skip_all => 'Test::Kwalitee not installed; skipping' ) if $@;
diff --git a/t/94-distribution.t b/t/94-distribution.t
deleted file mode 100755
index cefd066..0000000
--- a/t/94-distribution.t
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/perl
-# $Id: 94-distribution.t 4092 2009-02-24 17:46:48Z andrew $
-
-use strict;
-
-use Test::More;
-
-use Cwd qw(abs_path);
-use FindBin qw($Bin);
-
-use lib ($Bin, "$Bin/../lib");
-
-BEGIN {
- eval {
- require Test::Distribution;
- };
- plan skip_all => "not yet ready for distribution testing";
- exit(0);
-
- if($@) {
- plan skip_all => 'Test::Distribution not installed';
- }
- else {
- import Test::Distribution;
- }
-}
diff --git a/t/testcases/101-bare-para.pod b/t/testcases/101-bare-para.pod
deleted file mode 100644
index 084c063..0000000
--- a/t/testcases/101-bare-para.pod
+++ /dev/null
@@ -1,5 +0,0 @@
-=pod
-
-This is text.
-
-=cut
diff --git a/t/testcases/101-bare-para.pom-dump b/t/testcases/101-bare-para.pom-dump
deleted file mode 100644
index ca32cb8..0000000
--- a/t/testcases/101-bare-para.pom-dump
+++ /dev/null
@@ -1,4 +0,0 @@
-pod
- text
- @text
- "This is text."
diff --git a/t/testcases/101-bare-para.view-pod b/t/testcases/101-bare-para.view-pod
deleted file mode 100644
index dc59aad..0000000
--- a/t/testcases/101-bare-para.view-pod
+++ /dev/null
@@ -1,2 +0,0 @@
-This is text.
-
diff --git a/t/testcases/240-encoding.pom-dump b/t/testcases/240-encoding.pom-dump
deleted file mode 100644
index 016f05a..0000000
--- a/t/testcases/240-encoding.pom-dump
+++ /dev/null
@@ -1,10 +0,0 @@
-pod
- head1
- @title
- "NAME"
- text
- @text
- "230-encoding"
- text
- @text
- "This is latin-2 for a c with an accent: Slaven Rezić"
diff --git a/t/testcases/300-entities.pod b/t/testcases/300-entities.pod
deleted file mode 100644
index 14b88bb..0000000
--- a/t/testcases/300-entities.pod
+++ /dev/null
@@ -1,21 +0,0 @@
-=head1 NAME
-
-Entity Test
-
-=head1 DESCRIPTION
-
-This is a test of entity handling.
-
-Ampersand: &
-
-Less than: <
-
-Greater than: >
-
-Vertical bar: E<verbar>
-
-Solidus: E<sol>
-
-Eth: E<0xf0>, E<239>
-
-=cut
diff --git a/t/testcases/300-entities.view-pod b/t/testcases/300-entities.view-pod
deleted file mode 100644
index 591317b..0000000
--- a/t/testcases/300-entities.view-pod
+++ /dev/null
@@ -1,20 +0,0 @@
-=head1 NAME
-
-Entity Test
-
-=head1 DESCRIPTION
-
-This is a test of entity handling.
-
-Ampersand: &
-
-Less than: <
-
-Greater than: >
-
-Vertical bar: E<verbar>
-
-Solidus: E<sol>
-
-Eth: E<0xf0>, E<239>
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libpod-pom-perl.git
More information about the Pkg-perl-cvs-commits
mailing list