Sync'ing packaging/Debian/ with the latest files from the official

Debian packages. This files are in sync. with the Debian packages for
3.0.0rc2.
(This used to be commit 7d8d193c05d60ab9b86d52075bb9ec5ad1857903)

1 files changed, 0 insertions, 33 deletions

diff --git a/packaging/Debian/debian/patches/documentation.patch b/packaging/Debian/debian/patches/documentation.patch
index 65f7421ab4..c5e66232f9 100644
--- a/packaging/Debian/debian/patches/documentation.patch
+++ b/packaging/Debian/debian/patches/documentation.patch
@@ -1,36 +1,3 @@
-diff -uNr samba-2.999+3.0.alpha21.orig/docs/htmldocs/using_samba/ch06_05.html samba-2.999+3.0.alpha21/docs/htmldocs/using_samba/ch06_05.html
---- samba-2.999+3.0.alpha21.orig/docs/htmldocs/using_samba/ch06_05.html	2000-07-30 02:38:29.000000000 -0500
-+++ samba-2.999+3.0.alpha21/docs/htmldocs/using_samba/ch06_05.html	2002-12-16 23:15:46.000000000 -0600
-@@ -102,13 +102,13 @@
- WARNING:</strong> You will need to use at least Samba 2.1 to ensure that PDC functionality for Windows NT clients is present. Prior to Samba 2.1, only limited user authentication for NT clients was present. At the time this book went to press, Samba 2.0.5 was the latest version, but Samba  2.1 was available through CVS download. Instructions on downloading alpha versions of Samba are given in <a href="appe_01.html"><b>Appendix E, <CITE CLASS="appendix">Downloading Samba with CVS</cite></b></a>.</p></blockquote><P CLASS="para">
- As before, you need to ensure that Samba is a primary domain controller for the current workgroup and is using user-level security. However, you must also ensure that Samba is using encrypted passwords. In other words, alter the <CODE CLASS="literal">
- [global]</code> options the previous example to include the <CODE CLASS="literal">
--encrypted</code> <CODE CLASS="literal">
-+encrypt</code> <CODE CLASS="literal">
- passwords</code> <CODE CLASS="literal">
- =</code> <CODE CLASS="literal">
- yes</code> option, as shown here: </p><PRE CLASS="programlisting">
- [global]
- 	workgroup = SIMPLE
--	encrypted passwords = yes
-+	encrypt passwords = yes
- 	domain logons = yes
- 
- 	security = user </pre></div><DIV CLASS="sect3">
---- samba-2.2.2.cvs20020120.orig/swat/README
-+++ samba-2.2.2.cvs20020120/swat/README
-@@ -1,3 +1,11 @@
-+[Debian-specific Note: you can safely skip the installation notes in
-+this document. swat was configured for you when the package was
-+installed. For security reasons, swat is not enabled. To enable it, you
-+need to edit /etc/inetd.conf, uncomment the swat entry, and reload
-+inetd. Please note that the file locations given in this file are not
-+correct for the Debian version of swat. The correct file locations are
-+given in swat's man page.]
-+
- This is a brief description of how to install and use the Samba Web
- Administration Tool on your machine.
- 
 --- samba_3_0/docs/manpages/swat.8.orig	2003-06-06 16:16:24.000000000 -0400
 +++ samba_3_0/docs/manpages/swat.8	2003-06-06 16:25:13.000000000 -0400
 @@ -89,6 +89,13 @@