[Pkg-mpd-commits] [pkg-mpd] 04/04: Drop upstream patches add_mpd_socket.patch, mms_deadlock.patch

[Florian Schlichting]

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

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 9fcef4e3c5baecb63ad7b582aadf9b62b9ec8ad0
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sun Oct 19 21:00:20 2014 +0200

    Drop upstream patches add_mpd_socket.patch, mms_deadlock.patch
---
 debian/patches/add_mpd_socket.patch | 15 ---------------
 debian/patches/mms_deadlock.patch   | 15 ---------------
 debian/patches/series               |  2 --
 3 files changed, 32 deletions(-)

diff --git a/debian/patches/add_mpd_socket.patch b/debian/patches/add_mpd_socket.patch
deleted file mode 100644
index 48984dc..0000000
--- a/debian/patches/add_mpd_socket.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Add mpd.socket file missing from tarball
-Origin: upstream git
-
---- /dev/null
-+++ b/systemd/mpd.socket
-@@ -0,0 +1,9 @@
-+[Socket]
-+ListenStream=/run/mpd/socket
-+ListenStream=6600
-+Backlog=5
-+KeepAlive=true
-+PassCredentials=true
-+
-+[Install]
-+WantedBy=sockets.target
diff --git a/debian/patches/mms_deadlock.patch b/debian/patches/mms_deadlock.patch
deleted file mode 100644
index 9572f6a..0000000
--- a/debian/patches/mms_deadlock.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: mms: fix deadlock bug
-Author: Max Kellermann <max at duempel.org>
-Origin: upstream git
-
---- a/src/input/ThreadInputStream.cxx
-+++ b/src/input/ThreadInputStream.cxx
-@@ -88,7 +88,7 @@
- 			Unlock();
- 
- 			Error error;
--			size_t nbytes = Read(w.data, w.size, error);
-+			size_t nbytes = ThreadRead(w.data, w.size, error);
- 
- 			Lock();
- 			cond.broadcast();
diff --git a/debian/patches/series b/debian/patches/series
index 1af33b0..f32badf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 systemd_honor_MPDCONF.patch
-add_mpd_socket.patch
 typo.patch
-mms_deadlock.patch

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