[SCM] bristol packaging branch, master, updated. debian/0.60.0-4-6-gd170cc8

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d170cc8de773c92219a04d7ad5d5e248807c4621
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Tue May 4 09:24:55 2010 +0200

    Applied upstream.

diff --git a/debian/patches/04-fix_alsa_presence_check.patch b/debian/patches/04-fix_alsa_presence_check.patch
deleted file mode 100644
index b185a07..0000000
--- a/debian/patches/04-fix_alsa_presence_check.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Use IATOMIC_DEFINED to check whether ALSA support is available.
-Origin: https://sourceforge.net/tracker/?func=detail&atid=803734&aid=2989865&group_id=157415
-Last-Update: 2010-04-23
----
- libbristolaudio/audioEngineJack.c |   15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
---- bristol.orig/libbristolaudio/audioEngineJack.c
-+++ bristol/libbristolaudio/audioEngineJack.c
-@@ -36,9 +36,12 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <alsa/iatomic.h>
- 
- #ifdef _BRISTOL_JACK
-+#if (BRISTOL_HAS_ALSA == 1)
-+#include <alsa/iatomic.h>
-+#endif
-+
- #include "bristol.h"
- #include "bristoljack.h"
- 
-@@ -302,11 +305,7 @@ audioShim(jack_nframes_t nframes, void *
- 	return(0);
- }
- 
--#ifdef __ALSA_IATOMIC_H
--atomic_t closedown = ATOMIC_INIT(1);
--#else
- int closedown = 1;
--#endif
- 
- static void
- bristolIntJackClose()
-@@ -346,11 +345,7 @@ bristolJackClose(jackDev *jackdev)
- 	 * this bit of code is far from critical but collisions cause some gory
- 	 * shutdown sequences.
- 	 */
--#ifdef __ALSA_IATOMIC_H
--	if (atomic_dec_and_test(&closedown))
--#else
- 	if (--closedown == 0)
--#endif
- 		printf("unregistering jack interface: %x->%x\n",
- 			(size_t) jackdev, (size_t) jackdev->handle);
- 	else {
-@@ -866,3 +861,5 @@ bristolJackInterface(audioMain *audiomai
- }
- #endif /* _BRISTOL_JACK */
- 
-+
-+
diff --git a/debian/patches/series b/debian/patches/series
index 788a34e..6d63699 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-04-fix_alsa_presence_check.patch
 05-hurd_ftbfs.patch

-- 
bristol packaging