Checking in changes prior to tagging of version 1.101. Changelog diff is:

Index: Changes
===================================================================
--- Changes	(revision 9270)
+++ Changes	(working copy)
@@ -1,3 +1,5 @@
+1.101
+  - Fix dependencies in Makefile.PL, merge fail :/
 1.100
   - Refactor into a Moose Role for use with alternate views. (rafl)
   - Additional documentation (t0m)

diff --git a/Changes b/Changes
index a63c95c..193e5fb 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+1.101
+  - Fix dependencies in Makefile.PL, merge fail :/
 1.100
   - Refactor into a Moose Role for use with alternate views. (rafl)
   - Additional documentation (t0m)

diff --git a/Makefile.PL b/Makefile.PL
index d6c1f7b..2666861 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,6 +7,8 @@ requires 'Catalyst::Runtime';
 requires 'Catalyst::View::TT';
 requires 'HTTP::Negotiate';
 requires 'MRO::Compat';
+requires 'MooseX::Types::Structured';
+requires 'MooseX::Types::Moose';
 
 test_requires 'Catalyst::Action::RenderView';
 test_requires 'Test::WWW::Mechanize::Catalyst';

diff --git a/lib/Catalyst/View/ContentNegotiation/XHTML.pm b/lib/Catalyst/View/ContentNegotiation/XHTML.pm
index 256804f..5ad775e 100644 (file)
--- a/lib/Catalyst/View/ContentNegotiation/XHTML.pm
+++ b/lib/Catalyst/View/ContentNegotiation/XHTML.pm
@@ -8,7 +8,7 @@ use HTTP::Negotiate qw/choose/;
 use namespace::clean -except => 'meta';
 
 # Remember to bump $VERSION in View::TT::XHTML also.
-our $VERSION = '1.100';
+our $VERSION = '1.101';
 
 requires 'process';