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

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

The following commit has been merged in the master branch:
commit 8508286dfdd9a969437d3e85f86c1469414344f8
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Tue May 4 09:51:50 2010 +0200

    Reintroduce updated patch.

diff --git a/debian/patches/01-spelling_errors.patch b/debian/patches/01-spelling_errors.patch
new file mode 100644
index 0000000..9115857
--- /dev/null
+++ b/debian/patches/01-spelling_errors.patch
@@ -0,0 +1,42 @@
+Author: Alessio Treglia <quadrispro at ubuntu.com>
+Description: Fix spelling errors:
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2996401&group_id=157415&atid=803734
+---
+ brighton/brightonCLI.c     |    2 +-
+ brighton/brightonOdyssey.c |    2 +-
+ bristol/thesermon.c        |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- bristol.orig/brighton/brightonCLI.c
++++ bristol/brighton/brightonCLI.c
+@@ -189,7 +189,7 @@ typedef struct CommSet {
+ comSet brightoncom[4] = {
+ 	{"",		B_COM_NOT_USED, "", 0, 0},
+ 	{"panel",	B_COM_FIND,
+-		"<n> Set the active emulator paramter panel",
++		"<n> Set the active emulator parameter panel",
+ 		0, 0},
+ 	{"device",	B_COM_FIND,
+ 		"<panel> <dev> <value> send parameter change message",
+--- bristol.orig/brighton/brightonOdyssey.c
++++ bristol/brighton/brightonOdyssey.c
+@@ -834,7 +834,7 @@ odysseyCallback(brightonWindow * win, in
+ 	} else {
+ 		brightonEvent event;
+ 		/*
+-		 * We were in panel 0, we need to adjust the paramter in the next
++		 * We were in panel 0, we need to adjust the parameter in the next
+ 		 * layer
+ 		 */
+ 		if (calling)
+--- bristol.orig/bristol/thesermon.c
++++ bristol/bristol/thesermon.c
+@@ -999,7 +999,7 @@ parseWheel(char *line, tonewheels *gear)
+ 	 * [freq|-] <c1|-> <g1> <c2|-> <g2> <c3|-> <g3>
+ 	 *
+ 	 * We have to scan to the next parameter skipping the wheel and any 
+-	 * subsequent blank space (<Space><tab>) and get the next paramter.
++	 * subsequent blank space (<Space><tab>) and get the next parameter.
+ 	 */
+ 	if (*line != '-')
+ 		gear->freq = atof(line);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..85166ca
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-spelling_errors.patch

-- 
bristol packaging