begin 2.06, fix t/apache_mvc.t, restore Sebastian's name to Maypole.pm

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@328 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index 21a9053ddb25a491452d797976495b0efaba3463..64f042b46de542d6bb6a108d29bd970fb331786a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -2,6 +2,10 @@ This file documents the revision history for Perl extension Maypole.
 For information about current developments and future releases, see:
     http://maypole.perl.org/?TheRoadmap
 
+2.06  XXX
+    Fixes:
+    - #9129: Skip t/apache_mvc.t if Apache::Request isn't installed
+
 2.05  Fri Dec 24 03:20:00 2004
     - Revised and updated documentation. Many thanks to Dave Howorth for his
       hard work and 120kb documentation patches.

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 4539c9dbdb5cf26593920f3be2466f0cfbe0d6e2..6bbe9b61cc4e0330773d1dea16b841ddedf5043f 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -1,6 +1,6 @@
 package Apache::MVC;
 
-our $VERSION = '2.05';
+our $VERSION = '2.06';
 
 use strict;
 use warnings;

diff --git a/lib/CGI/Maypole.pm b/lib/CGI/Maypole.pm
index 7b19023fbff86417ed528f867fd1b138cc95ea43..9c025ec462ce28490675ed90e276b9c756879230 100644 (file)
--- a/lib/CGI/Maypole.pm
+++ b/lib/CGI/Maypole.pm
@@ -6,7 +6,7 @@ use warnings;
 use CGI::Simple;
 use Maypole::Headers;
 
-our $VERSION = '2.05';
+our $VERSION = '2.06';
 
 sub run {
     my $self = shift;

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index e89cef0af6ce89865530e566592e3e010127bdf1..39a776a7691c19e62cb24ae3a345c5e6a63d6905 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -7,7 +7,7 @@ use Maypole::Config;
 use Maypole::Constants;
 use Maypole::Headers;
 
-our $VERSION = '2.05';
+our $VERSION = '2.06';
 
 __PACKAGE__->mk_classdata($_) for qw( config init_done view_object );
 __PACKAGE__->mk_accessors(
@@ -492,11 +492,13 @@ Maypole is currently maintained by Simon Flack C<simonflk#cpan.org>
 
 Simon Cozens, C<simon#cpan.org>
 
+Sebastian Riedel, C<sri#oook.de> maintained Maypole from 1.8 to 2.04
+
 =head1 THANKS TO
 
-Danijel Milicevic, Dave Slack, Jesse Sheidlower, Jody Belka, Marcus Ramberg,
-Mickael Joanne, Randal Schwartz, Simon Flack, Steve Simms, Veljko Vidovic
-and all the others who've helped.
+Sebastian Riedel, Danijel Milicevic, Dave Slack, Jesse Sheidlower, Jody Belka,
+Marcus Ramberg, Mickael Joanne, Randal Schwartz, Simon Flack, Steve Simms,
+Veljko Vidovic and all the others who've helped.
 
 =head1 LICENSE
 

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index d7af65d4b06c7ec0587159a978e1acbd509ceeed..01dd6148f49806baee4cb5929c327f669b8bdf31 100644 (file)
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -7,7 +7,7 @@ use Maypole;
 use Maypole::Config;
 
 our @ISA;
-our $VERSION = '2.05';
+our $VERSION = '2.06';
 
 sub import {
     my ( $self, @plugins ) = @_;

diff --git a/t/apache_mvc.t b/t/apache_mvc.t
index 9a3eafdb09b71ee081f0d14d3ac1940b13fd4aca..07bfae931f95da2405b407a4c18ad3c8de911ed2 100644 (file)
--- a/t/apache_mvc.t
+++ b/t/apache_mvc.t
@@ -1,10 +1,14 @@
 #!/usr/bin/perl -w
 use strict;
 use Test::More;
-BEGIN { if (eval { require mod_perl }) { 
-            plan tests => 2;
-        } else { Test::More->import(skip_all =>"mod_perl is not installed: $@") }
-      }
+BEGIN {
+    if (eval { require Apache::Request }) {
+        plan tests => 2;
+    } else {
+        Test::More->import(skip_all =>"Apache::Request is not installed: $@");
+    }
+}
+
 require_ok('Apache::MVC');
 ok($Apache::MVC::VERSION, 'defines $VERSION');
 # defines $VERSION