[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.9.0+dfsg1-1-7-g6e14850

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit fcfc8775de4ffc81a6942d177b0588058f81462c
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Jul 9 09:42:39 2014 +0200

    * New upstream release.
      - Refresh hunky patch 01-changed-preset-path.
---
 debian/changelog                           |  4 +++-
 debian/patches/01-changed-preset-path.diff | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22ec54c..0dab86b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-mlt (0.9.0+dfsg1-2) UNRELEASED; urgency=medium
+mlt (0.9.2-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
+    - Refresh hunky patch 01-changed-preset-path.
   * Overwrite lintian warning intra-source-package-circular-dependency, because
     those dependencies are required.
 
diff --git a/debian/patches/01-changed-preset-path.diff b/debian/patches/01-changed-preset-path.diff
index 8b85aa2..7a3224f 100644
--- a/debian/patches/01-changed-preset-path.diff
+++ b/debian/patches/01-changed-preset-path.diff
@@ -4,9 +4,9 @@
 # /usr/share/avconv/*.avpreset
 # Closes: #681339
 
-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
+diff -Naur mlt-0.9.2.orig/src/modules/avformat/configure mlt-0.9.2/src/modules/avformat/configure
+--- mlt-0.9.2.orig/src/modules/avformat/configure	2014-06-29 22:23:17.000000000 +0200
++++ mlt-0.9.2/src/modules/avformat/configure	2014-07-09 09:40:26.572402187 +0200
 @@ -84,7 +84,7 @@
  	then 
  		if [ -d "$static_ffmpeg" ]
@@ -16,10 +16,10 @@ diff -Naur mlt-0.9.0.orig/src/modules/avformat/configure mlt-0.9.0/src/modules/a
  			echo "CFLAGS+=-I$static_ffmpeg" >> config.mak
  			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
  			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 @@
+diff -Naur mlt-0.9.2.orig/src/modules/avformat/consumer_avformat.c mlt-0.9.2/src/modules/avformat/consumer_avformat.c
+--- mlt-0.9.2.orig/src/modules/avformat/consumer_avformat.c	2014-06-29 22:23:17.000000000 +0200
++++ mlt-0.9.2/src/modules/avformat/consumer_avformat.c	2014-07-09 09:40:26.572402187 +0200
+@@ -805,12 +805,12 @@
  				AVCodec *codec = avcodec_find_encoder( c->codec_id );
  				if ( codec )
  				{

-- 
MLT multimedia framework packaging