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

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

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

    Remove 01-spelling_errors.patch, applied upstream.

diff --git a/debian/patches/01-spelling_errors.patch b/debian/patches/01-spelling_errors.patch
deleted file mode 100644
index 37a3977..0000000
--- a/debian/patches/01-spelling_errors.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Author: Alessio Treglia <quadrispro at ubuntu.com>
-Description: Fix spelling errors:
- * s/independant/independent/
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2989866&group_id=157415&atid=803734
----
- brighton/brightonhelp.h   |    2 +-
- brighton/brightonreadme.h |    8 ++++----
- bristol/blo.c             |    6 +++---
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
---- bristol.orig/brighton/brightonhelp.h
-+++ bristol/brighton/brightonhelp.h
-@@ -287,7 +287,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\
--        mini on the second OSS soundcard. Each synth is totally independant\n\
-+        mini on the second OSS soundcard. Each synth is totally independent\n\
-         and runs with 32 voice polyphony (looks nice, not been tested).\n\
- \n\
- The location of the bristol binaries can be specified in the BRISTOL\n\
---- bristol.orig/brighton/brightonreadme.h
-+++ bristol/brighton/brightonreadme.h
-@@ -1132,7 +1132,7 @@ NULL, /* Pro-52 - stuff later */
- "    Oberheim OB-X\n\
-     -------------\n\
- \n\
--Oberheim was the biggest competitor of Sequencial Circuits, having their OB\n\
-+Oberheim was the biggest competitor of Sequential Circuits, having their OB\n\
- range neck and neck with each SC Prophet. The sound is as fat, the OB-X \n\
- similar to the Prophet-5 as the OB-Xa to the Prophet-10. The synths were widely\n\
- used in rock music in the late seventies and early 80s. Their early polyphonic\n\
-@@ -2553,7 +2553,7 @@ Unison button. You can configure stereo 
- hard left and right panning. Similarly the -99 emulations do not have a Unison\n\
- button, the capability is available from DE 80.\n\
- \n\
--The memories for the bit-1 and bit-99 should be interchangable however the\n\
-+The memories for the bit-1 and bit-99 should be interchangeable however the\n\
- code maintains separate directories.\n\
- \n\
- There are three slightly different Bit GUI's. The first is the bit-1 with a \n\
-@@ -3385,7 +3385,7 @@ The filter keyboard tracking is configur
- of the Trilogy however it was implemented here to correct the keyboard tracking\n\
- of the filter for all the emulations and the filter should now be playable.\n\
- The envelope touch will affect this depending on J2 since velocity affects the\n\
--cut off frequency and that is noticable when playing the filter. This jumper\n\
-+cut off frequency and that is noticeable when playing the filter. This jumper\n\
- is there so that the envelope does not adversely affect tuning but can still be\n\
- used to have the filter open up with velocity if desired.\n\
- \n\
-@@ -3637,7 +3637,7 @@ The filter keyboard tracking is configur
- of the Stratus however it was implemented here to correct the keyboard tracking\n\
- of the filter for all the emulations and the filter should now be playable.\n\
- The envelope touch will affect this depending on J2 since velocity affects the\n\
--cut off frequency and that is noticable when playing the filter. This jumper\n\
-+cut off frequency and that is noticeable when playing the filter. This jumper\n\
- is there so that the envelope does not adversely affect tuning but can still be\n\
- used to have the filter open up with velocity if desired.\n\
- \n\
---- bristol.orig/bristol/blo.c
-+++ bristol/bristol/blo.c
-@@ -133,7 +133,7 @@ harmonics, gn, cutin, cutoff, fraction, 
- 	}
- 
- 	/*
--	 * Ramp and saw, they will be inverted but will only be noticable when
-+	 * Ramp and saw, they will be inverted but will only be noticeable when
- 	 * used as LFO. This gives audible crackle at low harmonic counts:
- 	 *
- 	 *	sum all odd and subtract all even harmonics, gain is reciprocal of h
-@@ -267,7 +267,7 @@ generateBLOwaveformF(float step, float *
- 			return;
- 		case  BLO_RAMP:
- 			/*
--			 * Ramp and saw, they will be inverted but will only be noticable
-+			 * Ramp and saw, they will be inverted but will only be noticeable
- 			 * when LFO. This gives audible crackle at low harmonic counts:
- 			 *
- 			 *	sum all odd and subtract all even harmonics,
-@@ -412,7 +412,7 @@ generateBLOwaveformZ(int key, float *dst
- 			return;
- 		case  BLO_RAMP:
- 			/*
--			 * Ramp and saw, they will be inverted but will only be noticable
-+			 * Ramp and saw, they will be inverted but will only be noticeable
- 			 * when LFO. This gives audible crackle at low harmonic counts:
- 			 *
- 			 *	sum all odd and subtract all even harmonics,
diff --git a/debian/patches/series b/debian/patches/series
index 7303eb6..0079dde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-spelling_errors.patch
 03-kfreebsd_ftbfs.patch
 04-fix_alsa_presence_check.patch
 05-hurd_ftbfs.patch

-- 
bristol packaging