[SCM] openmovieeditor/master: Drop 03_gavl_ftbfs.dpatch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Nov 15 22:59:56 UTC 2010


The following commit has been merged in the master branch:
commit 8d009b4d378c55e83d5135ad9bcca7744e6b4c75
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 15 23:52:14 2010 +0100

    Drop 03_gavl_ftbfs.dpatch, applied upstream.

diff --git a/debian/patches/03_gavl_ftbfs.dpatch b/debian/patches/03_gavl_ftbfs.dpatch
deleted file mode 100755
index 5f308cc..0000000
--- a/debian/patches/03_gavl_ftbfs.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_gavl_ftbfs.dpatch by Fabrice Coutadeur
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS with gavl >= 1.0.1-1 (duplicate definition)
-
- at DPATCH@
-diff -urNad openmovieeditor-0.0.20080102~/src/VideoEffectClip.H openmovieeditor-0.0.20080102/src/VideoEffectClip.H
---- openmovieeditor-0.0.20080102~/src/VideoEffectClip.H	2007-11-11 12:12:59.000000000 -0500
-+++ openmovieeditor-0.0.20080102/src/VideoEffectClip.H	2009-03-09 14:40:54.000000000 -0400
-@@ -27,8 +27,6 @@
- #include "IVideoReader.H"
- #include <gavl/gavl.h>
- 
--typedef struct gavl_video_converter_s gavl_video_converter_t;
--typedef struct gavl_video_frame_s gavl_video_frame_t;
- namespace nle
- {
- 

-- 
openmovieeditor packaging



More information about the pkg-multimedia-commits mailing list