[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=cf63c98

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

    - Remove merged patch 03-freetype-ftbfs.
---
 debian/changelog                      |  1 +
 debian/patches/03-freetype-ftbfs.diff | 26 --------------------------
 debian/patches/series                 |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0dab86b..eefbff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mlt (0.9.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
     - Refresh hunky patch 01-changed-preset-path.
+    - Remove merged patch 03-freetype-ftbfs.
   * Overwrite lintian warning intra-source-package-circular-dependency, because
     those dependencies are required.
 
diff --git a/debian/patches/03-freetype-ftbfs.diff b/debian/patches/03-freetype-ftbfs.diff
deleted file mode 100644
index 13a0ba3..0000000
--- a/debian/patches/03-freetype-ftbfs.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-# Upstream patch to fix FTBFS with newer freetype versions.
-# Closes: #733375
-
-diff -Naur mlt-0.9.0.orig/src/modules/gtk2/Makefile mlt-0.9.0/src/modules/gtk2/Makefile
---- mlt-0.9.0.orig/src/modules/gtk2/Makefile	2013-06-03 05:34:35.000000000 +0200
-+++ mlt-0.9.0/src/modules/gtk2/Makefile	2014-01-03 11:43:13.518109987 +0100
-@@ -37,6 +37,7 @@
- OBJS += producer_count.o
- OBJS += filter_dynamictext.o
- CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2`
-+CFLAGS += `pkg-config --cflags-only-I freetype2 | sed 's/ *$$//g')`/freetype
- LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2`
- ifeq ($(targetos),Darwin)
- LDFLAGS += -liconv
-diff -Naur mlt-0.9.0.orig/src/modules/gtk2/producer_pango.c mlt-0.9.0/src/modules/gtk2/producer_pango.c
---- mlt-0.9.0.orig/src/modules/gtk2/producer_pango.c	2013-06-03 05:34:35.000000000 +0200
-+++ mlt-0.9.0/src/modules/gtk2/producer_pango.c	2014-01-03 11:41:10.270113314 +0100
-@@ -25,7 +25,7 @@
- #include <string.h>
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #include <pango/pangoft2.h>
--#include <freetype/freetype.h>
-+#include <freetype.h>
- #include <iconv.h>
- #include <pthread.h>
- #include <ctype.h>
diff --git a/debian/patches/series b/debian/patches/series
index b53e8bc..67ed1a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-changed-preset-path.diff
 02-crash-empty-ladspa-path.diff
-03-freetype-ftbfs.diff

-- 
MLT multimedia framework packaging