From a06b0191ce1f680389e5214d28401941c74aa42b Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 16 Jun 2008 00:04:12 +0000 Subject: [PATCH] Use File::MMagic::XS since it has now been packaged. --- debian/control | 2 +- debian/patches/201_no-file-mmagic-xs.diff | 26 ----------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 debian/patches/201_no-file-mmagic-xs.diff diff --git a/debian/control b/debian/control index 54b8f94..18b24d2 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Build-Depends-Indep: perl (>= 5.6.0-16), libtemplate-plugin-class-perl, libtest-mockmodule-perl, libdigest-perl, - libfile-mmagic-perl, + libfile-mmagic-xs-perl, libclass-dbi-plugin-type-perl, libclass-accessor-perl, libclass-data-inheritable-perl, diff --git a/debian/patches/201_no-file-mmagic-xs.diff b/debian/patches/201_no-file-mmagic-xs.diff deleted file mode 100644 index 91f3c0e..0000000 --- a/debian/patches/201_no-file-mmagic-xs.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- maypole.orig/lib/Maypole.pm -+++ maypole/lib/Maypole.pm -@@ -10,10 +10,10 @@ - use URI(); - use URI::QueryParam; - use NEXT; --use File::MMagic::XS qw(:compat); -+use File::MMagic; - - our $VERSION = '2.13'; --our $mmagic = File::MMagic::XS->new(); -+our $mmagic = File::MMagic->new(); - - # proposed privacy conventions: - # - no leading underscore - public to custom application code and plugins ---- maypole.orig/Makefile.PL -+++ maypole/Makefile.PL -@@ -26,7 +26,7 @@ - Template::Plugin::Class => 0, - Test::MockModule => 0, - Digest::MD5 => 0, -- File::MMagic::XS => 0.08, -+ File::MMagic => 1.21, - Class::DBI::Plugin::Type => 0, - }, # e.g., Module::Name => 1.1 - ( diff --git a/debian/patches/series b/debian/patches/series index dd06d33..9221ee4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 103_fix-view_object-warning.diff 106_fix-_column_info-clash.diff 108_fix-uris.diff -201_no-file-mmagic-xs.diff 202_fix-example-references.diff -- 2.39.5