[SCM] yoshimi/master: Spelling patch removed - not applying anymore.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Mar 19 00:15:02 UTC 2014


The following commit has been merged in the master branch:
commit d2607060a4a49d855a6702d9f3398a1598686dfa
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Mar 18 22:25:46 2014 +0100

    Spelling patch removed - not applying anymore.

diff --git a/debian/patches/02-spelling.patch b/debian/patches/02-spelling.patch
deleted file mode 100644
index 2560a9b..0000000
--- a/debian/patches/02-spelling.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Origin: Debian
-Description: Spelling fixing patch.
-Forwarded: yes
-
-Index: yoshimi/src/Params/PADnoteParameters.h
-===================================================================
---- yoshimi.orig/src/Params/PADnoteParameters.h	2013-08-19 04:16:54.529000911 +0200
-+++ yoshimi/src/Params/PADnoteParameters.h	2013-08-19 04:16:54.525000910 +0200
-@@ -54,7 +54,7 @@
- 
-         //parameters
- 
--        //the mode: 0 - bandwidth, 1 - discrete (bandwidth=0), 2 - continous
-+        //the mode: 0 - bandwidth, 1 - discrete (bandwidth=0), 2 - continuous
-         //the harmonic profile is used only on mode 0
-         unsigned char Pmode;
- 
-Index: yoshimi/src/UI/ADnoteUI.fl
-===================================================================
---- yoshimi.orig/src/UI/ADnoteUI.fl	2013-08-19 04:16:54.529000911 +0200
-+++ yoshimi/src/UI/ADnoteUI.fl	2013-08-19 04:16:54.525000910 +0200
-@@ -537,7 +537,7 @@
-             Fl_Dial fixedfreqetdial {
-               label {Eq.T.}
-               callback {pars->VoicePar[nvoice].PfixedfreqET = lrintf(o->value());}
--              tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {405 255 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
-+              tooltip {How the frequency varies according to the keyboard (leftmost for fixed frequency)} xywh {405 255 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
-               code0 {o->value(pars->VoicePar[nvoice].PfixedfreqET);}
-               code1 {if (pars->VoicePar[nvoice].Pfixedfreq==0) o->deactivate();}
-               class WidgetPDial
-Index: yoshimi/src/UI/LFOUI.fl
-===================================================================
---- yoshimi.orig/src/UI/LFOUI.fl	2013-08-19 04:16:54.529000911 +0200
-+++ yoshimi/src/UI/LFOUI.fl	2013-08-19 04:16:54.525000910 +0200
-@@ -140,7 +140,7 @@
-         Fl_Check_Button continous {
-           label {C.}
-           callback {pars->Pcontinous=(int)o->value();}
--          tooltip {Continous LFO} xywh {165 35 15 15} down_box DOWN_BOX labelsize 10 align 2
-+          tooltip {Continuous LFO} xywh {165 35 15 15} down_box DOWN_BOX labelsize 10 align 2
-         }
-         Fl_Dial freqrand {
-           label {F.R.}
-Index: yoshimi/src/UI/PADnoteUI.fl
-===================================================================
---- yoshimi.orig/src/UI/PADnoteUI.fl	2013-08-19 04:16:54.529000911 +0200
-+++ yoshimi/src/UI/PADnoteUI.fl	2013-08-19 04:19:26.537007091 +0200
-@@ -805,7 +805,7 @@
-               xywh {125 125 100 20} labelfont 1 labelsize 11
-             }
-             MenuItem {} {
--              label Continous
-+              label Continuous
-               xywh {115 115 100 20} labelfont 1 labelsize 11
-             }
-           }
-@@ -892,7 +892,7 @@
-             Fl_Dial fixedfreqetdial {
-               label {Eq.T.}
-               callback {pars->PfixedfreqET=(int) o->value();}
--              tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {420 295 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
-+              tooltip {How the frequency varies according to the keyboard (leftmost for fixed frequency)} xywh {420 295 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
-               code0 {o->value(pars->PfixedfreqET);}
-               code1 {if (pars->Pfixedfreq==0) o->deactivate();}
-               class WidgetPDial
-Index: yoshimi/src/UI/SUBnoteUI.fl
-===================================================================
---- yoshimi.orig/src/UI/SUBnoteUI.fl	2013-08-19 04:16:54.529000911 +0200
-+++ yoshimi/src/UI/SUBnoteUI.fl	2013-08-19 04:16:54.525000910 +0200
-@@ -328,7 +328,7 @@
-         Fl_Dial fixedfreqetdial {
-           label {Eq.T.}
-           callback {pars->PfixedfreqET=(int) o->value();}
--          tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {610 45 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
-+          tooltip {How the frequency varies according to the keyboard (leftmost for fixed frequency)} xywh {610 45 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1
-           code0 {o->value(pars->PfixedfreqET);}
-           code1 {if (pars->Pfixedfreq==0) o->deactivate();}
-           class WidgetPDial
-Index: yoshimi/src/Params/LFOParams.cpp
-===================================================================
---- yoshimi.orig/src/Params/LFOParams.cpp	2013-08-19 04:16:54.529000911 +0200
-+++ yoshimi/src/Params/LFOParams.cpp	2013-08-19 04:16:54.525000910 +0200
-@@ -82,7 +82,7 @@
-     xml->addpar("randomness_frequency", Pfreqrand);
-     xml->addpar("delay", Pdelay);
-     xml->addpar("stretch", Pstretch);
--    xml->addparbool("continous",    Pcontinous);
-+    xml->addparbool("continuous",    Pcontinous);
- }
- 
- 
-@@ -96,5 +96,5 @@
-     Pfreqrand = xml->getpar127("randomness_frequency", Pfreqrand);
-     Pdelay = xml->getpar127("delay", Pdelay);
-     Pstretch = xml->getpar127("stretch", Pstretch);
--    Pcontinous = xml->getparbool("continous", Pcontinous);
-+    Pcontinous = xml->getparbool("continuous", Pcontinous);
- }
diff --git a/debian/patches/series b/debian/patches/series
index f8bd90a..91b76cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01-gcc_flags.patch
-#02-spelling.patch
 03-fix_compat_9_build.patch
 04-fix_FTBFS.patch

-- 
yoshimi packaging



More information about the pkg-multimedia-commits mailing list