[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.7.4-4-4-gb5abf28

Patrick Matthäi pmatthaei at alioth.debian.org
Tue Nov 1 21:18:42 UTC 2011


The following commit has been merged in the master branch:
commit eedfa460f969bbf76a08c29f1a0d481f4b96396a
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Tue Nov 1 21:43:21 2011 +0100

    - Remove all patches, they have been merged by upstream.
---
 debian/changelog                   |    3 ++-
 debian/patches/01-kfbsd-ftbfs.diff |   14 --------------
 debian/patches/series              |    1 -
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83a184b..dffc153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 mlt (0.7.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    - Remove all patches, they have been merged by upstream.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 01 Nov 2011 21:40:39 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 01 Nov 2011 21:42:51 +0100
 
 mlt (0.7.4-4) unstable; urgency=low
 
diff --git a/debian/patches/01-kfbsd-ftbfs.diff b/debian/patches/01-kfbsd-ftbfs.diff
deleted file mode 100644
index 749f82a..0000000
--- a/debian/patches/01-kfbsd-ftbfs.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Fix FTBFS on kfreebsd.
-
-diff -Naur mlt-0.7.4.orig/src/framework/mlt_property.h mlt-0.7.4/src/framework/mlt_property.h
---- mlt-0.7.4.orig/src/framework/mlt_property.h	2011-07-17 00:09:51.000000000 +0200
-+++ mlt-0.7.4/src/framework/mlt_property.h	2011-07-17 20:44:22.806703044 +0200
-@@ -26,7 +26,7 @@
- 
- #include "mlt_types.h"
- 
--#if defined(__linux__) || defined(__DARWIN__)
-+#if defined(__linux__) || defined(__DARWIN__) || defined(__GLIBC__)
- #include <xlocale.h>
- #else
- typedef void* locale_t;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 139a48d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-kfbsd-ftbfs.diff

-- 
MLT multimedia framework packaging



More information about the pkg-kde-commits mailing list