[libfile-mimeinfo-perl] 01/03: cherry-pick Path::Tiny support improvement from upstream commit 3a6fa004cad

[Damyan Ivanov]

This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository libfile-mimeinfo-perl.

commit d41c8a31b914af636305950c130d9c40602d35f1
Author: Damyan Ivanov <dmn at debian.org>
Date:   Fri Dec 15 20:06:44 2017 +0000

    cherry-pick Path::Tiny support improvement from upstream commit 3a6fa004cad
    
    also add libpath-tiny-perl and shared-mime-info to build dependencies now
    that t/10filehandle.t passes with libpath-tiny-perl installed
---
 debian/changelog               |  4 ----
 debian/control                 |  4 +++-
 debian/patches/path-tiny.patch | 23 +++++++++++++++++++++++
 debian/patches/series          |  1 +
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 59b29cb..88d8958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
 libfile-mimeinfo-perl (0.28-1) UNRELEASED; urgency=medium
 
-  PROBLEM:
-  test fail if the optional build dependency libpath-tiny-perl is installed
-  upstream is already working on it
-
   [ Salvatore Bonaccorso ]
   * debian/control: Use HTTPS transport protocol for Vcs-Git URI
 
diff --git a/debian/control b/debian/control
index 37ce1b9..c297f4e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,10 @@ Build-Depends: debhelper (>= 9),
 Build-Depends-Indep: perl,
                      libfile-basedir-perl,
                      libfile-desktopentry-perl,
+                     libpath-tiny-perl,
                      libtest-pod-perl,
-                     libtest-pod-coverage-perl
+                     libtest-pod-coverage-perl,
+                     shared-mime-info
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libfile-mimeinfo-perl.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libfile-mimeinfo-perl.git
diff --git a/debian/patches/path-tiny.patch b/debian/patches/path-tiny.patch
new file mode 100644
index 0000000..6646e0d
--- /dev/null
+++ b/debian/patches/path-tiny.patch
@@ -0,0 +1,23 @@
+Description: cherry-pick Path::Tiny support improvement from upstream commit 3a6fa004cad
+Origin: upstream
+
+diff --git a/lib/File/MimeInfo.pm b/lib/File/MimeInfo.pm
+index 438bb50..2d44974 100644
+--- a/lib/File/MimeInfo.pm
++++ b/lib/File/MimeInfo.pm
+@@ -109,6 +109,15 @@ sub default {
+ 		read FILE, $line, 32;
+ 		close FILE;
+ 	}
++	elsif (ref $file eq 'Path::Tiny') {
++		return undef unless $file->exists;
++		print STDERR "> File is Path::Tiny object and exists, "
++			. "trying default method\n" if $DEBUG;
++		open my $fh, '<', $file or return undef;
++		binmode FILE, ':utf8' unless $] < 5.008;
++		read $fh, $line, 32;
++		close $fh;
++	}
+ 	else {
+ 		print STDERR "> Trying default method on object\n" if $DEBUG;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9fc9018..0d45a03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+path-tiny.patch
 spelling.patch
 fix_read_from_stdin.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libfile-mimeinfo-perl.git