- remove borked tag again

- fix Catalyst.pm version number and build files

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index de04e5d..2887d97 100644 (file)
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -23,6 +23,7 @@
 \.bak$
 \#$
 \b\.#
+\.DS_Store$
 
 # Avoid Apache::Test files
 t/conf/apache_test_config.pm

diff --git a/Makefile.PL b/Makefile.PL
deleted file mode 100644 (file)
index 51d31fd..0000000
--- a/Makefile.PL
+++ /dev/null
@@ -1,31 +0,0 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
-    
-    unless (eval "use Module::Build::Compat 0.02; 1" ) {
-      print "This module requires Module::Build to install itself.\n";
-      
-      require ExtUtils::MakeMaker;
-      my $yn = ExtUtils::MakeMaker::prompt
-       ('  Install Module::Build now from CPAN?', 'y');
-      
-      unless ($yn =~ /^y/i) {
-       die " *** Cannot install without Module::Build.  Exiting ...\n";
-      }
-      
-      require Cwd;
-      require File::Spec;
-      require CPAN;
-      
-      # Save this 'cause CPAN will chdir all over the place.
-      my $cwd = Cwd::cwd();
-      my $makefile = File::Spec->rel2abs($0);
-      
-      CPAN::Shell->install('Module::Build::Compat')
-       or die " *** Cannot install without Module::Build.  Exiting ...\n";
-      
-      chdir $cwd or die "Cannot chdir() back to $cwd: $!";
-    }
-    eval "use Module::Build::Compat 0.02; 1" or die $@;
-    use lib '_build/lib';
-    Module::Build::Compat->run_build_pl(args => \@ARGV);
-    require Module::Build;
-    Module::Build::Compat->write_makefile(build_class => 'Module::Build');

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index b3d2a54..15b3ea3 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -54,7 +54,7 @@ __PACKAGE__->engine_class('Catalyst::Engine::CGI');
 __PACKAGE__->request_class('Catalyst::Request');
 __PACKAGE__->response_class('Catalyst::Response');
 
-our $VERSION = '5.49_05';
+our $VERSION = '5.5';
 
 sub import {
     my ( $class, @arguments ) = @_;