[SCM] setbfree/master: Patches refreshed/removed.

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

The following commit has been merged in the master branch:
commit b480000692416663fd36d45f6c11343017c8d925
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Jun 20 19:52:08 2016 +0200

    Patches refreshed/removed.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 1e60f0b..3c1492d 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -13,7 +13,7 @@ Index: setbfree/b_overdrive/Makefile
 ===================================================================
 --- setbfree.orig/b_overdrive/Makefile
 +++ setbfree/b_overdrive/Makefile
-@@ -50,7 +50,7 @@ overdrive.o: overdrive.c overdrive.h ../
+@@ -51,7 +51,7 @@ overdrive.o: overdrive.c overdrive.h ../
  	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o overdrive.o overdrive.c
  
  overmaker:$(OVMSRC) overmakerdefs.h
diff --git a/debian/patches/0002-spelling.patch b/debian/patches/0002-spelling.patch
deleted file mode 100644
index 9aea509..0000000
--- a/debian/patches/0002-spelling.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Fix small spelling mistakes.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: robin at gareus.org
-
-Index: setbfree/doc/setBfree.1
-===================================================================
---- setbfree.orig/doc/setBfree.1
-+++ setbfree/doc/setBfree.1
-@@ -230,7 +230,7 @@ Tuning temperament, gear\-ratios/motor\-
- osc.x\-precision
- D  (0.001)
- .IP
--Wave precision. Maximum allowed error when calulating wave buffer\-length for a given frequency (ideal #of samples \- discrete #of samples)
-+Wave precision. Maximum allowed error when calculating wave buffer\-length for a given frequency (ideal #of samples \- discrete #of samples)
- .TP
- osc.perc.fast
- D  (1.0)
-@@ -588,7 +588,7 @@ Filter gain
- whirl.horn.filter.a.type
- I* (0)
- .IP
--This is the first of two filters to shape the signal to be sent to the horn\-speaker; by default a low\-pass filter with negative gain to cut off high freqencies. Filter type: 0\-8. see "Filter types" below.
-+This is the first of two filters to shape the signal to be sent to the horn\-speaker; by default a low\-pass filter with negative gain to cut off high frequencies. Filter type: 0\-8. see "Filter types" below.
- .TP
- whirl.horn.filter.a.hz
- D* (4500)
-Index: setbfree/b_whirl/whirl.c
-===================================================================
---- setbfree.orig/b_whirl/whirl.c
-+++ setbfree/b_whirl/whirl.c
-@@ -1469,7 +1469,7 @@ static const ConfigDoc doc[] = {
-   {"whirl.drum.filter.q",      CFG_DOUBLE,  "1.6016",   "Filter Quality, bandwidth", "", 0.1, 6.0, .1},
-   {"whirl.drum.filter.hz",     CFG_DOUBLE,  "811.9695", "Filter frequency.", "Hz", 20.0, 8000.0, 5.0},
-   {"whirl.drum.filter.gain",   CFG_DOUBLE,  "-38.9291", "Filter gain", "dB", -48.0, 48.0, 1.0},
--  {"whirl.horn.filter.a.type", CFG_INT,     "0",        "This is the first of two filters to shape the signal to be sent to the horn-speaker; by default a low-pass filter with negative gain to cut off high freqencies. Filter type: 0-8. see \"Filter types\" below.", "", 0, 8, 1},
-+  {"whirl.horn.filter.a.type", CFG_INT,     "0",        "This is the first of two filters to shape the signal to be sent to the horn-speaker; by default a low-pass filter with negative gain to cut off high frequencies. Filter type: 0-8. see \"Filter types\" below.", "", 0, 8, 1},
-   {"whirl.horn.filter.a.hz",   CFG_DOUBLE,  "4500",     "Filter frequency", "Hz", 20.0, 8000, 5.0},
-   {"whirl.horn.filter.a.q",    CFG_DOUBLE,  "2.7456",   "Filter quality, bandwidth", "", 0.1, 6.0, 0.1},
-   {"whirl.horn.filter.a.gain", CFG_DOUBLE,  "-30.0",    "Filter gain", "dB", -48.0, 48.0, 1.0},
-Index: setbfree/src/tonegen.c
-===================================================================
---- setbfree.orig/src/tonegen.c
-+++ setbfree/src/tonegen.c
-@@ -3615,7 +3615,7 @@ struct b_tonegen *allocTonegen() {
- static const ConfigDoc doc[] = {
-   {"osc.tuning",                       CFG_DOUBLE,  "440.0", "Base tuning of the organ.", "Hz", 220.0, 880.0, .5},
-   {"osc.temperament",                  CFG_TEXT,    "\"gear60\"", "Tuning temperament, gear-ratios/motor-speed. One of: \"equal\", \"gear60\", \"gear50\"", "", 0, 2, 1},
--  {"osc.x-precision",                  CFG_DOUBLE,  "0.001", "Wave precision. Maximum allowed error when calulating wave buffer-length for a given frequency (ideal #of samples - discrete #of samples)", INCOMPLETE_DOC},
-+  {"osc.x-precision",                  CFG_DOUBLE,  "0.001", "Wave precision. Maximum allowed error when calculating wave buffer-length for a given frequency (ideal #of samples - discrete #of samples)", INCOMPLETE_DOC},
-   {"osc.perc.fast",                    CFG_DOUBLE,  "1.0", "Fast percussion decay time", "s", 0, 10.0, 0.1},
-   {"osc.perc.slow",                    CFG_DOUBLE,  "4.0", "Slow percussion decay time", "s", 0, 10.0, 0.1},
-   {"osc.perc.normal",                  CFG_DECIBEL, "1.0", "Percussion starting gain of the envelope for normal volume.", "dB", 0, 1, 2.0},
diff --git a/debian/patches/series b/debian/patches/series
index 4eb9654..b5c7eee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-buildsystem.patch
-0002-spelling.patch

-- 
setbfree packaging