[pulseaudio] 04/05: debian/patches/kfreebsd_no_lock_and_threads_synchro.patch: mark as applied upstream

[Felipe Sateler]

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

fsateler pushed a commit to branch master
in repository pulseaudio.

commit c1c23822557c4547fe682506d178a2f50466a2c2
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sun Aug 3 17:50:20 2014 -0400

    debian/patches/kfreebsd_no_lock_and_threads_synchro.patch: mark as applied upstream
---
 debian/changelog                                          | 2 ++
 debian/patches/kfreebsd_no_lock_and_threads_synchro.patch | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1ce0566..712d8be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 pulseaudio (5.0-5) UNRELEASED; urgency=medium
 
   * Fix #defines for Debian GNU/kFreeBSD. Closes: #756914
+  * debian/patches/kfreebsd_no_lock_and_threads_synchro.patch: mark as applied
+    upstream
 
  -- Felipe Sateler <fsateler at debian.org>  Sun, 03 Aug 2014 17:42:57 -0400
 
diff --git a/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch b/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
index 5a9933c..3ad44dc 100644
--- a/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
+++ b/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
@@ -4,6 +4,7 @@ Origin: http://svnweb.freebsd.org/ports/head/audio/pulseaudio/files/patch-src_da
 Author: Joe Marcus Clarke <marcus at FreeBSD.org>
 Author: Steven Chamberlain <steven at pyro.eu.org>
 Last-Update: 2013-04-24
+Applied-Upstream: 6.0, commit:69fae3e33ad024be39fb3da0643314abf4e59980
 
 --- a/src/daemon/main.c
 +++ b/src/daemon/main.c

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