[SCM] Debian packaging of libversion-perl branch, master, updated. debian/1%0.9300-1-4-g7969c1b
Alessandro Ghedini
al3xbio at gmail.com
Mon Aug 22 12:44:12 UTC 2011
The following commit has been merged in the master branch:
commit c1fd709f8108754a0d4e8d9e2f702bfd13498c20
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date: Mon Aug 22 12:08:14 2011 +0200
Imported Upstream version 0.9400
diff --git a/Changes b/Changes
index a322fc7..654c4b3 100644
--- a/Changes
+++ b/Changes
@@ -1,8 +1,32 @@
+2011-08-21 John Peacock <john.peacock at havurah-software.org>
+
+ * .hgtags:
+ Tagging version '0.94' using shipit.
+ [743538f58cb7] [tip]
+
+ * Makefile.PL, lib/version.pod, lib/version/Internals.pod:
+ Tweak POD and add LICENSE to Makefile.PL. Resolves:
+
+ https://rt.cpan.org/Public/Bug/Display.html?id=70120
+ [3a4fae29c763] [0.94]
+
+ * MANIFEST, t/05sigdie.t:
+ Add test to confirm that the $SIG{__DIE__} handling is correct.
+ [4a421bba05c9]
+
+ * lib/version.pm, t/01base.t, t/02derived.t, t/03require.t,
+ vperl/vpp.pm, vutil/lib/version/vxs.pm:
+ Prevent DIE handlers in user code from tripping up loading version.
+ Don't know how this hasn't shown up until now. Resolves:
+
+ https://rt.cpan.org/Ticket/Display.html?id=70260
+ [754fd86858af]
+
2011-07-27 John Peacock <john.peacock at havurah-software.org>
* .hgtags:
Tagging version '0.93' using shipit.
- [1fb9bb0676db] [tip]
+ [1fb9bb0676db]
* t/coretests.pm:
Reorder tests and include both positive and negative test for
diff --git a/MANIFEST b/MANIFEST
index 408277c..d106261 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -12,6 +12,7 @@ t/01base.t
t/02derived.t
t/03require.t
t/04strict_lax.t
+t/05sigdie.t
t/coretests.pm
t/survey_locales
vperl/vpp.pm
@@ -20,3 +21,4 @@ vutil/ppport.h
vutil/vutil.c
vutil/vutil.h
vutil/vxs.xs
+META.json Module JSON meta-data (added by MakeMaker)
diff --git a/META.json b/META.json
new file mode 100644
index 0000000..fa0fd16
--- /dev/null
+++ b/META.json
@@ -0,0 +1,42 @@
+{
+ "abstract" : "Structured version objects",
+ "author" : [
+ "John Peacock <jpeacock at cpan.org>"
+ ],
+ "dynamic_config" : 1,
+ "generated_by" : "ExtUtils::MakeMaker version 6.58, CPAN::Meta::Converter version 2.110930001",
+ "license" : [
+ "perl_5"
+ ],
+ "meta-spec" : {
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+ "version" : "2"
+ },
+ "name" : "version",
+ "no_index" : {
+ "directory" : [
+ "t",
+ "inc"
+ ]
+ },
+ "prereqs" : {
+ "build" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : 0
+ }
+ },
+ "configure" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : 0
+ }
+ },
+ "runtime" : {
+ "requires" : {
+ "File::Temp" : "0.13",
+ "Test::More" : "0.45"
+ }
+ }
+ },
+ "release_status" : "stable",
+ "version" : "0.94"
+}
diff --git a/META.yml b/META.yml
index a56efd3..d75bd4f 100644
--- a/META.yml
+++ b/META.yml
@@ -1,23 +1,23 @@
---- #YAML:1.0
-name: version
-version: 0.93
-abstract: Structured version objects
+---
+abstract: 'Structured version objects'
author:
- - John Peacock <jpeacock at cpan.org>
-license: unknown
-distribution_type: module
-configure_requires:
- ExtUtils::MakeMaker: 0
+ - 'John Peacock <jpeacock at cpan.org>'
build_requires:
- ExtUtils::MakeMaker: 0
-requires:
- File::Temp: 0.13
- Test::More: 0.45
-no_index:
- directory:
- - t
- - inc
-generated_by: ExtUtils::MakeMaker version 6.55_02
+ ExtUtils::MakeMaker: 0
+configure_requires:
+ ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.58, CPAN::Meta::Converter version 2.110930001'
+license: perl
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: version
+no_index:
+ directory:
+ - t
+ - inc
+requires:
+ File::Temp: 0.13
+ Test::More: 0.45
+version: 0.94
diff --git a/Makefile.PL b/Makefile.PL
index cbb77a3..d56e38b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -37,8 +37,9 @@ sub write_makefile
{
my %prereq = ( 'Test::More' => 0.45, 'File::Temp' => 0.13 );
- WriteMakefile( VERSION_FROM => "lib/version.pm",
- NAME => "version",
+ WriteMakefile( VERSION_FROM => 'lib/version.pm',
+ NAME => 'version',
+ LICENSE => 'perl',
PREREQ_PM => \%prereq,
CONFIGURE => \&init,
( $] >= 5.005 ?
diff --git a/lib/version.pm b/lib/version.pm
index ca4c0ab..af58599 100644
--- a/lib/version.pm
+++ b/lib/version.pm
@@ -6,7 +6,7 @@ use strict;
use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);
-$VERSION = 0.93;
+$VERSION = 0.94;
$CLASS = 'version';
@@ -114,38 +114,41 @@ $LAX =
#--------------------------------------------------------------------------#
-eval "use version::vxs $VERSION";
-if ( $@ ) { # don't have the XS version installed
- eval "use version::vpp $VERSION"; # don't tempt fate
- die "$@" if ( $@ );
- push @ISA, "version::vpp";
- local $^W;
- *version::qv = \&version::vpp::qv;
- *version::declare = \&version::vpp::declare;
- *version::_VERSION = \&version::vpp::_VERSION;
- if ($] >= 5.009000) {
- no strict 'refs';
- *version::stringify = \&version::vpp::stringify;
- *{'version::(""'} = \&version::vpp::stringify;
- *version::new = \&version::vpp::new;
- *version::parse = \&version::vpp::parse;
- }
-}
-else { # use XS module
- push @ISA, "version::vxs";
- local $^W;
- *version::declare = \&version::vxs::declare;
- *version::qv = \&version::vxs::qv;
- *version::_VERSION = \&version::vxs::_VERSION;
- *version::vcmp = \&version::vxs::VCMP;
- if ($] >= 5.009000) {
- no strict 'refs';
- *version::stringify = \&version::vxs::stringify;
- *{'version::(""'} = \&version::vxs::stringify;
- *version::new = \&version::vxs::new;
- *version::parse = \&version::vxs::parse;
+{
+ local $SIG{'__DIE__'};
+ eval "use version::vxs $VERSION";
+ if ( $@ ) { # don't have the XS version installed
+ eval "use version::vpp $VERSION"; # don't tempt fate
+ die "$@" if ( $@ );
+ push @ISA, "version::vpp";
+ local $^W;
+ *version::qv = \&version::vpp::qv;
+ *version::declare = \&version::vpp::declare;
+ *version::_VERSION = \&version::vpp::_VERSION;
+ if ($] >= 5.009000) {
+ no strict 'refs';
+ *version::stringify = \&version::vpp::stringify;
+ *{'version::(""'} = \&version::vpp::stringify;
+ *version::new = \&version::vpp::new;
+ *version::parse = \&version::vpp::parse;
+ }
}
+ else { # use XS module
+ push @ISA, "version::vxs";
+ local $^W;
+ *version::declare = \&version::vxs::declare;
+ *version::qv = \&version::vxs::qv;
+ *version::_VERSION = \&version::vxs::_VERSION;
+ *version::vcmp = \&version::vxs::VCMP;
+ if ($] >= 5.009000) {
+ no strict 'refs';
+ *version::stringify = \&version::vxs::stringify;
+ *{'version::(""'} = \&version::vxs::stringify;
+ *version::new = \&version::vxs::new;
+ *version::parse = \&version::vxs::parse;
+ }
+ }
}
# Preloaded methods go here.
diff --git a/lib/version.pod b/lib/version.pod
index fcaf5d6..38b22f9 100644
--- a/lib/version.pod
+++ b/lib/version.pod
@@ -60,9 +60,10 @@ source file. Quoting is recommended, as it ensures that trailing zeroes
The more modern form of version assignment, with 3 (or potentially more)
integers separated by decimal points (e.g. v1.2.3). This is the form that
-Perl itself has used since 5.6.0 was released. The leading "v" is now
+Perl itself has used since 5.6.0 was released. The leading 'v' is now
strongly recommended for clarity, and will throw a warning in a future
-release if omitted.
+release if omitted. A leading 'v' character is required to pass the
+L<is_strict()> test.
=back
@@ -194,7 +195,7 @@ for dotted-decimal formats strings:
=item C<is_strict()>
-If you want to limit youself to a much more narrow definition of what
+If you want to limit yourself to a much more narrow definition of what
a version string constitutes, C<is_strict()> is limited to version
strings like the following list:
diff --git a/lib/version/Internals.pod b/lib/version/Internals.pod
index a4f0543..9e65e6f 100644
--- a/lib/version/Internals.pod
+++ b/lib/version/Internals.pod
@@ -34,7 +34,7 @@ Also referred to as "Dotted-Integer", these contains more than one decimal
point and may have an optional embedded underscore, see L<Dotted-Decimal
Versions>. This is what is commonly used in most open source software as
the "external" version (the one used as part of the tag or tarfile name).
-A leading 'v' character is now required and will warn if it missing.
+A leading "v" character is now required to pass the L<is_strict()> test.
=back
diff --git a/t/01base.t b/t/01base.t
index de1c66e..5b397b4 100644
--- a/t/01base.t
+++ b/t/01base.t
@@ -9,7 +9,7 @@ my $Verbose;
BEGIN {
require "t/coretests.pm";
- use_ok('version', 0.93);
+ use_ok('version', 0.94);
}
diag "Tests with base class" if $Verbose;
diff --git a/t/02derived.t b/t/02derived.t
index e28cbe0..c143ac6 100644
--- a/t/02derived.t
+++ b/t/02derived.t
@@ -10,7 +10,7 @@ my $Verbose;
BEGIN {
require "t/coretests.pm";
- use_ok("version", 0.93);
+ use_ok("version", 0.94);
# If we made it this far, we are ok.
}
diff --git a/t/03require.t b/t/03require.t
index 406689c..3ad302e 100644
--- a/t/03require.t
+++ b/t/03require.t
@@ -13,7 +13,7 @@ BEGIN {
# Don't want to use, because we need to make sure that the import doesn't
# fire just yet (some code does this to avoid importing qv() and delare()).
require_ok("version");
-is $version::VERSION, 0.93, "Make sure we have the correct class";
+is $version::VERSION, 0.94, "Make sure we have the correct class";
ok(!"main"->can("qv"), "We don't have the imported qv()");
ok(!"main"->can("declare"), "We don't have the imported declare()");
diff --git a/t/05sigdie.t b/t/05sigdie.t
new file mode 100644
index 0000000..18e2951
--- /dev/null
+++ b/t/05sigdie.t
@@ -0,0 +1,21 @@
+#! /usr/local/perl -w
+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl test.pl'
+
+#########################
+
+use Test::More tests => 1;
+
+BEGIN {
+ $SIG{__DIE__} = sub {
+ warn @_;
+ BAIL_OUT( q[Couldn't use module; can't continue.] );
+ };
+}
+
+
+BEGIN {
+ use version 0.94;
+}
+
+pass "Didn't get caught by the wrong DIE handler, which is a good thing";
diff --git a/vperl/vpp.pm b/vperl/vpp.pm
index e119bde..886e173 100644
--- a/vperl/vpp.pm
+++ b/vperl/vpp.pm
@@ -121,7 +121,7 @@ use strict;
use POSIX qw/locale_h/;
use locale;
use vars qw ($VERSION @ISA @REGEXS);
-$VERSION = 0.93;
+$VERSION = 0.94;
use overload (
'""' => \&stringify,
diff --git a/vutil/lib/version/vxs.pm b/vutil/lib/version/vxs.pm
index d4e622f..4469e1e 100644
--- a/vutil/lib/version/vxs.pm
+++ b/vutil/lib/version/vxs.pm
@@ -6,7 +6,7 @@ use strict;
use vars qw(@ISA $VERSION $CLASS );
-$VERSION = 0.93;
+$VERSION = 0.94;
$CLASS = 'version::vxs';
--
Debian packaging of libversion-perl
More information about the Pkg-perl-cvs-commits
mailing list