[SCM] yoshimi/master: Patches refreshed/deleted.

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

The following commit has been merged in the master branch:
commit f41356064a7945f78e72db73c8ca7e56752788db
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Oct 2 11:35:02 2017 +0200

    Patches refreshed/deleted.

diff --git a/debian/patches/01-gcc_flags.patch b/debian/patches/01-gcc_flags.patch
index 5a5b0ca..c6c3432 100644
--- a/debian/patches/01-gcc_flags.patch
+++ b/debian/patches/01-gcc_flags.patch
@@ -11,7 +11,7 @@ Index: yoshimi/src/CMakeLists.txt
 ===================================================================
 --- yoshimi.orig/src/CMakeLists.txt
 +++ yoshimi/src/CMakeLists.txt
-@@ -109,6 +109,9 @@ set (BuildOptionsBasic
+@@ -111,6 +111,9 @@ set (BuildOptionsBasic
  set (BuildOptionsDebug
      "-O0 -g3 -ggdb -Wall -Wpointer-arith" CACHE STRING "Debug build flags")
  
@@ -21,7 +21,7 @@ Index: yoshimi/src/CMakeLists.txt
  find_package (PkgConfig REQUIRED)
  if (PKG_CONFIG_FOUND)
      message(STATUS "Found pkg-config ${PKG_CONFIG_EXECUTABLE}")
-@@ -276,6 +279,7 @@ else (BuildForDebug)
+@@ -270,6 +273,7 @@ else (BuildForDebug)
              endif (BuildForNEON)
          endif (BuildForCore2_X86_64)
      endif (BuildForAMD_X86_64)
diff --git a/debian/patches/02-spelling.patch b/debian/patches/02-spelling.patch
deleted file mode 100644
index 9b5208c..0000000
--- a/debian/patches/02-spelling.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Spelling patch.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: willgodfrey at musically.me.uk
-
-Index: yoshimi/src/Interface/CmdInterface.cpp
-===================================================================
---- yoshimi.orig/src/Interface/CmdInterface.cpp
-+++ yoshimi/src/Interface/CmdInterface.cpp
-@@ -127,7 +127,7 @@ string configlist [] = {
-     "ACtivate [s]",             "program change activates part (Enable {other})",
-     "Extended [s]",             "extended program change (Enable {other})",
-     "Quiet [s]",                "ignore 'reset all controllers' (Enable {other})",
--    "Log [s]",                  "incomming MIDI CCs (Enable {other})",
-+    "Log [s]",                  "incoming MIDI CCs (Enable {other})",
-     "SHow [s]",                 "GUI MIDI learn editor (Enable {other})",
-     "end"
- };
-@@ -159,7 +159,7 @@ string partlist [] = {
- string learnlist [] = {
-     "MUte <s>",                 "Enable/Disable this line (Enable, {other})",
-     "7Bit",                     "Set incoming NRPNs as 7 bit (Enable, {other})",
--    "CC <n2>",                  "Set incoming controler value",
-+    "CC <n2>",                  "Set incoming controller value",
-     "CHan <n2>",                "Set incoming channel number",
-     "MIn <n2>",                 "Set minimm percentage",
-     "MAx <n2>",                 "set maximum percentage",
-Index: yoshimi/src/Interface/InterChange.cpp
-===================================================================
---- yoshimi.orig/src/Interface/InterChange.cpp
-+++ yoshimi/src/Interface/InterChange.cpp
-@@ -1177,7 +1177,7 @@ string InterChange::resolveConfig(Comman
-             yesno = true;
-             break;
-         case 73:
--            contstr += "Log incomming CCs";
-+            contstr += "Log incoming CCs";
-             yesno = true;
-             break;
-         case 74:
diff --git a/debian/patches/series b/debian/patches/series
index 5294a2e..ac0ed64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-gcc_flags.patch
-02-spelling.patch

-- 
yoshimi packaging