In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/22b637e7406e1460b7adf0ddf74af76c6c7aac30?hp=1f922d87031d19b508b27b35e56d92f35273ffeb>

- Log -----------------------------------------------------------------
commit 22b637e7406e1460b7adf0ddf74af76c6c7aac30
Merge: 1f922d8 a6f8bc4
Author: James E Keenan <[email protected]>
Date:   Tue Jul 15 18:54:47 2014 -0400

    Merge branch '122300-extutils-manifest' into blead

commit a6f8bc47159a176b40a20c874fc545270a452af8
Author: Karen Etheridge <[email protected]>
Date:   Mon Jul 14 17:25:46 2014 -0700

    use just the import sub from Exporter

M       dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm

commit 7f1e728cd3c370defc14408131b34c6cf7273254
Author: James E Keenan <[email protected]>
Date:   Tue Jul 15 18:36:29 2014 -0400

    Need to increment $VERSION in ExtUtils::Manifest.

M       dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm

commit 7f7b37766cb37696d5e75beac8af3e4c8f60b7db
Author: Karen Etheridge <[email protected]>
Date:   Mon Jul 14 17:19:36 2014 -0700

    use warnings; convert "use vars" to "our"

M       dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm

commit 97fb9c8cd0ec596e2c74a9c39838d1f7cbb0f57a
Author: Karen Etheridge <[email protected]>
Date:   Mon Jan 30 13:04:43 2012 -0800

    add vim swap files to the ignored list for MANIFEST.SKIP.

M       dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP

commit 4738f432cc469351a2bd5a146e850f79a6bc311a
Author: brian d foy <[email protected]>
Date:   Tue Dec 6 03:42:43 2011 -0600

    RT 72933: Ignore files from prove

M       dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP
-----------------------------------------------------------------------

Summary of changes:
 dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP |  4 +++
 dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm   | 30 +++++++++++------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP 
b/dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP
index bea6874..725f84e 100644
--- a/dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP
+++ b/dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP
@@ -40,6 +40,7 @@
 \.tmp$
 \.#
 \.rej$
+\..*\.sw.?$
 
 # Avoid OS-specific files/dirs
 # Mac OSX metadata
@@ -51,5 +52,8 @@
 \bcover_db\b
 \bcovered\b
 
+# Avoid prove files
+\B\.prove$
+
 # Avoid MYMETA files
 ^MYMETA\.
diff --git a/dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm 
b/dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm
index 5bcd6d6..165a15c 100644
--- a/dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm
+++ b/dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm
@@ -8,24 +8,22 @@ use File::Find;
 use File::Spec;
 use Carp;
 use strict;
+use warnings;
 
-use vars qw($VERSION @ISA @EXPORT_OK
-          $Is_MacOS $Is_VMS $Is_VMS_mode $Is_VMS_lc $Is_VMS_nodot
-          $Debug $Verbose $Quiet $MANIFEST $DEFAULT_MSKIP);
+use Exporter 5.57 'import';
 
-$VERSION = '1.63';
-@ISA=('Exporter');
-@EXPORT_OK = qw(mkmanifest
+our $VERSION = '1.64';
+our @EXPORT_OK = qw(mkmanifest
                 manicheck  filecheck  fullcheck  skipcheck
                 manifind   maniread   manicopy   maniadd
                 maniskip
                );
 
-$Is_MacOS = $^O eq 'MacOS';
-$Is_VMS   = $^O eq 'VMS';
-$Is_VMS_mode = 0;
-$Is_VMS_lc = 0;
-$Is_VMS_nodot = 0;  # No dots in dir names or double dots in files
+our $Is_MacOS = $^O eq 'MacOS';
+our $Is_VMS   = $^O eq 'VMS';
+our $Is_VMS_mode = 0;
+our $Is_VMS_lc = 0;
+our $Is_VMS_nodot = 0;  # No dots in dir names or double dots in files
 
 if ($Is_VMS) {
     require VMS::Filespec if $Is_VMS;
@@ -53,13 +51,13 @@ if ($Is_VMS) {
     $Is_VMS_nodot = 0 if ($vms_efs);
 }
 
-$Debug   = $ENV{PERL_MM_MANIFEST_DEBUG} || 0;
-$Verbose = defined $ENV{PERL_MM_MANIFEST_VERBOSE} ?
+our $Debug   = $ENV{PERL_MM_MANIFEST_DEBUG} || 0;
+our $Verbose = defined $ENV{PERL_MM_MANIFEST_VERBOSE} ?
                    $ENV{PERL_MM_MANIFEST_VERBOSE} : 1;
-$Quiet = 0;
-$MANIFEST = 'MANIFEST';
+our $Quiet = 0;
+our $MANIFEST = 'MANIFEST';
 
-$DEFAULT_MSKIP = File::Spec->catfile( dirname(__FILE__), "$MANIFEST.SKIP" );
+our $DEFAULT_MSKIP = File::Spec->catfile( dirname(__FILE__), "$MANIFEST.SKIP" 
);
 
 
 =head1 NAME

--
Perl5 Master Repository

Reply via email to