[SCM] MediaTomb packaging branch, master, updated. debian/0.12.0.svn2018-4-9-ga0fceb3

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a0fceb38914a9a83428113252f3759deaed76411
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Feb 7 23:12:21 2010 -0500

    Fix mappings for matroska and ogg files in config.xml. Closes: #544039, #558696

diff --git a/debian/changelog b/debian/changelog
index 60eeeb7..6678840 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ mediatomb (0.12.0~svn2018-6) UNRELEASED; urgency=low
   * Switch to source format 3.0 (quilt).
   * Build-Depend on debhelper (7.0.50~).
   * Fix init script dependencies. (Closes: #567442, #547794).
+  * Fix mappings for matroska files in config.xml. (Closes: #544039)
+  * Fix mappings for ogg files in config.xml. (Closes: #558696)
 
- -- Andres Mejia <mcitadel at gmail.com>  Sun, 07 Feb 2010 16:40:49 -0500
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 07 Feb 2010 23:01:45 -0500
 
 mediatomb (0.12.0~svn2018-5) unstable; urgency=medium
 
diff --git a/debian/config.xml.dist b/debian/config.xml.dist
index 103c1a6..63f50ab 100644
--- a/debian/config.xml.dist
+++ b/debian/config.xml.dist
@@ -88,6 +88,7 @@
         <map from="audio/*" to="object.item.audioItem.musicTrack"/>
         <map from="video/*" to="object.item.videoItem"/>
         <map from="image/*" to="object.item.imageItem"/>
+        <map from="application/ogg" to="object.item.audioItem.musicTrack"/>
       </mimetype-upnpclass>
       <mimetype-contenttype>
         <treat mimetype="audio/mpeg" as="mp3"/>
@@ -103,6 +104,8 @@
         <treat mimetype="audio/mp4" as="mp4"/>
         <treat mimetype="application/x-iso9660" as="dvd"/>
         <treat mimetype="application/x-iso9660-image" as="dvd"/>
+        <treat mimetype="video/x-matroska" as="mkv"/>
+        <treat mimetype="audio/x-matroska" as="mka"/>
       </mimetype-contenttype>
     </mappings>
     <online-content>
diff --git a/debian/patches/config_xml_comment.patch b/debian/patches/config_xml_comment.patch
index 7fc8171..ebb0ffe 100644
--- a/debian/patches/config_xml_comment.patch
+++ b/debian/patches/config_xml_comment.patch
@@ -1,5 +1,6 @@
 Add comment about documentation for config.xml.
-Also add mappings for matroska.
+Also add mappings for matroska. Also add mappings for ogg in like manner as
+audio files.
 ==========================================================================
 --- a/src/config_manager.cc
 +++ b/src/config_manager.cc
@@ -26,3 +27,34 @@ Also add mappings for matroska.
      
      Ref<Comment> ps3info(new Comment(_(" Uncomment the line below for PS3 divx support "), true));
      Ref<Comment> ps3avi(new Comment(_(" <map from=\"avi\" to=\"video/divx\"/> "), true));
+@@ -585,6 +594,8 @@
+                                _(UPNP_DEFAULT_CLASS_VIDEO_ITEM)));
+     mtupnp->appendElementChild(map_from_to(_("image/*"), 
+                                _("object.item.imageItem")));
++    mtupnp->appendElementChild(map_from_to(_("application/ogg"),
++                               _(UPNP_DEFAULT_CLASS_MUSIC_TRACK)));
+ 
+     mappings->appendElementChild(mtupnp);
+ 
+@@ -615,6 +626,10 @@
+                                            _(CONTENT_TYPE_DVD)));
+     mtcontent->appendElementChild(treat_as(_("application/x-iso9660-image"), 
+                                            _(CONTENT_TYPE_DVD)));
++    mtcontent->appendElementChild(treat_as(_("video/x-matroska"),
++                                           _(CONTENT_TYPE_MKV)));
++    mtcontent->appendElementChild(treat_as(_("audio/x-matroska"),
++                                           _(CONTENT_TYPE_MKA)));
+ 
+     mappings->appendElementChild(mtcontent);
+     import->appendElementChild(mappings);
+--- a/src/metadata_handler.h
++++ b/src/metadata_handler.h
+@@ -57,6 +57,8 @@
+ #define CONTENT_TYPE_MPEG       "mpeg"
+ #define CONTENT_TYPE_DVD        "dvd"
+ #define CONTENT_TYPE_QUICKTIME  "quicktime"
++#define CONTENT_TYPE_MKV        "mkv"
++#define CONTENT_TYPE_MKA        "mka"
+ 
+ #define OGG_THEORA              "t"
+ 

-- 
MediaTomb packaging