summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2011-01-02 06:14:16 -0600
committerJesse Luehrs <doy@tozt.net>2011-01-02 06:14:16 -0600
commit10b06929f85c39c4645d82b07e49d17f77173f56 (patch)
treeb1e7284ae82319ffcc6f5814b1d15728cf8b0e79
parent6a6af2f99b7a4123b16b987ccee17d1209b75618 (diff)
downloadpackage-stash-10b06929f85c39c4645d82b07e49d17f77173f56.tar.gz
package-stash-10b06929f85c39c4645d82b07e49d17f77173f56.zip
use the dzil conflicts plugin
-rw-r--r--bin/package-stash-conflicts19
-rw-r--r--dist.ini8
-rw-r--r--lib/Package/Stash/Conflicts.pm14
3 files changed, 5 insertions, 36 deletions
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;