Package: mediatomb
Version: 0.12.0~svn2018-4
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: origin-ubuntu karmic ubuntu-patch
In Ubuntu, we've applied the attached patch to achieve the following:
* Merge from debian unstable, Ubuntu remaining changes:
- Add OR depends on abrowser.
* Add glibc-2.10_fix.patch patch to prevent FTBFS with glibc-2.10.
* debian/config.xml.dist: Allow playing the mkv files that haven't
"video/x-matroska" as mimetype (LP: #417533).
We thought you might be interested in doing the same.
-- System Information:
Debian Release: 5.0
APT prefers jaunty-updates
APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500,
'jaunty-backports'), (500, 'jaunty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.28-15-generic (SMP w/2 CPU cores)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
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>
\ Nessun a capo alla fine del file
+</config>
diff -u mediatomb-0.12.0~svn2018/debian/changelog mediatomb-0.12.0~svn2018/debian/changelog
diff -u mediatomb-0.12.0~svn2018/debian/control mediatomb-0.12.0~svn2018/debian/control
--- mediatomb-0.12.0~svn2018/debian/control
+++ mediatomb-0.12.0~svn2018/debian/control
@@ -1,7 +1,8 @@
Source: mediatomb
Section: net
Priority: optional
-Maintainer: Debian multimedia packages maintainers <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Debian multimedia packages maintainers <[email protected]>
DM-Upload-Allowed: yes
Uploaders: Andres Mejia <[email protected]>,
Leonhard Wimmer <[email protected]>, Sven Mueller <[email protected]>
@@ -49,7 +50,7 @@
Package: mediatomb
Architecture: all
Depends: mediatomb-daemon (>= ${source:Version}),
- iceweasel | firefox | www-browser, ${misc:Depends}
+ iceweasel | firefox | abrowser | www-browser, ${misc:Depends}
Description: UPnP MediaServer (main package)
MediaTomb is an UPnP MediaServer with a nice web user interface, it allows you
to stream your digital media through your home network and listen to/watch it
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 @@
+glibc-2.10_fix.patch
only in patch2:
unchanged:
--- mediatomb-0.12.0~svn2018.orig/debian/patches/glibc-2.10_fix.patch
+++ mediatomb-0.12.0~svn2018/debian/patches/glibc-2.10_fix.patch
@@ -0,0 +1,26 @@
+Author: Alessio Treglia <[email protected]>
+Description: Fix FTBFS with glibc 2.10.
+Index: mediatomb-0.12.0~svn2018/src/tools.cc
+===================================================================
+--- mediatomb-0.12.0~svn2018.orig/src/tools.cc 2009-08-28 11:10:56.487660957 +0200
++++ mediatomb-0.12.0~svn2018/src/tools.cc 2009-08-28 11:11:59.543162385 +0200
+@@ -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)
