[SCM] Debian packaging of libfile-libmagic-perl branch, master, updated. d4f5b3f6f66400a05343f9578672c7ce7fb378d2

[gregor herrmann]

The following commit has been merged in the master branch:
commit a3ea62b9a0b5dedb683dabf98702a76a79810a52
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Mar 1 23:43:36 2012 +0100

    Add patch file-5.10.patch to deal with changes in file 5.10 in test suite.
    
    Thanks: Moritz Muehlenhoff for the bug report.
    Closes: #661800

diff --git a/debian/control b/debian/control
index 7c26ef7..7c8000d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libfile-libmagic-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50~), perl, libmagic-dev (>= 5.00)
+Build-Depends: debhelper (>= 7.0.50~), perl, libmagic-dev (>= 5.10)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Ryan Niebur <ryan at debian.org>,
  Ansgar Burchardt <ansgar at debian.org>
@@ -12,7 +12,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libfile-libma
 
 Package: libfile-libmagic-perl
 Architecture: any
-Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, libmagic1 (>= 5.00)
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, libmagic1 (>= 5.10)
 Description: Perl interface to libmagic for determining file type
  The File::LibMagic module is a simple perl interface to libmagic from the
  file-4.x or file-5.x package from Christos Zoulas
diff --git a/debian/patches/file-5.10.patch b/debian/patches/file-5.10.patch
new file mode 100644
index 0000000..fc822bc
--- /dev/null
+++ b/debian/patches/file-5.10.patch
@@ -0,0 +1,85 @@
+Description: adjust for magic 5.10
+Origin: vendor
+Bug: https://rt.cpan.org/Ticket/Display.html?id=75457
+Bug-Debian: http://bugs.debian.org/661800
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=75457
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-03-01
+
+--- a/t/2-easy.t
++++ b/t/2-easy.t
+@@ -7,7 +7,7 @@
+ is( MagicBuffer("Hello World\n"),   'ASCII text'           );
+ 
+ is( MagicFile('t/samples/foo.txt'), 'ASCII text'           );
+-is( MagicFile('t/samples/foo.c'  ), 'ASCII C program text' );
++is( MagicFile('t/samples/foo.c'  ), 'C source, ASCII text' );
+ 
+ # check the error handling
+ eval { MagicBuffer(undef) };
+--- a/t/3-complete.t
++++ b/t/3-complete.t
+@@ -32,7 +32,7 @@
+     is( magic_buffer( $handle, "Footastic\n" ), 'A foo file' );
+ 
+     is( magic_file( $handle, 't/samples/foo.txt' ), 'ASCII text'           );
+-    is( magic_file( $handle, 't/samples/foo.c'   ), 'ASCII C program text' );
++    is( magic_file( $handle, 't/samples/foo.c'   ), 'ASCII text' );
+     is( magic_file( $handle, 't/samples/foo.foo' ), 'A foo file' );
+ 
+     magic_close($handle);
+@@ -45,7 +45,7 @@
+     is( magic_buffer( $handle, "Hello World\n" ), 'ASCII text' );
+ 
+     is( magic_file( $handle, 't/samples/foo.txt' ), 'ASCII text'           );
+-    is( magic_file( $handle, 't/samples/foo.c'   ), 'ASCII C program text' );
++    is( magic_file( $handle, 't/samples/foo.c'   ), 'C source, ASCII text' );
+     is( magic_file( $handle, 't/samples/foo.foo' ), 'ASCII text' );
+ 
+     magic_close($handle);
+@@ -58,7 +58,7 @@
+     is( magic_buffer( $handle, "Hello World\n" ), 'ASCII text' );
+ 
+     is( magic_file( $handle, 't/samples/foo.txt' ), 'ASCII text'           );
+-    is( magic_file( $handle, 't/samples/foo.c'   ), 'ASCII C program text' );
++    is( magic_file( $handle, 't/samples/foo.c'   ), 'C source, ASCII text' );
+     is( magic_file( $handle, 't/samples/foo.foo' ), 'ASCII text' );
+ 
+     magic_close($handle);
+--- a/t/4-all.t
++++ b/t/4-all.t
+@@ -8,7 +8,7 @@
+ is( MagicBuffer("Hello World\n"),   'ASCII text'           );
+ 
+ is( MagicFile('t/samples/foo.txt'), 'ASCII text'           );
+-is( MagicFile('t/samples/foo.c'  ), 'ASCII C program text' );
++is( MagicFile('t/samples/foo.c'  ), 'C source, ASCII text' );
+ 
+ # subs from :complete
+ my $handle = magic_open(MAGIC_NONE);
+@@ -16,7 +16,7 @@
+ is( magic_buffer( $handle, "Hello World\n" ), 'ASCII text' );
+ 
+ is( magic_file( $handle, 't/samples/foo.txt' ), 'ASCII text'           );
+-is( magic_file( $handle, 't/samples/foo.c'   ), 'ASCII C program text' );
++is( magic_file( $handle, 't/samples/foo.c'   ), 'C source, ASCII text' );
+ 
+ magic_close($handle);
+ 
+--- a/t/6-oo.t
++++ b/t/6-oo.t
+@@ -6,12 +6,12 @@
+ 
+ my %standard = (
+     'foo.foo' => [ 'ASCII text',           'text/plain; charset=us-ascii' ],
+-    'foo.c'   => [ 'ASCII C program text', 'text/x-c; charset=us-ascii'   ],
++    'foo.c'   => [ 'C source, ASCII text', 'text/x-c; charset=us-ascii'   ],
+ );
+ 
+ my %custom = (
+     'foo.foo' => [ 'A foo file',           'text/plain; charset=us-ascii' ],
+-    'foo.c'   => [ 'ASCII C program text', 'text/x-c; charset=us-ascii'   ],
++    'foo.c'   => [ 'ASCII text',           'text/plain; charset=us-ascii'   ],
+ );
+ 
+ plan tests => 4 + 4*(keys %standard) + 4*(keys %custom);
diff --git a/debian/patches/series b/debian/patches/series
index ec6aab0..a07c17b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 do-not-link-libz.patch
+file-5.10.patch

-- 
Debian packaging of libfile-libmagic-perl