[SCM] hydrogen/master: Refresh patches.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Jun 12 11:19:14 UTC 2012
The following commit has been merged in the master branch:
commit 7f584517c5655c1194c7f472b1667dd20999da9f
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Jun 12 11:40:22 2012 +0200
Refresh patches.
diff --git a/debian/patches/09_portaudio_v2.patch b/debian/patches/09_portaudio_v2.patch
index 79b52ee..bff5d10 100644
--- a/debian/patches/09_portaudio_v2.patch
+++ b/debian/patches/09_portaudio_v2.patch
@@ -5,7 +5,7 @@
--- hydrogen.orig/src/core/src/IO/PortAudioDriver.h
+++ hydrogen/src/core/src/IO/PortAudioDriver.h
-@@ -28,6 +28,11 @@
+@@ -30,6 +30,11 @@
#ifdef H2CORE_HAVE_PORTAUDIO
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
index fa117db..2d7994e 100644
--- a/debian/patches/ftbfs-gcc-4.7.diff
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -6,8 +6,7 @@ Forwarded: no
src/core/src/IO/portmidi_driver.cpp | 1 +
src/gui/src/MainForm.cpp | 1 +
src/gui/src/SongEditor/SongEditor.cpp | 1 +
- src/tests/xml.cpp | 1 +
- 4 files changed, 4 insertions(+)
+ 3 files changed, 3 insertions(+)
--- hydrogen.orig/src/core/src/IO/portmidi_driver.cpp
+++ hydrogen/src/core/src/IO/portmidi_driver.cpp
@@ -19,14 +18,6 @@ Forwarded: no
#ifdef H2CORE_HAVE_PORTMIDI
---- hydrogen.orig/src/tests/xml.cpp
-+++ hydrogen/src/tests/xml.cpp
-@@ -1,4 +1,5 @@
-
-+#include <unistd.h>
- #include <hydrogen/helpers/filesystem.h>
-
- #include <hydrogen/basics/drumkit.h>
--- hydrogen.orig/src/gui/src/SongEditor/SongEditor.cpp
+++ hydrogen/src/gui/src/SongEditor/SongEditor.cpp
@@ -21,6 +21,7 @@
--
hydrogen packaging
More information about the pkg-multimedia-commits
mailing list