[SCM] MLT multimedia framework packaging branch, master, updated. debian/6.0.0-3-5-g19aca78

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit b210df34d0771d5f169a6b1c1947c9111848f5c6
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Apr 20 11:31:15 2016 +0200

    - Remove merged patch 01-empty-directory.
---
 debian/changelog                       |  1 +
 debian/patches/01-empty-directory.diff | 14 --------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1be5f8..284ea77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mlt (6.2.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Remove merged patch 01-empty-directory.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 20 Apr 2016 11:29:51 +0200
 
diff --git a/debian/patches/01-empty-directory.diff b/debian/patches/01-empty-directory.diff
deleted file mode 100644
index cc0d69a..0000000
--- a/debian/patches/01-empty-directory.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix make install creates empty "movit" directory.
-
-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),)
diff --git a/debian/patches/series b/debian/patches/series
index e8cafb1..8470f60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01-empty-directory.diff
 02-kfreebsd-ftbfs.diff

-- 
MLT multimedia framework packaging