From: Florian Ragwitz <rafl@debian.org>
Date: Wed, 1 Jun 2011 20:20:41 +0000 (+0200)
Subject: Merge branch 'master' into psgi
X-Git-Tag: 5.89003~39
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=1126710650625d97b4fba9965ea55092bcc46095;hp=-c

Merge branch 'master' into psgi

* master:
  Unbreak remote server tests
  Add MYMETA.yml to .gitignore
  Add missing Catalyst::Devel author dep
  Append $\ in Catalyst::Response->print
---

1126710650625d97b4fba9965ea55092bcc46095
diff --combined Makefile.PL
index 6083b74,0f1481d..2ff732c
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -19,11 -19,9 +19,11 @@@ requires 'namespace::clean' => '0.13'
  requires 'B::Hooks::EndOfScope' => '0.08';
  requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903';
  requires 'Class::MOP' => '0.95';
 +requires 'Data::OptList';
  requires 'Moose' => '1.03';
  requires 'MooseX::MethodAttributes::Inheritable' => '0.24';
  requires 'MooseX::Role::WithOverloading' => '0.09';
 +requires 'MooseX::Types::LoadableClass' => '0.003';
  requires 'Carp';
  requires 'Class::C3::Adopt::NEXT' => '0.07';
  requires 'CGI::Simple::Cookie' => '1.109';
@@@ -45,7 -43,6 +45,7 @@@ requires 'Text::SimpleTable' => '0.03'
  requires 'Time::HiRes';
  requires 'Tree::Simple' => '1.15';
  requires 'Tree::Simple::Visitor::FindByPath';
 +requires 'Try::Tiny';
  requires 'URI' => '1.35';
  requires 'Task::Weaken';
  requires 'Text::Balanced'; # core in 5.8.x but mentioned for completeness
@@@ -54,14 -51,10 +54,14 @@@ requires 'MooseX::Getopt' => '0.30'
  requires 'MooseX::Types';
  requires 'MooseX::Types::Common::Numeric';
  requires 'String::RewritePrefix' => '0.004'; # Catalyst::Utils::resolve_namespace
 +requires 'Plack' => '0.9974'; # IIS6 fix middleware
 +requires 'Plack::Middleware::ReverseProxy' => '0.04';
 +requires 'Plack::Test::ExternalServer';
  
  test_requires 'Class::Data::Inheritable';
  test_requires 'Test::Exception';
  test_requires 'Test::More' => '0.88';
 +test_requires 'Data::Dump';
  
  # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available
  if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.364')) {
@@@ -76,13 -69,14 +76,14 @@@ else 
  
  author_requires 'CatalystX::LeakChecker', '0.05';
  author_requires 'File::Copy::Recursive'; # For http server test
+ author_requires 'Catalyst::Devel', '1.0'; # For http server test
  
  author_tests 't/author';
  author_requires(map {; $_ => 0 } qw(
    Test::NoTabs
    Test::Pod
    Test::Pod::Coverage
 -  Pod::Coverage
 +  Pod::Coverage::TrustPod
  ));
  
  if ($Module::Install::AUTHOR) {