[SCM] Debian packaging of libfile-mimeinfo-perl branch, master, updated. debian/0.15-2-6-g1aa21cb

[gregor herrmann]

The following commit has been merged in the master branch:
commit a8886c230a998a5d43ae7fe3b266d032bb85cd84
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Jan 5 18:54:20 2012 +0100

    Remove patches, both applied upstream.

diff --git a/debian/patches/0001-Suggested-fix-for-RT-66841.patch b/debian/patches/0001-Suggested-fix-for-RT-66841.patch
deleted file mode 100644
index 43d5f09..0000000
--- a/debian/patches/0001-Suggested-fix-for-RT-66841.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index dd8260c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Suggested-fix-for-RT-66841.patch
-spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 037b400..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: fix some spelling mistakes
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/485372
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=70171
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2011-08-09
-
---- a/lib/File/MimeInfo/Magic.pm
-+++ b/lib/File/MimeInfo/Magic.pm
-@@ -262,7 +262,7 @@
- 
- =head1 DESCRIPTION
- 
--This module inherits from L<File::MimeInfo>, it is transparant
-+This module inherits from L<File::MimeInfo>, it is transparent
- to its functions but adds support for the freedesktop magic file.
- 
- Magic data is hashed when you need it for the first time.
---- a/mimetype
-+++ b/mimetype
-@@ -302,12 +302,12 @@
- =item B<--file-compat>
- 
- Make mimetype behave a little more L<file(1)> compatible. This
--is turned on automaticly when you call mimetype by a link
-+is turned on automatically when you call mimetype by a link
- called 'file'.
- 
--A single '-' won't be considered a seperator
-+A single '-' won't be considered a separator
- between options and filenames anymore, but becomes identical to L</--stdin>.
--( You can still use '--' as seperator, but
-+( You can still use '--' as separator, but
- that is not backward compatible with the original file command. )
- Also the default becomes to print descriptions instead of mimetypes.
- 
-@@ -360,7 +360,7 @@
- 
- =item B<--stdin>
- 
--Determine type of content from STDIN, less powerfull then normal file checking
-+Determine type of content from STDIN, less powerful then normal file checking
- because it only uses magic typing. This will happen also if the STDIN filehandle
- is a pipe.
- 

-- 
Debian packaging of libfile-mimeinfo-perl