[SCM] MLT multimedia framework packaging branch, master, updated. debian/6.0.0-1-6-gf9913f0

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit 7c721d46806ff1c9bb61025f3d14b04f67f0507b
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Thu Feb 18 20:43:16 2016 +0100

    Fix upstream patch.
---
 debian/patches/01-empty-directory.diff | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/patches/01-empty-directory.diff b/debian/patches/01-empty-directory.diff
index 061af32..cc0d69a 100644
--- a/debian/patches/01-empty-directory.diff
+++ b/debian/patches/01-empty-directory.diff
@@ -1,18 +1,14 @@
-commit ba5dc765432ab9b2121b8f14f6ddd5dfffb8851d
-Author: Dan Dennedy <dan at dennedy.org>
-Date:   Thu Feb 18 08:41:48 2016 -0800
+Fix make install creates empty "movit" directory.
 
-    Fix make install creates empty "movit" directory.
-
-diff --git a/src/modules/opengl/Makefile b/src/modules/opengl/Makefile
-index 4450eae..f6d6787 100644
---- a/src/modules/opengl/Makefile
-+++ b/src/modules/opengl/Makefile
-@@ -69,7 +69,6 @@ clean:
+diff -Naur mlt-6.0.0.orig/src/modules/opengl/Makefile mlt-6.0.0/src/modules/opengl/Makefile
+--- mlt-6.0.0.orig/src/modules/opengl/Makefile	2016-02-18 00:43:24.000000000 +0100
++++ mlt-6.0.0/src/modules/opengl/Makefile	2016-02-18 20:35:02.913144436 +0100
+@@ -69,7 +69,7 @@
  
  install: all
  	install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
 -	install -d "$(DESTDIR)$(datadir)/mlt/opengl/movit"
++	install -d "$(DESTDIR)$(datadir)/mlt/opengl"
  	install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/opengl"
  
  ifneq ($(wildcard .depend),)

-- 
MLT multimedia framework packaging