[SCM] bristol packaging branch, master, updated. debian/0.60.0-3-4-g1a262c9

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

The following commit has been merged in the master branch:
commit 1de49700958cb3e80668eddabf6b1baddad744f8
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Fri Apr 23 09:49:19 2010 +0200

    Patch to fix FTBFS on hurd-i386.

diff --git a/debian/patches/05-hurd_ftbfs.patch b/debian/patches/05-hurd_ftbfs.patch
new file mode 100644
index 0000000..79c25fd
--- /dev/null
+++ b/debian/patches/05-hurd_ftbfs.patch
@@ -0,0 +1,34 @@
+Description: Attempt to fix FTBFS on hurd-i386.
+Origin: https://sourceforge.net/tracker/?func=detail&atid=803734&aid=2989865&group_id=157415
+---
+ include/bristol/bristol.h |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- bristol.orig/include/bristol/bristol.h
++++ bristol/include/bristol/bristol.h
+@@ -40,7 +40,11 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <unistd.h>
++
++#ifdef BRISTOL_SEMAPHORE
+ #include <semaphore.h>
++#endif
++
+ #include <time.h>
+ #include <pthread.h>
+ 
+@@ -622,8 +626,13 @@ typedef struct AudioMain {
+ 	bristolVoice *newlast;
+ 	bristolOP **palette; /* operator templates */
+ 	bristolOP **effects; /* operator templates */
++#ifdef BRISTOL_SEMAPHORE
+ 	sem_t *sem_long;
+ 	sem_t *sem_short;
++#else
++	void *unused1;
++	void *unused2;
++#endif
+ 	struct timespec abstime;
+ 	int voiceCount;
+ 	int opCount;

-- 
bristol packaging