[SCM] Debian packaging of libhttp-server-simple-static-perl branch, master, updated. debian/0.07-2-5-g77e8a1f

intrigeri intrigeri at boum.org
Sat Aug 4 15:25:05 UTC 2012


The following commit has been merged in the master branch:
commit d40ef56ea94ece705a516a8158eb7e1f467fe35d
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Aug 4 17:21:54 2012 +0200

    Revert to using File::MMagic instead of File::MMagic::XS.
    
    Rationale: #679600 was fixed.
    This reverts commit 6114b1f14891b98ac02a68bec2cbfec765ad1b55.
    
    Also version the dependency on libfile-mmagic-perl so that it's clear what
    version works.

diff --git a/debian/control b/debian/control
index 5b03275..41b4470 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Priority: optional
 Build-Depends: debhelper (>= 5.0.0),
                perl
 Build-Depends-Indep: perl,
-                     libfile-mmagic-xs-perl,
+                     libfile-mmagic-perl (>= 1.29-1),
                      libhttp-server-simple-perl,
                      libmime-types-perl,
                      libtest-pod-perl,
@@ -24,7 +24,7 @@ Depends: ${perl:Depends},
          libhttp-server-simple-perl,
          liburi-perl,
          libmime-types-perl,
-         libfile-mmagic-xs-perl
+         libfile-mmagic-perl (>= 1.29-1)
 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
deleted file mode 100644
index 3485aae..0000000
--- a/debian/patches/Use-File-MMagic-XS-instead-of-File-MMagic-to-workaro.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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
deleted file mode 100644
index 167b11d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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