[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.7.6+git20111213-1-1-g33768e3

Patrick Matthäi pmatthaei at alioth.debian.org
Tue Dec 13 18:56:59 UTC 2011


The following commit has been merged in the master branch:
commit 33768e39c6ebe2142513081c2724e91d429160e7
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Tue Dec 13 19:56:50 2011 +0100

    * Remove patch 01-hurd-ftbfs, it still applies but was merged by upstream to
      a better location in the source code.
---
 debian/changelog                  |    7 +++++++
 debian/patches/01-hurd-ftbfs.diff |   17 -----------------
 debian/patches/series             |    1 -
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4d331f..d9eb1a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mlt (0.7.6+git20111213-2) UNRELEASED; urgency=low
+
+  * Remove patch 01-hurd-ftbfs, it still applies but was merged by upstream to
+    a better location in the source code.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 13 Dec 2011 19:56:04 +0100
+
 mlt (0.7.6+git20111213-1) unstable; urgency=low
 
   * New upstream git snapshot.
diff --git a/debian/patches/01-hurd-ftbfs.diff b/debian/patches/01-hurd-ftbfs.diff
deleted file mode 100644
index ab9220a..0000000
--- a/debian/patches/01-hurd-ftbfs.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-# Fix FTBFS on hurd.
-
-diff -Naur mlt-0.7.6.orig/src/framework/mlt_repository.c mlt-0.7.6/src/framework/mlt_repository.c
---- mlt-0.7.6.orig/src/framework/mlt_repository.c	2011-10-31 18:26:04.000000000 +0100
-+++ mlt-0.7.6/src/framework/mlt_repository.c	2011-11-05 11:27:53.898598558 +0100
-@@ -39,6 +39,11 @@
- /** the default subdirectory of the datadir for holding presets */
- #define PRESETS_DIR "/presets"
- 
-+/** on hurd there is no PATH_MAX */
-+#ifndef PATH_MAX
-+#define PATH_MAX 1024
-+#endif
-+
- /** rief Repository class
-  *
-  * The Repository is a collection of plugin modules and their services and service metadata.
diff --git a/debian/patches/series b/debian/patches/series
index 5e52977..08ee75f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01-hurd-ftbfs.diff
 02-hurd-configure.diff

-- 
MLT multimedia framework packaging



More information about the pkg-kde-commits mailing list