[svn:dbi] r14039 - dbi/trunk

[REHSACK]

Author: REHSACK
Date: Tue May 25 07:17:45 2010
New Revision: 14039

Modified:
   dbi/trunk/Makefile.PL

Log:
- add DBD::PO and DBD::RAM to conflicts
- merge conflicts into META.yml (EU::MM 6.48 and above)
- add Homepage to resources


Modified: dbi/trunk/Makefile.PL
==============================================================================
--- dbi/trunk/Makefile.PL       (original)
+++ dbi/trunk/Makefile.PL       Tue May 25 07:17:45 2010
@@ -96,6 +96,7 @@
            repository  => 'https://svn.perl.org/modules/dbi/trunk/',
            MailingList => 'mailto:dbi-...@perl.org',
            license     => 'http://dev.perl.org/licenses/',
+           homepage    => 'http://dbi.perl.org/',
        },
        recommends => {
            'RPC::PlServer' => 0.2001,
@@ -109,6 +110,8 @@
        'SQL::Statement' => '1.27',
        'DBD::AnyData' => '0.09',
        'DBD::CSV' => '0.29',
+       'DBD::RAM' => '0.072',
+       'DBD::PO' => '2.10',
     },
     LICENSE => 'perl',
     EXE_FILES => [ "dbiproxy$ext_pl", "dbiprof$ext_pl", "dbilogstrip$ext_pl" ],
@@ -214,11 +217,6 @@
         $params{PREREQ_PM} = { %{ $params{PREREQ_PM} || {} }, %{ 
$params{BUILD_REQUIRES} } };
         delete $params{BUILD_REQUIRES};
     }
-    delete $params{CONFIGURE_REQUIRES} if ( $eumm_version < 6.52 );
-    delete $params{MIN_PERL_VERSION}   if ( $eumm_version < 6.48 );
-    delete $params{META_MERGE}         if ( $eumm_version < 6.46 );
-    delete $params{META_ADD}           if ( $eumm_version < 6.46 );
-    delete $params{LICENSE}            if ( $eumm_version < 6.31 );
 
     # more or less taken from Moose' Makefile.PL
     if ( $params{CONFLICTS} ) {
@@ -228,9 +226,16 @@
         unless ( $cpan_smoker || $ENV{PERL_MM_USE_DEFAULT} ) {
             sleep 4 unless ($ok);
         }
+       %{$params{META_MERGE}{conflicts}} = %{$params{CONFLICTS}};
         delete $params{CONFLICTS};
     }
 
+    delete $params{CONFIGURE_REQUIRES} if ( $eumm_version < 6.52 );
+    delete $params{MIN_PERL_VERSION}   if ( $eumm_version < 6.48 );
+    delete $params{META_MERGE}         if ( $eumm_version < 6.46 );
+    delete $params{META_ADD}           if ( $eumm_version < 6.46 );
+    delete $params{LICENSE}            if ( $eumm_version < 6.31 );
+
     WriteMakefile(%params);
 }