Merge 'trunk' into 'pri_key_refactor'

[dbsrgits/DBIx-Class.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 010c3ba..e747063 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -44,10 +44,9 @@ my $runtime_requires = {
   'Class::Inspector'         => '1.24',
   'Data::Page'               => '2.00',
   'DBI'                      => '1.609',
-  'JSON::Any'                => '1.18',
   'MRO::Compat'              => '0.09',
   'Module::Find'             => '0.06',
-  'Path::Class'              => '0.16',
+  'Path::Class'              => '0.18',
   'Scope::Guard'             => '0.03',
   'SQL::Abstract'            => '1.61',
   'SQL::Abstract::Limit'     => '0.13',
@@ -106,7 +105,7 @@ for my $rtype (keys %$reqs) {
 
     # sanity check req duplications
     if ($final_req{$mod}) {
-      die "$mod specified as both a $rtype and a $final_req{$mod}[1]\n";
+      die "$mod specified as both a '$rtype' and a '$final_req{$mod}[0]'\n";
     }
 
     $final_req{$mod} = [ $rtype, $reqs->{$rtype}{$mod}||0 ],
@@ -139,7 +138,6 @@ no_index directory => $_ for (qw|
   lib/DBIx/Class/PK/Auto
 |);
 no_index package => $_ for (qw/
-  DBIx::Class::Storage::DBI::AmbiguousGlob
   DBIx::Class::SQLAHacks DBIx::Class::Storage::DBIHacks
 /);