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

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

The following commit has been merged in the master branch:
commit 936f137793889126a71cef8a883d6d0d3445f3d4
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Jun 25 19:40:32 2017 +0200

    Patches deleted/refreshed.

diff --git a/debian/patches/01-gcc_flags.patch b/debian/patches/01-gcc_flags.patch
index 03da97d..5a5b0ca 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
-@@ -102,6 +102,9 @@ set (BuildOptionsBasic
+@@ -109,6 +109,9 @@ set (BuildOptionsBasic
  set (BuildOptionsDebug
      "-O0 -g3 -ggdb -Wall -Wpointer-arith" CACHE STRING "Debug build flags")
  
@@ -21,8 +21,8 @@ Index: yoshimi/src/CMakeLists.txt
  find_package (PkgConfig REQUIRED)
  if (PKG_CONFIG_FOUND)
      message(STATUS "Found pkg-config ${PKG_CONFIG_EXECUTABLE}")
-@@ -260,6 +263,7 @@ else (BuildForDebug)
-             set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
+@@ -276,6 +279,7 @@ else (BuildForDebug)
+             endif (BuildForNEON)
          endif (BuildForCore2_X86_64)
      endif (BuildForAMD_X86_64)
 +    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsDebian})
diff --git a/debian/patches/02-appdata_file.patch b/debian/patches/02-appdata_file.patch
deleted file mode 100644
index 58bb6cd..0000000
--- a/debian/patches/02-appdata_file.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Author: Will Godfrey <willgodfrey at musically.me.uk> - upstream author
-Description: Update appdata file.
-Forwarded: not-needed
-
-Index: yoshimi/desktop/yoshimi.appdata.xml
-===================================================================
---- yoshimi.orig/desktop/yoshimi.appdata.xml
-+++ yoshimi/desktop/yoshimi.appdata.xml
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<!-- Copyright 2016 Yoshimi project <willgodfrey at musically.me.uk> -->
-+<!-- Copyright 2016-2017 Yoshimi project <willgodfrey at musically.me.uk> -->
- <application>
-  <id type="desktop">yoshimi.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-@@ -11,18 +11,22 @@
-   Yoshimi is a MIDI software synthesizer for Linux. It synthesizes in real time, can run polyphonic and/or monophonic in multiple simultaneous patches in one or more MIDI channels and has broad microtonal capability. It includes extensive addititive, subtractive, and PAD synth capabilities which can be run simultaneously within the same patch. It also has comprehensive effects capabilities.
-   </p>
-   <p>
--  Originally based on the 2.4.0 version of ZynAddSubFX (Copyright 2002-2009 Nasca Octavian Paul), development of Yoshimi has continued for quite a while now in its own direction. Originally these included major optimizations for audio and MIDI performance. More recently there has been progressive development of user-level access to all controls, including command line access. Refinement continues, both visually and within the code.
-+  Originally based on the 2.4.0 version of ZynAddSubFX (Copyright 2002-2009 Nasca Octavian Paul), development of Yoshimi has continued for quite a while now in its own direction. Originally these included major optimizations for audio and MIDI performance. More recently there has been progressive development of user-level access to all controls, including command line access. Since V1.5.0 there is full Midi Learn capability. Refinement continues, both visually and within the code.
-   </p>
-  </description>
-  <screenshots>
-   <screenshot type="default">
--   <image>https://a.fsdn.com/con/app/proj/yoshimi/screenshots/Front.png</image>
-+   <image>https://a.fsdn.com/con/app/proj/yoshimi/screenshots/Main.png</image>
-    <caption>The main window showing Yoshimi running</caption>
-   </screenshot>
-   <screenshot>
--   <image>https://a.fsdn.com/con/app/proj/yoshimi/screenshots/Collage.png</image>
-+   <image>https://a.fsdn.com/con/app/proj/yoshimi/screenshots/Mixer.png</image>
-    <caption>Yoshimi in action</caption>
-   </screenshot>
-+  <screenshot>
-+   <image>https://a.fsdn.com/con/app/proj/yoshimi/screenshots/MidiLearn.png</image>
-+   <caption>The new MIDI-learn window.</caption>
-+  </screenshot>
-  </screenshots>
-  <keywords>
-   <keyword>music</keyword>
diff --git a/debian/patches/series b/debian/patches/series
index eb7b559..ac0ed64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-gcc_flags.patch
-02-appdata_file.patch

-- 
yoshimi packaging