[SCM] openmovieeditor/master: Fix my mistakes in the use of dpatch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Nov 15 20:32:00 UTC 2010


The following commit has been merged in the master branch:
commit c63cc60e521a3fdc738dc8e772db6bd09dcc615f
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 15 21:31:26 2010 +0100

    Fix my mistakes in the use of dpatch.

diff --git a/debian/patches/00list b/debian/patches/00list
index 663ea50..7859f9d 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,3 +2,4 @@
 03_gavl_ftbfs.dpatch
 04_ffmpeg_headers.dpatch
 05_gcc-4.4.dpatch
+06_kfreebsd_ftbfs
diff --git a/debian/patches/06_kfreebsd_ftbfs.dpatch b/debian/patches/06_kfreebsd_ftbfs.dpatch
index f3b170f..3ad64bb 100755
--- a/debian/patches/06_kfreebsd_ftbfs.dpatch
+++ b/debian/patches/06_kfreebsd_ftbfs.dpatch
@@ -2,20 +2,18 @@
 ## 06_kfreebsd_ftbfs.dpatch by Alessio Treglia <alessio at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: Don't include machine/soundcard.h, use sys/soundcard.h instead.
-## DP: Author: Cyril Brulebois <kibi at debian.org>
-## DP: Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562256
+## DP: No description.
 
 @DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' openmovieeditor~/src/portaudio/pa_unix_oss.c openmovieeditor/src/portaudio/pa_unix_oss.c
 --- openmovieeditor~/src/portaudio/pa_unix_oss.c	2010-11-15 18:50:09.000000000 +0100
-+++ openmovieeditor/src/portaudio/pa_unix_oss.c	2010-11-15 19:28:53.971998216 +0100
++++ openmovieeditor/src/portaudio/pa_unix_oss.c	2010-11-15 21:29:41.791200428 +0100
 @@ -44,7 +44,7 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #else
--#include <machine/soundcard.h> /* JH20010905 */
-+#include <sys/soundcard.h> /* JH20010905 */
- #endif
- 
- 
+ #ifdef __linux__
+ #include <linux/soundcard.h>
+ #else
+-#include <machine/soundcard.h> /* JH20010905 */
++#include <sys/soundcard.h> /* JH20010905 */
+ #endif
+ 
+ 

-- 
openmovieeditor packaging



More information about the pkg-multimedia-commits mailing list