[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 9b7bf7516ea30ae0544c4a462b69e490c5f5bf0d
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Tue May 4 09:21:24 2010 +0200

    Applied upstream.

diff --git a/debian/patches/03-kfreebsd_ftbfs.patch b/debian/patches/03-kfreebsd_ftbfs.patch
deleted file mode 100644
index 7d4ab3e..0000000
--- a/debian/patches/03-kfreebsd_ftbfs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Origin: backport
-Description: Prevent FTBFS on kfreebsd architectures.
-Bug: http://bugs.debian.org/578443
-From: https://sourceforge.net/tracker/index.php?func=detail&aid=2989865&group_id=157415&atid=803734
----
- include/slab/slabmixer.h |    2 --
- 1 file changed, 2 deletions(-)
-
---- bristol.orig/include/slab/slabmixer.h
-+++ bristol/include/slab/slabmixer.h
-@@ -24,7 +24,6 @@
- /*
-  * This should be set up according to system type.
-  */
--#if (MACHINE == FreeBSD || MACHINE == linux)
- #ifndef INC_SOURCE
- #define SLAB_NULL			-1
- #define SLAB_TREBLE			SOUND_MIXER_TREBLE
-@@ -93,7 +92,6 @@
- #define SLAB_VOL_PCM_MASK		1<<SLAB_VOL_PCM
- 
- #define SLAB_REC_SRC	0xff
--#endif
- 
- /*
-  * These allow the same parameters to be used for either 0-100 ranges (this
diff --git a/debian/patches/series b/debian/patches/series
index 0079dde..788a34e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-03-kfreebsd_ftbfs.patch
 04-fix_alsa_presence_check.patch
 05-hurd_ftbfs.patch

-- 
bristol packaging