[SCM] Debian packaging of libhttp-server-simple-static-perl branch, master, updated. b107122208842ba8b653b095560bdfc4794901c7

intrigeri intrigeri at boum.org
Sat Jun 30 05:38:17 UTC 2012


The following commit has been merged in the master branch:
commit 6114b1f14891b98ac02a68bec2cbfec765ad1b55
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Jun 30 07:21:25 2012 +0200

    New patch: Use-File-MMagic-XS-instead-of-File-MMagic-to-workaro.patch (use File::MMagic::XS instead of File::MMagic to workaround #679600).

diff --git a/debian/control b/debian/control
index 0266484..c05e020 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libhttp-server-simple-static-perl
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 5.0.0), libmodule-build-perl
-Build-Depends-Indep: perl (>= 5.8.0-7), libfile-mmagic-perl, libhttp-server-simple-perl (>= 0.01), libmime-types-perl, libtest-pod-perl, libtest-pod-coverage-perl, liburi-perl
+Build-Depends-Indep: perl (>= 5.8.0-7), libfile-mmagic-xs-perl, libhttp-server-simple-perl (>= 0.01), libmime-types-perl, libtest-pod-perl, libtest-pod-coverage-perl, liburi-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jaldhar H. Vyas <jaldhar at debian.org>
 Standards-Version: 3.8.0
@@ -12,7 +12,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libhttp-serve
 
 Package: libhttp-server-simple-static-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libhttp-server-simple-perl (>= 0.01), liburi-perl, libmime-types-perl, libfile-mmagic-perl
+Depends: ${perl:Depends}, ${misc:Depends}, libhttp-server-simple-perl (>= 0.01), liburi-perl, libmime-types-perl, libfile-mmagic-xs-perl
 Description: Serve static files with HTTP::Server::Simple
  This mixin adds a method to serve static files from your HTTP::Server::Simple
  subclass.
diff --git a/debian/patches/Use-File-MMagic-XS-instead-of-File-MMagic-to-workaro.patch b/debian/patches/Use-File-MMagic-XS-instead-of-File-MMagic-to-workaro.patch
new file mode 100644
index 0000000..3485aae
--- /dev/null
+++ b/debian/patches/Use-File-MMagic-XS-instead-of-File-MMagic-to-workaro.patch
@@ -0,0 +1,72 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Sat, 30 Jun 2012 07:20:45 +0200
+Subject: Use File::MMagic::XS instead of File::MMagic to workaround #679600.
+
+---
+ Build.PL                         |    2 +-
+ META.yml                         |    2 +-
+ Makefile.PL                      |    2 +-
+ lib/HTTP/Server/Simple/Static.pm |    4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Build.PL b/Build.PL
+index 2a977b3..67a1339 100644
+--- a/Build.PL
++++ b/Build.PL
+@@ -11,7 +11,7 @@ Module::Build->new
+                        'IO::File' => 0,
+ 		       'URI::Escape' => 0,
+ 		       'MIME::Types' => 0,
+-		       'File::MMagic'  => 0,
++		       'File::MMagic::XS'  => 0,
+ 		       'Exporter' => 0
+ 		       },
+     )->create_build_script;
+diff --git a/META.yml b/META.yml
+index 3c3ba1b..85fda8e 100644
+--- a/META.yml
++++ b/META.yml
+@@ -10,7 +10,7 @@ abstract: Serve static files with HTTP::Server::Simple
+ license: perl
+ requires:
+   Exporter: 0
+-  File::MMagic: 0
++  File::MMagic::XS: 0
+   File::Spec::Functions: 0
+   HTTP::Server::Simple: 0.01
+   IO::File: 0
+diff --git a/Makefile.PL b/Makefile.PL
+index 234e26e..936a6a4 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -6,7 +6,7 @@ WriteMakefile
+           'VERSION_FROM' => 'lib/HTTP/Server/Simple/Static.pm',
+           'PREREQ_PM' => {
+                            'Exporter' => '0',
+-                           'File::MMagic' => '0',
++                           'File::MMagic::XS' => '0',
+                            'File::Spec::Functions' => '0',
+                            'HTTP::Server::Simple' => '0.01',
+                            'IO::File' => '0',
+diff --git a/lib/HTTP/Server/Simple/Static.pm b/lib/HTTP/Server/Simple/Static.pm
+index 8fa1a1c..2f9fcba 100644
+--- a/lib/HTTP/Server/Simple/Static.pm
++++ b/lib/HTTP/Server/Simple/Static.pm
+@@ -2,7 +2,7 @@ package HTTP::Server::Simple::Static;
+ use strict;
+ use warnings;
+ 
+-use File::MMagic ();
++use File::MMagic::XS qw(:compat);
+ use MIME::Types  ();
+ use URI::Escape  ();
+ use IO::File     ();
+@@ -14,7 +14,7 @@ our @EXPORT = qw(serve_static);
+ our $VERSION = '0.07';
+ 
+ my $mime  = MIME::Types->new();
+-my $magic = File::MMagic->new();
++my $magic = File::MMagic::XS->new();
+ 
+ sub serve_static {
+     my ( $self, $cgi, $base ) = @_;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..167b11d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Use-File-MMagic-XS-instead-of-File-MMagic-to-workaro.patch

-- 
Debian packaging of libhttp-server-simple-static-perl



More information about the Pkg-perl-cvs-commits mailing list