[Pkg-samba-maint] r4070 - in trunk/samba/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2012-05-08 19:54:47 +0000 (Tue, 08 May 2012)
New Revision: 4070

Added:
   trunk/samba/debian/patches/bug_604768_upstream_7826_fix-WHATSNEW-link.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Fix link to WHATSNEW.txt in HTML documentation summary file. This
is the second part of the fix for #604768

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-05-08 19:51:25 UTC (rev 4069)
+++ trunk/samba/debian/changelog	2012-05-08 19:54:47 UTC (rev 4070)
@@ -11,6 +11,8 @@
     HTML documentation summary file. Closes: #604768
   * Provide WHATSNEW.txt in samba-doc too as it is linked from the
     documentation summary file. Do not compress that file.
+  * Fix link to WHATSNEW.txt in HTML documentation summary file. This
+    is the second part of the fix for #604768
 
  -- Christian Perrier <bubulle at debian.org>  Mon, 07 May 2012 22:16:32 +0200
 

Added: trunk/samba/debian/patches/bug_604768_upstream_7826_fix-WHATSNEW-link.patch
===================================================================
--- trunk/samba/debian/patches/bug_604768_upstream_7826_fix-WHATSNEW-link.patch	                        (rev 0)
+++ trunk/samba/debian/patches/bug_604768_upstream_7826_fix-WHATSNEW-link.patch	2012-05-08 19:54:47 UTC (rev 4070)
@@ -0,0 +1,18 @@
+Description: Fix WHATSNEW.txt link in HTML documentation summary to fit Debian files organization
+Author: Christian Perrier <bubulle at debian.org>
+Bug-Debian: http://bugs.debian.org/604768
+Forwarded: Debian specific
+
+Index: samba/docs/htmldocs/index.html
+===================================================================
+--- samba.orig/docs/htmldocs/index.html
++++ samba/docs/htmldocs/index.html
+@@ -27,7 +27,7 @@
+  <td valign="top">The Samba man pages in HTML.</td>
+ </tr>
+ <tr>
+- <td valign="top"><a href="../../WHATSNEW.txt">WHATSNEW</a></td>
++ <td valign="top"><a href="../WHATSNEW.txt">WHATSNEW</a></td>
+   <td valign="top">Samba Release Notes.</td>
+ </tr>
+ </table></body></html>

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2012-05-08 19:51:25 UTC (rev 4069)
+++ trunk/samba/debian/patches/series	2012-05-08 19:54:47 UTC (rev 4070)
@@ -17,3 +17,4 @@
 bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
 bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch
 bug_604768_upstream_7826_drop-using-samba-link.patch
+bug_604768_upstream_7826_fix-WHATSNEW-link.patch