summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Hay <steve.m.hay@googlemail.com>2014-04-18 18:05:09 +0100
committerSteve Hay <steve.m.hay@googlemail.com>2014-04-18 18:05:09 +0100
commitddfe1c9312c67206ed6a687c1259fc16d5058416 (patch)
tree4fa42a42da1aeea2539c5fb5da2e87208581a285
parentca3178e0ad8db63501396e99ca174e2bc98da1e4 (diff)
downloadperl-ddfe1c9312c67206ed6a687c1259fc16d5058416.tar.gz
Upgrade CPAN from version 2.05-TRIAL2 to 2.05
-rwxr-xr-xPorting/Maintainers.pl2
-rw-r--r--cpan/CPAN/lib/CPAN.pm2
-rw-r--r--pod/perldelta.pod2
3 files changed, 3 insertions, 3 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 92f7f6eadc..8114082d75 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -252,7 +252,7 @@ use File::Glob qw(:case);
},
'CPAN' => {
- 'DISTRIBUTION' => 'ANDK/CPAN-2.05-TRIAL2.tar.gz',
+ 'DISTRIBUTION' => 'ANDK/CPAN-2.05.tar.gz',
'FILES' => q[cpan/CPAN],
'EXCLUDED' => [
qr{^distroprefs/},
diff --git a/cpan/CPAN/lib/CPAN.pm b/cpan/CPAN/lib/CPAN.pm
index ace2b11bf6..4ed4b6cdd0 100644
--- a/cpan/CPAN/lib/CPAN.pm
+++ b/cpan/CPAN/lib/CPAN.pm
@@ -3758,7 +3758,7 @@ which to try in which order.
Henk P. Penning maintains a site that collects data about CPAN sites:
- http://www.cs.uu.nl/people/henkp/mirmon/cpan.html
+ http://mirrors.cpan.org/
Also, feel free to play with experimental features. Run
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 29b787bbd5..186500ddcc 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -44,7 +44,7 @@ keep in sync with the latest CPAN release.
=item *
-L<CPAN> has been upgraded from version 2.04-TRIAL to 2.05-TRIAL2.
+L<CPAN> has been upgraded from version 2.04-TRIAL to 2.05.
This fixes L<local::lib> shell variable string output and prevents an endless
loop when running "notest test Module" for some Module having dependencies.