Merge branch 'psgi'

* psgi:
  Add optional script deps to the -Devel installed package
  Adapt to recent -Runtime changes
  Create myapp.psgi

diff --git a/.gitignore b/.gitignore
index b564fdd..cb57fca 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ Debian*
 README
 Catalyst-Devel-*
 *.bs
+MYMETA.yml

diff --git a/Changes b/Changes
index 2930433..87602bd 100644 (file)
--- a/Changes
+++ b/Changes
@@ -2,6 +2,8 @@ This file documents the revision history for Perl extension Catalyst-Devel.
 
         - Fix scripts being generated mode 0700, rather than 0755
         - Fix duplicate 'use Test::More' statement in generated components.
+        - Fix Pod for catalyst_ignore function in Module::Install::Catalyst
+          RT#68563
 
 1.33 2011-03-24 15:10:00
         - Fix a regression introduced in 1.32 that caused Catalyst::Restarter

diff --git a/lib/Module/Install/Catalyst.pm b/lib/Module/Install/Catalyst.pm
index 5230d6f..4c47bff 100644 (file)
--- a/lib/Module/Install/Catalyst.pm
+++ b/lib/Module/Install/Catalyst.pm
@@ -114,7 +114,7 @@ sub catalyst_ignore_all {
     @IGNORE = @$ignore;
 }
 
-=head2 catalyst_ignore(\@ignore)
+=head2 catalyst_ignore(@ignore)
 
 Add a regexp to the list of ignored patterns. Can be called multiple times.