From: Tomas Doran <bobtfish@bobtfish.net>
Date: Thu, 13 Oct 2011 14:53:32 +0000 (+0100)
Subject: Merge
X-Git-Tag: 1.36~6
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4510da8ce5c8452ed8e51525293384330c82ca9e;hp=f92829b5bc44706c1a673f7bddfeac84abdd0c9e;p=catagits%2FCatalyst-Devel.git

Merge
---

diff --git a/Changes b/Changes
index 1fd2457..2657654 100644
--- a/Changes
+++ b/Changes
@@ -1,9 +1,15 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
-1.35 ????
+        - bump Module::Install dep to 1.02
         - Removed stderr hiding from 'make catalyst_par' to display errors 
           from PAR::Packer
 
+1.35 2011-09-05 13:05:00
+        - Stop requiring Starman and MooseX::Daemonize on Win32 as they're
+          optional components in Catalyst::Runtime and won't install
+          on Windows.
+        - Fix test to work on Windows. 
+
 1.34 2011-08-16 09:02:00
         - Bump required version of Catalyst to 5.9
         - Merge psgi support. catalyst.pl will now generate a default
diff --git a/Makefile.PL b/Makefile.PL
index e3b05be..ce47a68 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -21,19 +21,24 @@ requires 'File::ChangeNotify' => '0.07';
 requires 'File::Copy::Recursive';
 requires 'Path::Class' => '0.09';
 requires 'Template'    => '2.14';
-requires 'MooseX::Daemonize'; # Optional in scripts
-requires 'Starman'; # Optional in scripts
+
+if (!$Module::Install::AUTHOR && $^O ne 'MSWin32') {
+    requires 'MooseX::Daemonize'; # Optional in scripts
+    requires 'Starman'; # Optional in scripts
+}
 
 # 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';
+requires 'Module::Install' => '1.02';
 
 author_requires 'IPC::Run3';
 author_requires 'Module::Info';
 author_requires 'File::Find::Rule';
+author_requires 'Test::Pod';
+author_requires 'Test::Pod::Coverage';
 
 test_requires 'Test::More' => '0.94';
 test_requires 'Test::Fatal' => '0.003';
@@ -42,13 +47,6 @@ install_share 'share';
 
 author_tests 't/author';
 
-if ( $^O eq 'MSWin32' ) {
-    # Proc::Background needs this on Win32 but doesn't actually
-    # require it, if it's missing it just dies in the Makefile.PL.
-    requires 'Win32::Process' => '0.04';
-    requires 'Proc::Background';
-}
-
 if (!$ENV{CATALYST_DEVEL_NO_510_CHECK}) {
     use Symbol 'gensym';
     use IPC::Open3;
diff --git a/lib/Catalyst/Devel.pm b/lib/Catalyst/Devel.pm
index 6f2a7eb..bfaa906 100644
--- a/lib/Catalyst/Devel.pm
+++ b/lib/Catalyst/Devel.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 # Change Catalyst::Helper also.
-our $VERSION             = '1.34';
+our $VERSION             = '1.35';
 our $CATALYST_SCRIPT_GEN = 40;
 
 $VERSION = eval $VERSION;
diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index a5cf5a2..976de96 100644
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -19,7 +19,7 @@ use namespace::autoclean;
 with 'MooseX::Emulate::Class::Accessor::Fast';
 
 # Change Catalyst/Devel.pm also
-our $VERSION = '1.34';
+our $VERSION = '1.35';
 
 my %cache;
 
diff --git a/share/Makefile.PL.tt b/share/Makefile.PL.tt
index ae47abd..5aab86a 100644
--- a/share/Makefile.PL.tt
+++ b/share/Makefile.PL.tt
@@ -1,7 +1,7 @@
 [% startperl %]
 # IMPORTANT: if you delete this file your app will not work as
 # expected.  You have been warned.
-use inc::Module::Install;
+use inc::Module::Install 1.02;
 use Module::Install::Catalyst; # Complain loudly if you don't have
                                # Catalyst::Devel installed or haven't said
                                # 'make dist' to create a standalone tarball.
diff --git a/t/render_file_contents.t b/t/render_file_contents.t
index 45b0253..0dbcb0d 100644
--- a/t/render_file_contents.t
+++ b/t/render_file_contents.t
@@ -20,7 +20,9 @@ ok( $helper->render_file_contents('example1',  $fn,
 ok -r $fn;
 ok -s $fn;
 my $perms = ( stat $fn )[2] & 07777;
-is $perms, 0677;
+unless ($^O eq 'MSWin32') {
+    is $perms, 0677;
+}
 unlink $fn;
 
 done_testing;