Merge remote branch 'origin/master'

* origin/master:
  Explain why we depend on Module::Install
  Make sure we include needed rcopy dependency
  Update Changes
  Increase ConfigLoader dep from 0.23 to 0.30.

diff --git a/Changes b/Changes
index 4e8a8d5..cffec10 100644 (file)
--- a/Changes
+++ b/Changes
@@ -20,6 +20,9 @@ This file documents the revision history for Perl extension Catalyst-Devel.
         - Don't pollute M::I plugin detector with GetOptions symbol from
           GetOpt::Long
         - Fix typo in share/script/myapp_server.pl.tt (RT #58475)
+        - Increased Catalyst::Plugin::ConfigLoader dependency to 0.30
+        - Include File::Copy::Recursive in inc/ when building a dist of an
+          application.
 
 1.28 2010-06-16 02:43:00
         - Fix generated Pod tests so that the first check is if the TEST_POD

diff --git a/Makefile.PL b/Makefile.PL
index 2e19d5d..2148282 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -14,14 +14,20 @@ requires 'namespace::autoclean';
 requires 'Catalyst'    => '5.80015';
 requires 'Catalyst::Action::RenderView' => '0.10';
 requires 'Catalyst::Plugin::Static::Simple' => '0.28';
-requires 'Catalyst::Plugin::ConfigLoader' => '0.23';
+requires 'Catalyst::Plugin::ConfigLoader' => '0.30';
 requires 'Config::General' => '2.42'; # as of 1.07, we use .conf and not .yaml
 requires 'File::ChangeNotify' => '0.07';
 requires 'File::Copy::Recursive';
-requires 'Module::Install' => '0.91';
 requires 'Path::Class' => '0.09';
 requires 'Template'    => '2.14';
 
+# The Catalyst applications this module distribution have a Makefile.PL using
+# Module::Install as well as the Module::Install::Catalyst extension included in
+# this distribution. Therefore we really *depend* on Module::Install to be
+# installed, even though we also use it to build this distribution and include
+# it in its inc/ directory for releases.
+requires 'Module::Install' => '0.91';
+
 author_requires 'IPC::Run3';
 author_requires 'Module::Info';
 author_requires 'File::Find::Rule';

diff --git a/lib/Module/Install/Catalyst.pm b/lib/Module/Install/Catalyst.pm
index 5d45b69..d081c33 100644 (file)
--- a/lib/Module/Install/Catalyst.pm
+++ b/lib/Module/Install/Catalyst.pm
@@ -8,7 +8,7 @@ require Module::Install::Base;
 
 use File::Find;
 use FindBin;
-use File::Copy::Recursive 'rcopy';
+use File::Copy::Recursive;
 use File::Spec ();
 use Getopt::Long ();
 use Data::Dumper;
@@ -58,6 +58,14 @@ command called in C<Makefile.PL>.
 
 sub catalyst {
     my $self = shift;
+
+    if($Module::Install::AUTHOR) {
+        $self->admin->copy_package(
+            'File::Copy::Recursive',
+            $INC{"File/Copy/Recursive.pm"},
+        );
+    }
+
     print <<EOF;
 *** Module::Install::Catalyst
 EOF