Upgrade autodie from version 2.21 to 2.22

This has no installed code changes, but incorporates CPAN RT#88444 (but not
yet CPAN RT #87237).

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 7249fb0..93646bb 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -223,7 +223,7 @@ use File::Glob qw(:case);
 
     'autodie' => {
         'MAINTAINER'   => 'pjf',
-        'DISTRIBUTION' => 'PJF/autodie-2.21.tar.gz',
+        'DISTRIBUTION' => 'PJF/autodie-2.22.tar.gz',
         'FILES'        => q[cpan/autodie],
         'EXCLUDED'     => [
             qr{benchmarks},
@@ -231,8 +231,8 @@ use File::Glob qw(:case);
             # modules that don't exist when we're
             # building the core.  Hence, they can
             # never run, and should not be merged.
-            qw( t/boilerplate.t
-                t/author-critic.t
+            qw( t/author-critic.t
+                t/boilerplate.t
                 t/critic.t
                 t/fork.t
                 t/kwalitee.t
@@ -246,8 +246,6 @@ use File::Glob qw(:case);
                 )
         ],
         'CUSTOMIZED'   => [
-            # Waiting to be merged upstream: see CPAN RT#88444
-            qw(        t/utime.t ),
             # Waiting to be merged upstream: see CPAN RT#87237
             qw(        t/utf8_open.t ),
         ],

diff --git a/cpan/autodie/lib/Fatal.pm b/cpan/autodie/lib/Fatal.pm
index 13801cd..bea5231 100644 (file)
--- a/cpan/autodie/lib/Fatal.pm
+++ b/cpan/autodie/lib/Fatal.pm
@@ -48,7 +48,7 @@ use constant ERROR_58_HINTS => q{Non-subroutine %s hints for %s are not supporte
 
 use constant MIN_IPC_SYS_SIMPLE_VER => 0.12;
 
-our $VERSION = '2.21'; # VERSION: Generated by DZP::OurPkg::Version
+our $VERSION = '2.22'; # VERSION: Generated by DZP::OurPkg::Version
 
 our $Debug ||= 0;
 
@@ -143,6 +143,7 @@ my %TAGS = (
     ':2.19'  => [qw(:default)],
     ':2.20'  => [qw(:default)],
     ':2.21'  => [qw(:default)],
+    ':2.22'  => [qw(:default)],
 );
 
 # chmod was only introduced in 2.07

diff --git a/cpan/autodie/lib/autodie.pm b/cpan/autodie/lib/autodie.pm
index de6f18f..1e9f852 100644 (file)
--- a/cpan/autodie/lib/autodie.pm
+++ b/cpan/autodie/lib/autodie.pm
@@ -10,7 +10,7 @@ our $VERSION;
 # ABSTRACT: Replace functions with ones that succeed or die with lexical scope
 
 BEGIN {
-    our $VERSION = '2.21'; # VERSION: Generated by DZP::OurPkg::Version
+    our $VERSION = '2.22'; # VERSION: Generated by DZP::OurPkg::Version
 }
 
 use constant ERROR_WRONG_FATAL => q{

diff --git a/cpan/autodie/lib/autodie/exception.pm b/cpan/autodie/lib/autodie/exception.pm
index 6939ad3..142e5db 100644 (file)
--- a/cpan/autodie/lib/autodie/exception.pm
+++ b/cpan/autodie/lib/autodie/exception.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp qw(croak);
 
-our $VERSION = '2.21'; # VERSION: Generated by DZP::OurPkg:Version
+our $VERSION = '2.22'; # VERSION: Generated by DZP::OurPkg:Version
 # ABSTRACT: Exceptions from autodying functions.
 
 our $DEBUG = 0;

diff --git a/cpan/autodie/lib/autodie/exception/system.pm b/cpan/autodie/lib/autodie/exception/system.pm
index a790d61..7bb1f5f 100644 (file)
--- a/cpan/autodie/lib/autodie/exception/system.pm
+++ b/cpan/autodie/lib/autodie/exception/system.pm
@@ -5,7 +5,7 @@ use warnings;
 use base 'autodie::exception';
 use Carp qw(croak);
 
-our $VERSION = '2.21'; # VERSION: Generated by DZP::OurPkg:Version
+our $VERSION = '2.22'; # VERSION: Generated by DZP::OurPkg:Version
 
 # ABSTRACT: Exceptions from autodying system().
 

diff --git a/cpan/autodie/lib/autodie/hints.pm b/cpan/autodie/lib/autodie/hints.pm
index f416406..d63849f 100644 (file)
--- a/cpan/autodie/lib/autodie/hints.pm
+++ b/cpan/autodie/lib/autodie/hints.pm
@@ -5,7 +5,7 @@ use warnings;
 
 use constant PERL58 => ( $] < 5.009 );
 
-our $VERSION = '2.21'; # VERSION: Generated by DZP::OurPkg:Version
+our $VERSION = '2.22'; # VERSION: Generated by DZP::OurPkg:Version
 
 # ABSTRACT: Provide hints about user subroutines to autodie
 

diff --git a/cpan/autodie/lib/autodie/skip.pm b/cpan/autodie/lib/autodie/skip.pm
index d01ffe9..9eb4cf4 100644 (file)
--- a/cpan/autodie/lib/autodie/skip.pm
+++ b/cpan/autodie/lib/autodie/skip.pm
@@ -2,7 +2,7 @@ package autodie::skip;
 use strict;
 use warnings;
 
-our $VERSION = '2.21'; # VERSION
+our $VERSION = '2.22'; # VERSION
 
 # This package exists purely so people can inherit from it,
 # which isn't at all how roles are supposed to work, but it's

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 39bf84f..f1d88a9 100644 (file)
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -119,6 +119,13 @@ XXX
 
 =item *
 
+L<autodie> has been upgraded from version 2.21 to 2.22.
+
+No changes have been made to the installed code other than the version bump to
+keep in sync with the latest CPAN release.
+
+=item *
+
 L<Module::CoreList> has been upgraded from version 2.99 to 3.00.
 
 The list of Perl versions covered has been updated.

diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 8eb0103..59f4660 100644 (file)
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -21,7 +21,6 @@ Text::Balanced cpan/Text-Balanced/t/09_gentag.t 42361b5dfb3bb728bce20f4fb0d92ccf
 Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 9bae51c9b944cd5c0bbabe9d397e573976a2be8e
 Text::ParseWords cpan/Text-ParseWords/t/taint.t 3cff0dae812801f7aa1738d6070508f2c5bcc2e5
 autodie cpan/autodie/t/utf8_open.t 5295851351c49f939008c5aca6a798742b1e503d
-autodie cpan/autodie/t/utime.t e2491f81cddc128097ffa1aa91b86db993116286
 libnet cpan/libnet/Makefile.PL 6b10ac98e672bfebb8f49b9720a93442645208b3
 podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6
 podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69