[SCM] giada/master: Added missing files to catch-patch

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6c18f91ac48e11c14481880284dba943010dcaaa
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Oct 30 09:58:45 2017 +0100

    Added missing files to catch-patch

diff --git a/debian/patches/04-catch.patch b/debian/patches/04-catch.patch
index f01c257..8d2343a 100644
--- a/debian/patches/04-catch.patch
+++ b/debian/patches/04-catch.patch
@@ -12,10 +12,8 @@ Subject: test with system-wide catch.
  tests/wave.cpp        | 2 +-
  7 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/tests/conf.cpp b/tests/conf.cpp
-index a561d1a..df9113c 100644
---- a/tests/conf.cpp
-+++ b/tests/conf.cpp
+--- giada.orig/tests/conf.cpp
++++ giada/tests/conf.cpp
 @@ -1,6 +1,6 @@
  #include "../src/core/const.h"
  #include "../src/core/conf.h"
@@ -24,19 +22,15 @@ index a561d1a..df9113c 100644
  
  
  using std::string;
-diff --git a/tests/main.cpp b/tests/main.cpp
-index eb3c215..37c527d 100644
---- a/tests/main.cpp
-+++ b/tests/main.cpp
+--- giada.orig/tests/main.cpp
++++ giada/tests/main.cpp
 @@ -1,3 +1,3 @@
  #define CATCH_CONFIG_MAIN
  #define CATCH_CONFIG_FAST_COMPILE
 -#include "catch/single_include/catch.hpp"
 +#include <catch.hpp>
-diff --git a/tests/midiMapConf.cpp b/tests/midiMapConf.cpp
-index 28b3779..5903fca 100644
---- a/tests/midiMapConf.cpp
-+++ b/tests/midiMapConf.cpp
+--- giada.orig/tests/midiMapConf.cpp
++++ giada/tests/midiMapConf.cpp
 @@ -1,6 +1,6 @@
  #include "../src/core/const.h"
  #include "../src/core/midiMapConf.h"
@@ -45,10 +39,8 @@ index 28b3779..5903fca 100644
  
  
  using std::string;
-diff --git a/tests/patch.cpp b/tests/patch.cpp
-index da55162..b7a0808 100644
---- a/tests/patch.cpp
-+++ b/tests/patch.cpp
+--- giada.orig/tests/patch.cpp
++++ giada/tests/patch.cpp
 @@ -1,6 +1,6 @@
  #include "../src/core/patch.h"
  #include "../src/core/const.h"
@@ -57,10 +49,8 @@ index da55162..b7a0808 100644
  
  
  using std::string;
-diff --git a/tests/recorder.cpp b/tests/recorder.cpp
-index eda8ec8..ca546d9 100644
---- a/tests/recorder.cpp
-+++ b/tests/recorder.cpp
+--- giada.orig/tests/recorder.cpp
++++ giada/tests/recorder.cpp
 @@ -1,6 +1,6 @@
  #include "../src/core/recorder.h"
  #include "../src/core/const.h"
@@ -69,10 +59,8 @@ index eda8ec8..ca546d9 100644
  
  
  using std::string;
-diff --git a/tests/utils.cpp b/tests/utils.cpp
-index 852b77a..0e67001 100644
---- a/tests/utils.cpp
-+++ b/tests/utils.cpp
+--- giada.orig/tests/utils.cpp
++++ giada/tests/utils.cpp
 @@ -1,6 +1,6 @@
  #include "../src/utils/fs.h"
  #include "../src/utils/string.h"
@@ -81,10 +69,8 @@ index 852b77a..0e67001 100644
  
  
  using std::vector;
-diff --git a/tests/wave.cpp b/tests/wave.cpp
-index 4f2e18a..167ca36 100644
---- a/tests/wave.cpp
-+++ b/tests/wave.cpp
+--- giada.orig/tests/wave.cpp
++++ giada/tests/wave.cpp
 @@ -1,6 +1,6 @@
  #include <memory>
  #include "../src/core/wave.h"
@@ -93,3 +79,36 @@ index 4f2e18a..167ca36 100644
  
  
  using std::string;
+--- giada.orig/tests/pluginHost.cpp
++++ giada/tests/pluginHost.cpp
+@@ -5,7 +5,7 @@
+ #if 0
+ 
+ #include "../src/core/pluginHost.h"
+-#include "catch/single_include/catch.hpp"
++#include <catch.hpp>
+ 
+ 
+ TEST_CASE("Test PluginHost class")
+--- giada.orig/tests/waveFx.cpp
++++ giada/tests/waveFx.cpp
+@@ -2,7 +2,7 @@
+ #include "../src/core/const.h"
+ #include "../src/core/wave.h"
+ #include "../src/core/waveFx.h"
+-#include "catch/single_include/catch.hpp"
++#include <catch.hpp>
+ 
+ 
+ using std::string;
+--- giada.orig/tests/waveManager.cpp
++++ giada/tests/waveManager.cpp
+@@ -2,7 +2,7 @@
+ #include "../src/core/waveManager.h"
+ #include "../src/core/wave.h"
+ #include "../src/core/const.h"
+-#include "catch/single_include/catch.hpp"
++#include <catch.hpp>
+ 
+ 
+ using std::string;

-- 
giada packaging