Merge 'trunk' into 'helper_refactor'

r10268@t0mlaptop (orig r10267):  autarch | 2009-05-24 16:56:38 +0100
Doh, accidentally left in use threads & Thread::Cancel

r10269@t0mlaptop (orig r10268):  autarch | 2009-05-24 16:57:46 +0100
Add changes for 1.17

r10270@t0mlaptop (orig r10269):  rafl | 2009-05-24 17:19:34 +0100
Version 1.17.
r10273@t0mlaptop (orig r10272):  autarch | 2009-05-24 19:09:15 +0100
Add an 's'

r10342@t0mlaptop (orig r10341):  t0m | 2009-05-28 11:35:08 +0100
Bump required versions of Module::Install in Makefile.PL
r10377@t0mlaptop (orig r10376):  autarch | 2009-05-29 23:28:39 +0100
We need to capture @ARGV in the restarter, for the benefit of Win32
only, so that it can re-execute itself with the right
options. Getopt::Long eats @ARGV before we have a chance to get to it.
r10378@t0mlaptop (orig r10377):  autarch | 2009-05-29 23:29:29 +0100
Changes for my win32 fix

r10409@t0mlaptop (orig r10408):  autarch | 2009-06-01 20:42:28 +0100
Wait on the child process before starting a new child - hopefully will
fix intermittent problems arcanez reported where the restarter cannot
start a new child because the port is not available.

r10410@t0mlaptop (orig r10409):  autarch | 2009-06-01 20:43:39 +0100
Doc changes for forking restarter

r10491@t0mlaptop (orig r10490):  kmx | 2009-06-09 20:04:59 +0100
C::Devel - handling some "Use of uninit. value" warnings in Module::Install::Catalyst
r10496@t0mlaptop (orig r10495):  rafl | 2009-06-10 18:03:17 +0100
Version 1.18.
r10550@t0mlaptop (orig r10549):  t0m | 2009-06-16 09:36:04 +0100
Merge gsoc branch down. Specifically merged some revisions, but may have missed some - need to specifically check a TestApp generated before and after this branch to ensure nothing 'got lost' - note I have note done this yet as it's time => work
r10557@t0mlaptop (orig r10556):  t0m | 2009-06-16 20:54:16 +0100
Lets compile. That would be novel. merge fail
r10708@t0mlaptop (orig r10707):  rafl | 2009-06-28 18:53:11 +0100
Always use unix paths in generated Makefile.PLs.
r10711@t0mlaptop (orig r10710):  dhoss | 2009-06-28 22:37:27 +0100
removed crap

r10712@t0mlaptop (orig r10711):  t0m | 2009-06-28 22:42:08 +0100
Remove warnings
r10713@t0mlaptop (orig r10712):  t0m | 2009-06-28 22:42:57 +0100
Remove blank file, add more ignore props
r10714@t0mlaptop (orig r10713):  t0m | 2009-06-28 22:54:48 +0100
Un-merge r10556:10548 leaving gsoc code in branch as whilst all the things have been fixed in the branch we need to release this first step, I can't be bothered cherry picking them, so I'm just going to give up with Catalyst::Script::* is baked
r10717@t0mlaptop (orig r10716):  rafl | 2009-06-28 23:41:32 +0100
Version 1.19.
r10768@t0mlaptop (orig r10767):  t0m | 2009-07-01 15:50:39 +0100
Need File::ChangeNotify => 0.06
r10999@t0mlaptop (orig r10998):  jester | 2009-07-29 20:58:23 +0100
POD tweak (Oleg Kostyuk)
r11120@t0mlaptop (orig r11119):  rafl | 2009-08-11 21:34:22 +0100
Bump the File::ChangeNotify prereq some more.
r11121@t0mlaptop (orig r11120):  rafl | 2009-08-11 21:34:29 +0100
Version 1.20.
r11250@t0mlaptop (orig r11249):  frew | 2009-08-26 19:33:32 +0100
Fix -I issues for win32
r11251@t0mlaptop (orig r11250):  frew | 2009-08-26 19:49:25 +0100
Fix -I issues for win32 (Changelog)
r11265@t0mlaptop (orig r11264):  rafl | 2009-08-28 14:00:32 +0100
Exclude more crap.
r11484@t0mlaptop (orig r11454):  t0m | 2009-10-05 22:30:59 +0100
Why is 4 randomly hard coded there. If we can't get it from the right place, go bang
r11649@t0mlaptop (orig r11614):  autarch | 2009-10-18 18:18:15 +0100
Fix the "eternally growing stack trace" problem with the restarter.

Added this to changes, and cleaned up Changes text for the other change in there.
r11650@t0mlaptop (orig r11615):  autarch | 2009-10-18 18:19:18 +0100
Clarify comment.

r11651@t0mlaptop (orig r11616):  t0m | 2009-10-18 18:35:51 +0100
Bump versions
r11673@t0mlaptop (orig r11638):  autarch | 2009-10-20 03:37:31 +0100
Fixed a typo in Changes

r11690@t0mlaptop (orig r11655):  jawnsy | 2009-10-21 03:49:58 +0100
Bring copyright statement in sync with the other packages
r11817@t0mlaptop (orig r11782):  dew | 2009-11-07 19:19:38 +0000
Don't monitor t/, root/ and hidden dirs
r11818@t0mlaptop (orig r11783):  dew | 2009-11-07 22:22:08 +0000
Add entry in Changes describing r11782
r12036@t0mlaptop (orig r12001):  kasimon | 2009-11-24 13:53:49 +0000
Added POD description for some methods.
Added debian-specific files to ignore list.
Fixed subversion pattern in ignore list.

r12037@t0mlaptop (orig r12002):  kasimon | 2009-11-24 14:28:38 +0000
Add Changes entry for last commit

diff --cc Makefile.PL
index 7c981f6,7d1bba1..95e2d98
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -10,10 -7,11 +10,10 @@@ requires 'Catalyst'    => '5.8000'
  requires 'Catalyst::Action::RenderView' => '0.04';
  requires 'Catalyst::Plugin::Static::Simple' => '0.16';
  requires 'Catalyst::Plugin::ConfigLoader';
 -requires 'Class::Accessor::Fast';
  requires 'Config::General' => '2.42'; # as of 1.07, we use .conf and not .yaml
- requires 'File::ChangeNotify' => '0.03';
+ requires 'File::ChangeNotify' => '0.07';
  requires 'File::Copy::Recursive';
- requires 'Module::Install' => '0.64';
+ requires 'Module::Install' => '0.91';
  requires 'parent'; # as of 1.04
  requires 'Path::Class' => '0.09';
  requires 'Template'    => '2.14';

diff --cc lib/Catalyst/Devel.pm
index 5740059,2266685..416088d
--- 1/lib/Catalyst/Devel.pm
--- 2/lib/Catalyst/Devel.pm
+++ b/lib/Catalyst/Devel.pm
@@@ -3,8 -3,8 +3,8 @@@ package Catalyst::Devel
  use strict;
  use warnings;
  
- our $VERSION             = '1.16';
+ our $VERSION             = '1.21';
 -our $CATALYST_SCRIPT_GEN = 39;
 +our $CATALYST_SCRIPT_GEN = 40;
  
  $VERSION = eval $VERSION;
  

diff --cc lib/Catalyst/Helper.pm
index 5df10e6,4100954..6a052e6
--- 1/lib/Catalyst/Helper.pm
--- 2/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@@ -1,7 -1,11 +1,8 @@@
  package Catalyst::Helper;
 -
 -use strict;
 -use warnings;
 -use base 'Class::Accessor::Fast';
 +use Moose;
  use Config;
  use File::Spec;
+ use File::Spec::Unix;
  use File::Path;
  use FindBin;
  use IO::File;