Require Config::General instead of YAML

diff --git a/Changes b/Changes
index 4c37d52..783c032 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,14 +1,20 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
 
+1.08    XXXX
+        - Require Config::General instead of YAML
+
 1.07    2008-05-28
         - helpers now create default :Path and index :Path :Args(0)
         - Moved Helper.pm to generate .conf rather than YAML
         - Made a warning in the generated Makefile.PL not to delete it.
         -  Incorrect generated pod.
+
 1.06   2008-04-09 08:19:00
         - load plugins in setup, not plugins. (ema_zep@libero.it)
+
 1.05   2008-04-07 11:55:00
         - Add missing parent dependency to created projects.
+
 1.04   2008-04-06 16:04:00
         - Update default actions in Root.pm
         - Patch Helper.pm so Module::Pluggable::Object ignores emacs temp
@@ -30,8 +36,8 @@ This file documents the revision history for Perl extension Catalyst-Devel.
         - added option to send errors to STDOUT in fastcgi script
 
 1.01   2006-09-17 23:49:00
-       - Upped M::I dependency
-          - fix for warnings
+        - Upped M::I dependency
+           - fix for warnings
 
 1.00    2006-07-06 19:23:00
         - Initial release

diff --git a/Makefile.PL b/Makefile.PL
index 60764a4..b57759f 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -3,17 +3,17 @@ use inc::Module::Install 0.64;
 name     'Catalyst-Devel';
 all_from 'lib/Catalyst/Devel.pm';
 
-requires 'Class::Accessor::Fast';
-requires 'Path::Class' => '0.09';
-requires 'Template'    => '2.14';
 requires 'Catalyst'    => '5.7000';
 requires 'Catalyst::Action::RenderView' => '0.04';
 requires 'Catalyst::Plugin::Static::Simple' => '0.16';
 requires 'Catalyst::Plugin::ConfigLoader';
-requires 'parent';
-requires 'YAML'        => '0.55';
-requires 'Module::Install' => '0.64';
+requires 'Class::Accessor::Fast';
+requires 'Config::General'; # as of 1.07, we use .conf and not .yaml
 requires 'File::Copy::Recursive';
+requires 'Module::Install' => '0.64';
+requires 'parent'; # as of 1.04
+requires 'Path::Class' => '0.09';
+requires 'Template'    => '2.14';
 
 auto_install;
 

diff --git a/lib/Catalyst/Devel.pm b/lib/Catalyst/Devel.pm
index be0b747..9593e5c 100644 (file)
--- a/lib/Catalyst/Devel.pm
+++ b/lib/Catalyst/Devel.pm
@@ -3,7 +3,7 @@ package Catalyst::Devel;
 use strict;
 use warnings;
 
-our $VERSION             = '1.07';
+our $VERSION             = '1.08';
 our $CATALYST_SCRIPT_GEN = 31;
 
 =head1 NAME