[SCM] bristol packaging branch, master, updated. debian/0.40.7-2-10-g3fefc80

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

The following commit has been merged in the master branch:
commit 3fefc80602ef4bb44b22f55faf024abf6260d8a1
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Sun Mar 21 18:49:29 2010 +0100

    Refresh patches.

diff --git a/debian/patches/01-spelling_errors.patch b/debian/patches/01-spelling_errors.patch
index 1b86213..fee8604 100644
--- a/debian/patches/01-spelling_errors.patch
+++ b/debian/patches/01-spelling_errors.patch
@@ -5,9 +5,9 @@ Description: Fix spelling errors:
  brighton/brightonhelp.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- bristol-0.40.6.orig/brighton/brightonhelp.h
-+++ bristol-0.40.6/brighton/brightonhelp.h
-@@ -280,7 +280,7 @@ char *helptext = "\nA synthesiser emulat
+--- bristol.orig/brighton/brightonhelp.h
++++ bristol/brighton/brightonhelp.h
+@@ -269,7 +269,7 @@ char *helptext = "\nA synthesiser emulat
      startBristol -port 5029 -audio oss -audiodev /dev/dsp1 -mididev /dev/midi1\n\
  \n\
          Start two synthesisers, a juno on the first ALSA soundcard, and a\n\
diff --git a/debian/patches/02-implicit_pointer_conversion.patch b/debian/patches/02-implicit_pointer_conversion.patch
index a443c5d..8004605 100644
--- a/debian/patches/02-implicit_pointer_conversion.patch
+++ b/debian/patches/02-implicit_pointer_conversion.patch
@@ -8,10 +8,10 @@ Bug: http://bugs.debian.org/563435
 --- bristol.orig/libbristolic/sid.c
 +++ bristol/libbristolic/sid.c
 @@ -133,6 +133,7 @@
- #include <math.h>
  
+ #include "bristol.h"
  #include "bristolsid.h"
 +#include "bristol.h"
  
- #define B_SID_RAMP		0
- #define B_SID_TRI		1
+ extern void *bristolmalloc();
+ extern void bristolfree();

-- 
bristol packaging