Hello!
Attached is the diff for the NMU I intend to upload really soon unless
there is any activity from the maintainers...
--
Andreas Henriksson
diff -u mediatomb-0.12.0~svn2018/debian/config.xml.dist mediatomb-0.12.0~svn2018/debian/config.xml.dist
--- mediatomb-0.12.0~svn2018/debian/config.xml.dist
+++ mediatomb-0.12.0~svn2018/debian/config.xml.dist
@@ -100,6 +100,7 @@
<treat mimetype="audio/L16" as="pcm"/>
<treat mimetype="video/x-msvideo" as="avi"/>
<treat mimetype="video/mp4" as="mp4"/>
+ <treat mimetype="video/x-mkv" as="mkv"/>
<treat mimetype="audio/mp4" as="mp4"/>
<treat mimetype="application/x-iso9660" as="dvd"/>
<treat mimetype="application/x-iso9660-image" as="dvd"/>
@@ -154 +155 @@
-</config>
\ No newline at end of file
+</config>
diff -u mediatomb-0.12.0~svn2018/debian/changelog mediatomb-0.12.0~svn2018/debian/changelog
--- mediatomb-0.12.0~svn2018/debian/changelog
+++ mediatomb-0.12.0~svn2018/debian/changelog
@@ -1,3 +1,13 @@
+mediatomb (0.12.0~svn2018-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add upstream rev 2019 to fix glibc 2.10 FTBFS. (Closes: #544039)
+ - debian/patches/upstream-rev-2019.patch
+ * Add video/x-mkv as mkv in shipped configuration.
+ (Thanks to Alessio Treglia for reporting both of the above.)
+
+ -- Andreas Henriksson <[email protected]> Mon, 26 Oct 2009 10:10:52 +0100
+
mediatomb (0.12.0~svn2018-4) unstable; urgency=low
[ Andreas Henriksson ]
diff -u mediatomb-0.12.0~svn2018/debian/patches/series mediatomb-0.12.0~svn2018/debian/patches/series
--- mediatomb-0.12.0~svn2018/debian/patches/series
+++ mediatomb-0.12.0~svn2018/debian/patches/series
@@ -4,0 +5 @@
+upstream-rev-2019.patch
only in patch2:
unchanged:
--- mediatomb-0.12.0~svn2018.orig/debian/patches/upstream-rev-2019.patch
+++ mediatomb-0.12.0~svn2018/debian/patches/upstream-rev-2019.patch
@@ -0,0 +1,25 @@
+# Patch from upstream svn, revision 2019
+# Fixes build with glibc 2.10, see http://bugs.debian.org/544039
+
+--- a/src/tools.cc 2009/01/11 19:10:43 2010
++++ b/src/tools.cc 2009/05/23 18:55:35 2019
+@@ -303,8 +303,8 @@
+ Ref<StringBuffer> buf(new StringBuffer(len / 2));
+ for (int i = 0; i < len; i += 2)
+ {
+- char *chi = strchr(HEX_CHARS, ptr[i]);
+- char *clo = strchr(HEX_CHARS, ptr[i + 1]);
++ const char *chi = strchr(HEX_CHARS, ptr[i]);
++ const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
+ int hi, lo;
+
+ if (chi)
+@@ -397,7 +397,7 @@
+ char clo = data[i++];
+ int hi, lo;
+
+- char *pos;
++ const char *pos;
+
+ pos = strchr(hex, chi);
+ if (!pos)
