[SCM] bristol packaging branch, master, updated. debian/0.60.0-4-7-g869ed33

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

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

    Applied upstream, no patch remaining to apply.

diff --git a/debian/patches/.dpkg-source-applied b/debian/patches/.dpkg-source-applied
deleted file mode 100644
index 8387f19..0000000
--- a/debian/patches/.dpkg-source-applied
+++ /dev/null
@@ -1,4 +0,0 @@
-01-spelling_errors.patch
-02-implicit_pointer_conversion.patch
-03-kfreebsd_ftbfs.patch
-04-fix_alsa_presence_check.patch
diff --git a/debian/patches/05-hurd_ftbfs.patch b/debian/patches/05-hurd_ftbfs.patch
deleted file mode 100644
index 79c25fd..0000000
--- a/debian/patches/05-hurd_ftbfs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6d63699..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-05-hurd_ftbfs.patch

-- 
bristol packaging