[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.8.8-2-8-gacfab06

[Patrick Matthäi]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=1cc4fdd

The following commit has been merged in the master branch:
commit 1cc4fddfb3200a0916af85736d0cb81022abe86a
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Tue Jun 4 11:52:21 2013 +0200

    - Rewrite patch 01-changed-preset-path.
---
 debian/changelog                           |    1 +
 debian/patches/01-changed-preset-path.diff |   18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0096641..1a0dd09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mlt (0.9.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    - Rewrite patch 01-changed-preset-path.
   * Add dependency information to libmlt and libmlt++ with dh_makeshlibs.
     Closes: #709249
 
diff --git a/debian/patches/01-changed-preset-path.diff b/debian/patches/01-changed-preset-path.diff
index 948b609..8b85aa2 100644
--- a/debian/patches/01-changed-preset-path.diff
+++ b/debian/patches/01-changed-preset-path.diff
@@ -4,10 +4,10 @@
 # /usr/share/avconv/*.avpreset
 # Closes: #681339
 
-diff -Naur mlt-0.8.8.orig/src/modules/avformat/configure mlt-0.8.8/src/modules/avformat/configure
---- mlt-0.8.8.orig/src/modules/avformat/configure	2013-01-21 06:57:25.000000000 +0100
-+++ mlt-0.8.8/src/modules/avformat/configure	2013-01-21 09:41:20.769835688 +0100
-@@ -88,7 +88,7 @@
+diff -Naur mlt-0.9.0.orig/src/modules/avformat/configure mlt-0.9.0/src/modules/avformat/configure
+--- mlt-0.9.0.orig/src/modules/avformat/configure	2013-06-03 05:34:35.000000000 +0200
++++ mlt-0.9.0/src/modules/avformat/configure	2013-06-04 11:50:18.832675538 +0200
+@@ -84,7 +84,7 @@
  	then 
  		if [ -d "$static_ffmpeg" ]
  		then
@@ -15,11 +15,11 @@ diff -Naur mlt-0.8.8.orig/src/modules/avformat/configure mlt-0.8.8/src/modules/a
 +			echo "CFLAGS+=-DAVDATADIR=\\"${static_ffmpeg}/avconv/\\"" >> config.mak
  			echo "CFLAGS+=-I$static_ffmpeg" >> config.mak
  			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
- 			[ $targetos = "Darwin" ] &&
-diff -Naur mlt-0.8.8.orig/src/modules/avformat/consumer_avformat.c mlt-0.8.8/src/modules/avformat/consumer_avformat.c
---- mlt-0.8.8.orig/src/modules/avformat/consumer_avformat.c	2013-01-21 06:57:25.000000000 +0100
-+++ mlt-0.8.8/src/modules/avformat/consumer_avformat.c	2013-01-21 09:41:20.769835688 +0100
-@@ -806,12 +806,12 @@
+ 			echo "LDFLAGS+=-L$static_ffmpeg/libswscale" >> config.mak
+diff -Naur mlt-0.9.0.orig/src/modules/avformat/consumer_avformat.c mlt-0.9.0/src/modules/avformat/consumer_avformat.c
+--- mlt-0.9.0.orig/src/modules/avformat/consumer_avformat.c	2013-06-03 05:34:35.000000000 +0200
++++ mlt-0.9.0/src/modules/avformat/consumer_avformat.c	2013-06-04 11:51:04.280674956 +0200
+@@ -783,12 +783,12 @@
  				AVCodec *codec = avcodec_find_encoder( c->codec_id );
  				if ( codec )
  				{

-- 
MLT multimedia framework packaging