[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=768e14c

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

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

diff --git a/debian/changelog b/debian/changelog
index 284ea77..ac4bbcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mlt (6.2.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
     - Remove merged patch 01-empty-directory.
+    - Remove merged patch 02-kfreebsd-ftbfs.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 20 Apr 2016 11:29:51 +0200
 
diff --git a/debian/patches/02-kfreebsd-ftbfs.diff b/debian/patches/02-kfreebsd-ftbfs.diff
deleted file mode 100644
index 6c78f72..0000000
--- a/debian/patches/02-kfreebsd-ftbfs.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-commit d643b4abc14301a888295f74da72678788bae88f
-Author: Dan Dennedy <dan at dennedy.org>
-Date:   Mon Feb 22 13:31:03 2016 -0800
-
-    Fix build on Debian kFreeBSD.
-
-diff --git a/src/modules/plusgpl/consumer_cbrts.c b/src/modules/plusgpl/consumer_cbrts.c
-index 634cb56..a69098c 100644
---- a/src/modules/plusgpl/consumer_cbrts.c
-+++ b/src/modules/plusgpl/consumer_cbrts.c
-@@ -38,11 +38,14 @@
- #include <strings.h>
- // includes for socket IO
- #if (_POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE) && (_POSIX_TIMERS > 0)
-+#if !(defined(__FreeBSD_kernel__) && defined(__GLIBC__))
- #define CBRTS_BSD_SOCKETS  1
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
- #include <net/if.h>
-+#include <netinet/in.h>
-+#endif
- #endif
- #include <sys/time.h>
- #include <time.h>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8470f60..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-02-kfreebsd-ftbfs.diff

-- 
MLT multimedia framework packaging