[libaudio-mpd-perl] 04/06: Drop unix-socket-in-MPD_HOST.patch, merged upstream.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libaudio-mpd-perl.

commit 48549a5bc870884077c167020785d1d6ba302d72
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri May 20 15:11:55 2016 +0200

    Drop unix-socket-in-MPD_HOST.patch, merged upstream.
---
 debian/patches/series                        |  1 -
 debian/patches/unix-socket-in-MPD_HOST.patch | 52 ----------------------------
 2 files changed, 53 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index b982f19..5299247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-unix-socket-in-MPD_HOST.patch
 spelling.patch
diff --git a/debian/patches/unix-socket-in-MPD_HOST.patch b/debian/patches/unix-socket-in-MPD_HOST.patch
deleted file mode 100644
index 1608e56..0000000
--- a/debian/patches/unix-socket-in-MPD_HOST.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Thu, 23 Oct 2014 21:32:19 +0100
-Subject: Recognise MPD_HOST="/..." as a Unix socket
-Origin: vendor
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=99762
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=99762
-Last-Update: 2016-05-02
-
----
- lib/Audio/MPD.pm | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/lib/Audio/MPD.pm b/lib/Audio/MPD.pm
-index 530ef29..ffab9fc 100644
---- a/lib/Audio/MPD.pm
-+++ b/lib/Audio/MPD.pm
-@@ -38,7 +38,7 @@ has collection => ( ro, lazy_build, isa=>'Audio::MPD::Collection' );
- has playlist   => ( ro, lazy_build, isa=>'Audio::MPD::Playlist'   );
- has version    => ( rw );
- 
--has _socket    => ( rw, isa=>'IO::Socket::IP' );
-+has _socket    => ( rw, isa=>'IO::Socket' );
- 
- 
- #--
-@@ -93,11 +93,21 @@ sub _connect_to_mpd_server {
-     my ($self) = @_;
- 
-     # try to connect to mpd.
--    my $socket = IO::Socket::IP->new(
--        PeerAddr => $self->host,
--        PeerPort => $self->port,
--    )
--    or die "Could not create socket: $!\n";
-+    my $socket;
-+
-+    if ($self->host =~ m{^/}) {
-+        eval q{use IO::Socket::UNIX qw(); 1}
-+            or die "Could not load IO::Socket::UNIX: $@\n";
-+        $socket = IO::Socket::UNIX->new($self->host)
-+            or die "Could not create socket: $!\n";
-+    }
-+    else {
-+        $socket = IO::Socket::IP->new(
-+            PeerAddr => $self->host,
-+            PeerPort => $self->port,
-+        )
-+        or die "Could not create socket: $!\n";
-+    }
- 
-     # parse version information.
-     my $line = $socket->getline;

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