[SCM] Debian packaging of libfile-mimeinfo-perl branch, master, updated. df0e51b6c015c4d0eda1ebbe163fea6f3d0482ba

[gregor herrmann]

The following commit has been merged in the master branch:
commit 9fa3580b182c099cb12f67dae3c3c96c4eebd7bd
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Aug 9 17:02:18 2011 +0200

    Add patch to fix build failure with perl 5.14.
    
    Closes: #629277

diff --git a/debian/patches/0001-Suggested-fix-for-RT-66841.patch b/debian/patches/0001-Suggested-fix-for-RT-66841.patch
new file mode 100644
index 0000000..43d5f09
--- /dev/null
+++ b/debian/patches/0001-Suggested-fix-for-RT-66841.patch
@@ -0,0 +1,47 @@
+Origin: https://rt.cpan.org/Ticket/Attachment/931793/483674/0001-Suggested-fix-for-RT-66841.patch
+Bug: https://rt.cpan.org/Ticket/Display.html?id=66841
+Bug-Debian: http://bugs.debian.org/629277
+
+From 807262f4aeb0694b6eabcc1acffecfa87e1df783 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric at gmail.com>
+Date: Sat, 7 May 2011 09:35:19 +1200
+Subject: [PATCH] Suggested fix for RT#66841
+
+Replace regexp validation tests with similar tests that permit it to be
+any one of a list of values.
+---
+ t/01_normal.t |   23 +++++++++++++++++------
+ 1 files changed, 17 insertions(+), 6 deletions(-)
+
+--- a/t/01_normal.t
++++ b/t/01_normal.t
+@@ -18,12 +18,23 @@
+ 
+ # test _glob_to_regexp
+ my $i = 0;
+-for (
+-	[ '*.pl',	'(?-xism:^.*\.pl$)'	],	# 4
+-	[ '*.h++',	'(?-xism:^.*\.h\+\+$)'	],	# 5
+-	[ '*.[tar].*',	'(?-xism:^.*\.[tar]\..*$)'],	# 6
+-	[ '*.?',	'(?-xism:^.*\..?$)'],		# 7
+-) { is( File::MimeInfo::_glob_to_regexp($_->[0]), $_->[1], 'glob '.++$i ) }
++for my $glob (
++  [ '*.pl',      [ '(?-xism:^.*\.pl$)',        '(?^u:^.*\.pl$)' ] ],           # 4
++  [ '*.h++',     [ '(?-xism:^.*\.h\+\+$)',     '(?^u:^.*\.h\+\+$)' ] ],        # 5
++  [ '*.[tar].*', [ '(?-xism:^.*\.[tar]\..*$)', '(?^u:^.*\.[tar]\..*$)' ] ],    # 6
++  [ '*.?',       [ '(?-xism:^.*\..?$)',        '(?^u:^.*\..?$)' ] ],           # 7
++  )
++{
++  my $converted = File::MimeInfo::_glob_to_regexp( $glob->[0] );
++  my $number    = ++$i;
++  if ( my ($match) = grep { $_ eq "$converted" } @{ $glob->[1] } ) {
++    pass( 'glob ' . $number . ' matches an expected value' );
++    note explain $match;
++    next;
++  }
++  fail( 'glob ' . $number . ' matches an expected value' );
++  diag explain { got => "$converted", expected_one_of => $glob->[1] };
++}
+ 
+ # test parsing file names
+ $i = 0;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..81e6318
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Suggested-fix-for-RT-66841.patch

-- 
Debian packaging of libfile-mimeinfo-perl