Merge branch 'release/0.70' into develop

gugod · Sep 2, 2014 · e41c27c · e41c27c
2 parents c33b650 + cafdba9
commit e41c27c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/Changes b/Changes
@@ -1,3 +1,4 @@
+0.70: # 2014-09-02T20:41:15+0900
 - download the fatpacked perlbrew from an http:// url.
 - protect fatpacked perlbrew from PERL5LIB, thanks to dagolden++
 - avoid several warnings, thanks to DabeDotCom++

diff --git a/lib/App/perlbrew.pm b/lib/App/perlbrew.pm
@@ -2,7 +2,7 @@ package App::perlbrew;
 use strict;
 use warnings;
 use 5.008;
-our $VERSION = "0.69";
+our $VERSION = "0.70";
 use Config;
 
 BEGIN {

diff --git a/perlbrew b/perlbrew
@@ -13,7 +13,7 @@ $fatpacked{"App/perlbrew.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'AP
   use strict;
   use warnings;
   use 5.008;
-  our $VERSION = "0.69";
+  our $VERSION = "0.70";
   use Config;
   
   BEGIN {
@@ -150,7 +150,7 @@ $fatpacked{"App/perlbrew.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'AP
           $HTTP_USER_AGENT_PROGRAM ||= do {
               my $program;
   
-              for my $p (sort {$commands{$a}<=>$commands{$b}} keys %commands) {
+              for my $p (sort {$commands{$a}{order}<=>$commands{$b}{order}} keys %commands) {
                   my $code = system("$p $commands{$p}->{test}") >> 8;
                   if ($code != 127) {
                       $program = $p;
@@ -3104,7 +3104,7 @@ APP_PERLBREW
 
 $fatpacked{"CPAN/Perl/Releases.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'CPAN_PERL_RELEASES';
   package CPAN::Perl::Releases;
-  $CPAN::Perl::Releases::VERSION = '1.78';
+  $CPAN::Perl::Releases::VERSION = '1.82';
   #ABSTRACT: Mapping Perl releases on CPAN to the location of the tarballs
   
   use strict;
@@ -3250,6 +3250,8 @@ $fatpacked{"CPAN/Perl/Releases.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n"
   "5.21.0" => { id => 'RJBS' },
   "5.21.1" => { id => 'WOLFSAGE' },
   "5.21.2" => { id => 'ABIGAIL' },
+  "5.21.3" => { id => 'PCM' },
+  "5.20.1-RC1" => { id => 'SHAY' },
   };
   
   sub perl_tarballs {
@@ -3306,7 +3308,7 @@ $fatpacked{"CPAN/Perl/Releases.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n"
   
   =head1 VERSION
   
-  version 1.78
+  version 1.82
   
   =head1 SYNOPSIS
   
@@ -3385,7 +3387,7 @@ $fatpacked{"Capture/Tiny.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'CA
   use warnings;
   package Capture::Tiny;
   # ABSTRACT: Capture STDOUT and STDERR from Perl, XS or external programs
-  our $VERSION = '0.24'; # VERSION
+  our $VERSION = '0.25'; # VERSION
   use Carp ();
   use Exporter ();
   use IO::Handle ();
@@ -3802,7 +3804,7 @@ $fatpacked{"Capture/Tiny.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'CA
   
   =head1 VERSION
   
-  version 0.24
+  version 0.25
   
   =head1 SYNOPSIS
   
@@ -4206,10 +4208,22 @@ $fatpacked{"Capture/Tiny.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'CA
   
   David Golden <dagolden@cpan.org>
   
-  =head1 CONTRIBUTOR
+  =head1 CONTRIBUTORS
+  
+  =for stopwords Dagfinn Ilmari Mannsåker David E. Wheeler
+  
+  =over 4
+  
+  =item *
   
   Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
   
+  =item *
+  
+  David E. Wheeler <david@justatheory.com>
+  
+  =back
+  
   =head1 COPYRIGHT AND LICENSE
   
   This software is Copyright (c) 2009 by David Golden.