Bump to version 0.38, update META in Makefile.PL and add to Changes

jib · Aug 8, 2011 · e6643c7 · e6643c7
1 parent 0d1c005
commit e6643c7
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,8 @@
+0.38  Mon Aug  8 21:38:10 2011
+================================
+    - Resolve RT 69984 reported by Thomas Johnson
+      ( Array handling regression when using equals format )
+
 0.36  Fri Jul  1 14:38:57 2011
 ================================
     - Fix for RT 68913 reported by Michael Lackhoff

diff --git a/Makefile.PL b/Makefile.PL
@@ -2,7 +2,6 @@ use ExtUtils::MakeMaker;
 
 use strict;
 use Getopt::Std;
-use Data::Dumper;
 my $opts = {};
 getopts( 'x', $opts );
 
@@ -26,13 +25,39 @@ my $prereqs = {
 };
 delete $prereqs->{'XML::Simple'} unless $opts->{'x'};
 
-WriteMakefile(
+WriteMakefile1(
+    LICENSE => 'perl',
+    META_MERGE => {
+        resources => {
+            repository => 'https://github.com/jib/config-auto',
+        },
+    },
     'NAME'		        => 'Config::Auto',
     'VERSION_FROM'	    => 'lib/Config/Auto.pm', # finds $VERSION
     'PREREQ_PM'		    => $prereqs,
-    ( $] >= 5.005
-        ? ( ABSTRACT_FROM    => 'lib/Config/Auto.pm',
-            AUTHOR           => 'Jos I. Boumans <kane@cpan.org>')
-        : ()
-    ),
+    ABSTRACT_FROM => 'lib/Config/Auto.pm',
+    AUTHOR => 'Jos I. Boumans <kane@cpan.org>',
 );
+
+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);
+}
diff --git a/lib/Config/Auto.pm b/lib/Config/Auto.pm
@@ -7,7 +7,7 @@ use Carp qw[croak];
 
 use vars qw[$VERSION $DisablePerl $Untaint $Debug];
 
-$VERSION        = '0.36';
+$VERSION        = '0.38';
 $DisablePerl    = 0;
 $Untaint        = 0;
 $Debug          = 0;