[SCM] mediatomb/master: d/p/0012_remove_absolute_paths.patch: new patch. #617367

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 6465cd7cd9d62d8b1da899637b40515db7df20bc
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Fri Sep 26 21:07:10 2014 +0200

    d/p/0012_remove_absolute_paths.patch: new patch. #617367
    
    Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>

diff --git a/debian/changelog b/debian/changelog
index ed0b680..b0b7cd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ mediatomb (0.12.1-6) UNRELEASED; urgency=medium
   * d/control: alternative build depend on libcurl4-openssl-dev.
     Based on a proposal by Mathieu Malaterre.
     (Closes: #696553)
+  * d/p/0012_remove_absolute_paths.patch: new patch.
+    Thanks Rene Martin Rodriguez for patch.
+    (Closes: #617367)
 
  -- Hector Oron <zumbi at debian.org>  Fri, 26 Sep 2014 20:30:49 +0200
 
diff --git a/debian/patches/0012_remove_absolute_paths.patch b/debian/patches/0012_remove_absolute_paths.patch
new file mode 100644
index 0000000..04dd505
--- /dev/null
+++ b/debian/patches/0012_remove_absolute_paths.patch
@@ -0,0 +1,88 @@
+--- mediatomb-0.12.1.orig/web/disabled.html
++++ mediatomb-0.12.1/web/disabled.html
+@@ -2,7 +2,7 @@
+ <html>
+     <head>
+         <title>MediaTomb</title>
+-        <link rel="StyleSheet" href="/main.css" type="text/css">
++        <link rel="StyleSheet" href="/mediatomb/main.css" type="text/css">
+     </head>
+     <body>
+         <div style="text-align: center;"><br>
+--- mediatomb-0.12.1.orig/web/left.html
++++ mediatomb-0.12.1/web/left.html
+@@ -32,8 +32,8 @@
+     <head>
+         <title>M E D I A T O M B</title>
+         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+-        <link rel="StyleSheet" href="/main.css" type="text/css">
+-        <link rel="StyleSheet" href="/std_treelook.css" type="text/css">
++        <link rel="StyleSheet" href="main.css" type="text/css">
++        <link rel="StyleSheet" href="std_treelook.css" type="text/css">
+     </head>
+ <body id="body">
+     <div id="treeDiv" style="display:none;"></div>
+--- mediatomb-0.12.1.orig/web/right.html
++++ mediatomb-0.12.1/web/right.html
+@@ -32,7 +32,7 @@
+     <head>
+         <title>MEDIATOMB</title>
+         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+-        <link rel="StyleSheet" href="/main.css" type="text/css">
++        <link rel="StyleSheet" href="main.css" type="text/css">
+     </head>
+     <body>
+         <div id="item_db_div" style="display:none">
+--- mediatomb-0.12.1.orig/web/top.html
++++ mediatomb-0.12.1/web/top.html
+@@ -32,7 +32,7 @@
+     <head>
+         <title>MEDIATOMB</title>
+         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+-        <link rel="StyleSheet" href="/main.css" type="text/css">
++        <link rel="StyleSheet" href="main.css" type="text/css">
+     </head>
+     <body>
+         <div id="topDiv" style="color:black; background-image:url(icons/film.png); background-repeat:repeat-x; background-position: 40px 15px;">
+@@ -56,16 +56,16 @@
+                         <img src="icons/mediatomb.png" width="253" height="81" alt="MEDIATOMB" class="logo">
+                     </td>
+                     <td width="20%" valign="middle" align="center">
+-                        <a id="logout_link" href="javascript:parent.logout();" style="display:none;"><img id="logout_img" width="30" height="20" alt="Logout" src="/icons/stock_exit.png" border="0"></a>
++                        <a id="logout_link" href="javascript:parent.logout();" style="display:none;"><img id="logout_img" width="30" height="20" alt="Logout" src="icons/stock_exit.png" border="0"></a>
+                     </td>
+                 </tr>
+                 <tr>
+                     <td colspan="2" style="vertical-align:middle;">
+                         <div id="currentTaskTd" style="display:none;">
+                             <a id="cancelCurrentTask" href="javascript:parent.cancelCurrentTask();">
+-                                <img src="/icons/remove_this.png" width="30" height="20" alt="cancel task" border="0" style="vertical-align:middle;">
++                                <img src="icons/remove_this.png" width="30" height="20" alt="cancel task" border="0" style="vertical-align:middle;">
+                             </a>
+-                            <img id="cancelCurrentTaskPlaceholder" src="/icons/blank.png" width="30" height="20" alt="" border="0" style="vertical-align:middle;display:none;">
++                            <img id="cancelCurrentTaskPlaceholder" src="icons/blank.png" width="30" height="20" alt="" border="0" style="vertical-align:middle;display:none;">
+                             <span style="vertical-align:middle;" id="currentTaskText"> </span>
+                         </div>
+                     </td>
+--- mediatomb-0.12.1.orig/web/topleft.html
++++ mediatomb-0.12.1/web/topleft.html
+@@ -32,7 +32,7 @@
+     <head>
+         <title>MEDIATOMB</title>
+         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+-        <link rel="StyleSheet" href="/main.css" type="text/css">
++        <link rel="StyleSheet" href="main.css" type="text/css">
+     </head>
+ <body>
+     <div id="db_fs_selector" style="display:none;">
+--- mediatomb-0.12.1.orig/web/topright.html
++++ mediatomb-0.12.1/web/topright.html
+@@ -32,7 +32,7 @@
+     <head>
+         <title>MEDIATOMB</title>
+         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+-        <link rel="StyleSheet" href="/main.css" type="text/css">
++        <link rel="StyleSheet" href="main.css" type="text/css">
+     </head>
+     <body>
+         <div id="item_db_div" style="display:none">
diff --git a/debian/patches/series b/debian/patches/series
index 938733c..f13f044 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,5 @@
 0009b_fix_ffmpeg_metadata.patch
 0010_fix_libmp4v2_build.patch
 0011_libav_9_support.patch
+0012_remove_absolute_paths.patch
 0013_symlinks.patch

-- 
MediaTomb packaging



More information about the pkg-multimedia-commits mailing list