[SCM] mediatomb/master: d/patches/symlinks.patch: rename
zumbi at users.alioth.debian.org
zumbi at users.alioth.debian.org
Fri Oct 3 10:31:34 UTC 2014
The following commit has been merged in the master branch:
commit 141b29d4c006082451326f988bd393f2e329024f
Author: Héctor Orón Martínez <zumbi at debian.org>
Date: Fri Sep 26 20:55:30 2014 +0200
d/patches/symlinks.patch: rename
Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>
diff --git a/debian/changelog b/debian/changelog
index 3587135..ed0b680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
mediatomb (0.12.1-6) UNRELEASED; urgency=medium
- * d/p/symlinks.patch: avoids ignoring symlinks
+ * d/p/0013_symlinks.patch: avoids ignoring symlinks
Thanks Jona Schuman for patch.
(Closes: #677964)
* d/mediatomb-daemon.mediatomb.logrotate: reload service instead use pkill
diff --git a/debian/patches/symlinks.patch b/debian/patches/0013_symlinks.patch
similarity index 74%
rename from debian/patches/symlinks.patch
rename to debian/patches/0013_symlinks.patch
index 1094bdc..940b54b 100644
--- a/debian/patches/symlinks.patch
+++ b/debian/patches/0013_symlinks.patch
@@ -1,5 +1,7 @@
---- mediatomb-0.12.1.orig/src/autoscan_inotify.cc 2010-03-25 10:58:11.000000000 -0400
-+++ mediatomb-0.12.1/src/autoscan_inotify.cc 2012-06-18 02:40:11.000000000 -0400
+Index: mediatomb/src/autoscan_inotify.cc
+===================================================================
+--- mediatomb.orig/src/autoscan_inotify.cc 2014-09-26 20:50:28.455412117 +0200
++++ mediatomb/src/autoscan_inotify.cc 2014-09-26 20:50:28.451412117 +0200
@@ -281,7 +281,7 @@
}
}
@@ -29,8 +31,10 @@
if (mask & IN_IGNORED)
{
removeWatchMoves(wd);
---- mediatomb-0.12.1.orig/src/content_manager.cc 2010-03-25 10:58:11.000000000 -0400
-+++ mediatomb-0.12.1/src/content_manager.cc 2012-06-18 02:03:55.000000000 -0400
+Index: mediatomb/src/content_manager.cc
+===================================================================
+--- mediatomb.orig/src/content_manager.cc 2014-09-26 20:50:28.455412117 +0200
++++ mediatomb/src/content_manager.cc 2014-09-26 20:50:28.451412117 +0200
@@ -202,7 +202,7 @@
#ifdef HAVE_MAGIC
if (! ignore_unknown_extensions)
@@ -39,4 +43,4 @@
+ ms = magic_open(MAGIC_MIME|MAGIC_SYMLINK);
if (ms == NULL)
{
- log_error("magic_open failed\n");
+ log_error("magic_open failed\n");
diff --git a/debian/patches/series b/debian/patches/series
index 3920bc8..938733c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,4 @@
0009b_fix_ffmpeg_metadata.patch
0010_fix_libmp4v2_build.patch
0011_libav_9_support.patch
-symlinks.patch
+0013_symlinks.patch
--
MediaTomb packaging
More information about the pkg-multimedia-commits
mailing list