From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 2 Jan 2011 12:14:16 +0000 (-0600)
Subject: use the dzil conflicts plugin
X-Git-Tag: 0.17~2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=10b06929f85c39c4645d82b07e49d17f77173f56;p=gitmo%2FPackage-Stash.git

use the dzil conflicts plugin
---

diff --git a/bin/package-stash-conflicts b/bin/package-stash-conflicts
deleted file mode 100644
index 3ebeb3a..0000000
--- a/bin/package-stash-conflicts
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-# PODNAME: package-stash-conflicts
-
-use Getopt::Long;
-use Package::Stash::Conflicts;
-
-my $verbose;
-GetOptions("verbose|v" => \$verbose);
-
-if ($verbose) {
-    Package::Stash::Conflicts->check_conflicts;
-}
-else {
-    my @conflicts = Package::Stash::Conflicts->calculate_conflicts;
-    print "$_\n" for map { $_->{package} } @conflicts;
-    exit @conflicts;
-}
diff --git a/dist.ini b/dist.ini
index 5578e88..d75e21c 100644
--- a/dist.ini
+++ b/dist.ini
@@ -10,7 +10,6 @@ awesome = =inc::MMPackageStash
 
 [Prereqs]
 perl = 5.8.3
-Dist::CheckConflicts = 0
 Package::DeprecationManager = 0
 Package::Stash::XS = 0
 Scalar::Util = 0
@@ -23,5 +22,8 @@ Test::Requires = 0
 [Prereqs / TestRecommends]
 Test::LeakTrace = 0
 
-[Prereqs / ConfigureRequires]
-Dist::CheckConflicts = 0
+[Conflicts]
+-script = bin/package-stash-conflicts
+Class::MOP                    = 1.08
+MooseX::Role::WithOverloading = 0.08
+namespace::clean              = 0.18
diff --git a/lib/Package/Stash/Conflicts.pm b/lib/Package/Stash/Conflicts.pm
deleted file mode 100644
index 53e6680..0000000
--- a/lib/Package/Stash/Conflicts.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-package # hide from PAUSE
-    Package::Stash::Conflicts;
-use strict;
-use warnings;
-
-use Dist::CheckConflicts
-    -dist => 'Package-Stash',
-    -conflicts => {
-        'Class::MOP'                    => '1.08',
-        'MooseX::Role::WithOverloading' => '0.08',
-        'namespace::clean'              => '0.18',
-    };
-
-1;