From 3f3f95d5fdfacddf4d89137f62cde7858dc23d08 Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Sat, 25 Dec 2004 02:59:51 +0000 Subject: [PATCH] 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 --- Changes | 4 ++++ lib/Apache/MVC.pm | 2 +- lib/CGI/Maypole.pm | 2 +- lib/Maypole.pm | 10 ++++++---- lib/Maypole/Application.pm | 2 +- t/apache_mvc.t | 12 ++++++++---- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Changes b/Changes index 21a9053..64f042b 100644 --- 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 4539c9d..6bbe9b6 100644 --- 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 7b19023..9c025ec 100644 --- 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 e89cef0..39a776a 100644 --- 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 Simon Cozens, C +Sebastian Riedel, C 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 d7af65d..01dd614 100644 --- 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 9a3eafd..07bfae9 100644 --- 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 -- 2.39.5