[Catalyst-commits] r10014 - Catalyst-Devel/1.00/branches/improved-restarter

[autarch at dev.catalyst.perl.org]

Author: autarch
Date: 2009-05-05 15:51:00 +0000 (Tue, 05 May 2009)
New Revision: 10014

Modified:
   Catalyst-Devel/1.00/branches/improved-restarter/
   Catalyst-Devel/1.00/branches/improved-restarter/Changes
   Catalyst-Devel/1.00/branches/improved-restarter/Makefile.PL
Log:
merge trunk to improved-restarter branch


Property changes on: Catalyst-Devel/1.00/branches/improved-restarter
___________________________________________________________________
Name: svk:merge
   - 4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Devel/1.00/trunk:9858
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Devel:6899
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Helper:4258
   + 4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Devel/1.00/trunk:9967
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Devel:6899
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Helper:4258

Modified: Catalyst-Devel/1.00/branches/improved-restarter/Changes
===================================================================
--- Catalyst-Devel/1.00/branches/improved-restarter/Changes	2009-05-05 15:36:26 UTC (rev 10013)
+++ Catalyst-Devel/1.00/branches/improved-restarter/Changes	2009-05-05 15:51:00 UTC (rev 10014)
@@ -1,5 +1,7 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
+        - kill C3 warning on 5.10, add resources to META.yml (caelum)
+
 1.12    2009-04-26 15:42
         - Remove the deprecated BindLex from the _create.pl help message (rafl)
 

Modified: Catalyst-Devel/1.00/branches/improved-restarter/Makefile.PL
===================================================================
--- Catalyst-Devel/1.00/branches/improved-restarter/Makefile.PL	2009-05-05 15:36:26 UTC (rev 10013)
+++ Catalyst-Devel/1.00/branches/improved-restarter/Makefile.PL	2009-05-05 15:51:00 UTC (rev 10014)
@@ -57,6 +57,27 @@
     }
 }
 
+# kill warning from older versions of Class::C3
+if ($] >= 5.009_005 && can_use('Class::C3') && !can_use('Class::C3', 0.20)) {
+    requires 'Class::C3' => '0.20';
+}
+
 auto_install;
 
 WriteAll;
+
+if ($Module::Install::AUTHOR) {
+    Meta->{values}{resources} = [
+        [ 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst' ],
+        [ 'IRC'         => 'irc://irc.perl.org/#catalyst' ],
+        [ 'license',    => 'http://dev.perl.org/licenses/' ],
+        [ 'homepage',   => 'http://dev.catalyst.perl.org/'],
+        [ 'repository', => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Devel/' ],
+    ];
+
+    Meta->{values}{requires} = [ grep {
+        $_->[0] ne 'Class::C3'
+    } @{ Meta->{values}{requires} } ];
+
+    Meta->write;
+}