From: Jaromír Mikeš <mira.mikes@seznam.cz>
Date: Thu, 3 Sep 2015 01:53:04 +0000 (+0200)
Subject: Remove patch - apllied upstream.
X-Git-Tag: archive/raspbian/0.15.4+ds1-1+rpi1^2~196
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=17505a498bbe5f836f3f5f0233ab7c2939642cba;p=giada.git

Remove patch - apllied upstream.
---

diff --git a/debian/patches/default-soundsystem_parentheses.patch b/debian/patches/default-soundsystem_parentheses.patch
deleted file mode 100644
index be36a44..0000000
--- a/debian/patches/default-soundsystem_parentheses.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: proper parentheses around bitwise operations
- the original "(!soundSystem & (SYS_API_ANY))" is
- a) wrong
- b) FTBFS on g++5
-Author: IOhannes m zmölnig
-Forwarded: https://github.com/monocasual/giada/pull/50
-Last-Update: 2015-07-07
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: giada/src/conf.cpp
-===================================================================
---- giada.orig/src/conf.cpp
-+++ giada/src/conf.cpp
-@@ -191,7 +191,7 @@ int Conf::read()
- 	logMode = atoi(getValue("logMode").c_str());
- 
- 	soundSystem = atoi(getValue("soundSystem").c_str());
--	if (!soundSystem & (SYS_API_ANY)) soundSystem = DEFAULT_SOUNDSYS;
-+	if (!(soundSystem & SYS_API_ANY)) soundSystem = DEFAULT_SOUNDSYS;
- 
- 	soundDeviceOut = atoi(getValue("soundDeviceOut").c_str());
- 	if (soundDeviceOut < 0) soundDeviceOut = DEFAULT_SOUNDDEV_OUT;
diff --git a/debian/patches/series b/debian/patches/series
index 2978c72..dd6a725 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-default-soundsystem_parentheses.patch
 0002-spelling.patch