[SCM] yoshimi/master: Remove patches applied upstream

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Thu Jul 19 14:35:27 UTC 2012


The following commit has been merged in the master branch:
commit dd2b7f58313e0ad725c74cfc401f27b793b93b51
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Jul 19 16:27:39 2012 +0200

    Remove patches applied upstream

diff --git a/debian/patches/02-gcc47.patch b/debian/patches/02-gcc47.patch
deleted file mode 100644
index 38b69a9..0000000
--- a/debian/patches/02-gcc47.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBFS with GCC 4.7.
-From: yoshimi.git.sf.net/git/gitweb.cgi?p=yoshimi/yoshimi;a=commit;h=99136070f3a7
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672002
----
- src/MusicIO/JackEngine.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
---- yoshimi.orig/src/MusicIO/JackEngine.cpp
-+++ yoshimi/src/MusicIO/JackEngine.cpp
-@@ -18,6 +18,7 @@
- */
- 
- #include <errno.h>
-+#include <unistd.h>
- #include <jack/midiport.h>
- #include <jack/thread.h>
- #include <fcntl.h>
diff --git a/debian/patches/series b/debian/patches/series
index 9749fbc..ac0ed64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-gcc_flags.patch
-02-gcc47.patch

-- 
yoshimi packaging



More information about the pkg-multimedia-commits mailing list