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

[bubulle at alioth.debian.org]

tags 604768 pending
thanks

Author: bubulle
Date: 2012-05-08 19:39:39 +0000 (Tue, 08 May 2012)
New Revision: 4067

Added:
   trunk/samba/debian/patches/bug_604768_upstream_7826_drop-using-samba-link.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Drop link to no longer provided "Using Samba" documentation in
HTML documentation sumamry file. Closes: #604768

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-05-08 16:13:37 UTC (rev 4066)
+++ trunk/samba/debian/changelog	2012-05-08 19:39:39 UTC (rev 4067)
@@ -7,6 +7,8 @@
     daemon's logfiles. Closes: #598313
   * Add some mention about some use for the user information in Kerberos
     environments in the smbspool manpage. Closes: #387266
+  * Drop link to no longer provided "Using Samba" documentation in
+    HTML documentation sumamry file. Closes: #604768
 
  -- Christian Perrier <bubulle at debian.org>  Mon, 07 May 2012 22:16:32 +0200
 

Added: trunk/samba/debian/patches/bug_604768_upstream_7826_drop-using-samba-link.patch
===================================================================
--- trunk/samba/debian/patches/bug_604768_upstream_7826_drop-using-samba-link.patch	                        (rev 0)
+++ trunk/samba/debian/patches/bug_604768_upstream_7826_drop-using-samba-link.patch	2012-05-08 19:39:39 UTC (rev 4067)
@@ -0,0 +1,20 @@
+Description: Drop Using Samba link in HTML documentation summary
+Author: Christian Perrier <bubulle at debian.org>
+Bug-Debian: http://bugs.debian.org/604768
+Forwarded: yes
+
+Index: samba/docs/htmldocs/index.html
+===================================================================
+--- samba.orig/docs/htmldocs/index.html
++++ samba/docs/htmldocs/index.html
+@@ -23,10 +23,6 @@
+  <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
+ </tr>
+ <tr>
+- <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
+- <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
+-</tr>
+-<tr>
+  <td valign="top"><a href="manpages/index.html">Man pages</a></td>
+  <td valign="top">The Samba man pages in HTML.</td>
+ </tr>

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2012-05-08 16:13:37 UTC (rev 4066)
+++ trunk/samba/debian/patches/series	2012-05-08 19:39:39 UTC (rev 4067)
@@ -16,3 +16,4 @@
 fix-samba.ldip-syntax.patch
 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