Updating the Debian packaging stuff in packaging/Debian/. This hadn't

been updated since the 3.0.0 release so it was broken for 3.0.1 and
later. It's nice that now the Makefile supports a $DESTDIR for "make
install" :-)
(This used to be commit 40c6bf1498785850789fca3d28ea4e7ceaa296ce)

17 files changed, 419 insertions, 233 deletions

diff --git a/packaging/Debian/README b/packaging/Debian/README
index 95c75d5fc51..8efe8164c8d 100644
--- a/packaging/Debian/README
+++ b/packaging/Debian/README
@@ -4,11 +4,11 @@ Building Samba Packages for Debian GNU/Linux
 Building Debian packages is not as hard as some people might think.
 The following instructions will allow you to build your own Samba
 Debian packages. These instructions and the files in packaging/Debian/
-are current as of Samba 3.0.0, and allow you to build Debian packages
-for Debian unstable (so you need some development packages available
-only in Debian unstable.) If you are using something newer than 3.0.0
-you might want to try to follow the instructions to see if patches
-apply cleanly. If some patches don't apply cleanly please e-mail
+should be current as of Samba 3.0.2, and allow you to build Debian
+packages for Debian unstable (so you need some development packages
+available only in Debian unstable.) If you are using something newer
+than 3.0.2 you might want to try to follow the instructions to see if
+patches apply cleanly. If some patches don't apply cleanly please e-mail
 samba@packages.debian.org since we might have fixed patches that we have
 not yet integrated into upstream Samba.
 
@@ -33,7 +33,7 @@ to the normal Debian development packages -- dpkg-dev, libc6-dev,
 devscripts, etc.):
 
   autoconf
-  debhelper
+  debhelper (>= 4.1.13)
   libpam0g-dev
   libreadline4-dev
   libcupsys2-dev
@@ -54,20 +54,19 @@ devscripts, etc.):
     build the samba packages on Debian is to look for the Build-Depends:
     field in the file debian/control.
 
-1) cd samba[-<version>]. For example, "cd samba-3.0.0rc2".
-2) cp -a packaging/Debian/debian/ debian
+1) cd samba[-<version>]. For example, "cd samba-3.0.2".
+2) cp -a packaging/Debian/debian/ .
   It's important that you copy instead of symlink because the build
   tools in Potato have a problem that prevents the build to work with
-  a symlink.
+  a symlink. If you are running a recent Debian distribution you don't
+  have to copy the directory and you can use a symlink instead:
+  "ln -s packaging/Debian/debian/ ."
 3) dch -i (this is completely optional - only do it if you understand
    Debian version numbers! Don't complain later if you can't upgrade
    to official versions of the Samba packages for Debian.)
   - Edit the changelog and make sure the version is right. For example,
-    for Samba 3.0.0beta3, the version number should something like
-  3.0.0beta3-0.1.
-4) Run 'debian/rules binary'.
-  - It is better that you prefix the above command with 'fakeroot'.
-    If you have problems you might try building as root.
+    for Samba 3.0.2, the version number should something like 3.0.2-0.1.
+4) Run 'fakeroot debian/rules binary'.
 5) That's it. Your new packages should be in ../. Install with dpkg.
 
 Please e-mail samba@packages.debian.org with comments, questions or
diff --git a/packaging/Debian/debian/README.build-upstream b/packaging/Debian/debian/README.build-upstream
index 95c75d5fc51..8efe8164c8d 100644
--- a/packaging/Debian/debian/README.build-upstream
+++ b/packaging/Debian/debian/README.build-upstream
@@ -4,11 +4,11 @@ Building Samba Packages for Debian GNU/Linux
 Building Debian packages is not as hard as some people might think.
 The following instructions will allow you to build your own Samba
 Debian packages. These instructions and the files in packaging/Debian/
-are current as of Samba 3.0.0, and allow you to build Debian packages
-for Debian unstable (so you need some development packages available
-only in Debian unstable.) If you are using something newer than 3.0.0
-you might want to try to follow the instructions to see if patches
-apply cleanly. If some patches don't apply cleanly please e-mail
+should be current as of Samba 3.0.2, and allow you to build Debian
+packages for Debian unstable (so you need some development packages
+available only in Debian unstable.) If you are using something newer
+than 3.0.2 you might want to try to follow the instructions to see if
+patches apply cleanly. If some patches don't apply cleanly please e-mail
 samba@packages.debian.org since we might have fixed patches that we have
 not yet integrated into upstream Samba.
 
@@ -33,7 +33,7 @@ to the normal Debian development packages -- dpkg-dev, libc6-dev,
 devscripts, etc.):
 
   autoconf
-  debhelper
+  debhelper (>= 4.1.13)
   libpam0g-dev
   libreadline4-dev
   libcupsys2-dev
@@ -54,20 +54,19 @@ devscripts, etc.):
     build the samba packages on Debian is to look for the Build-Depends:
     field in the file debian/control.
 
-1) cd samba[-<version>]. For example, "cd samba-3.0.0rc2".
-2) cp -a packaging/Debian/debian/ debian
+1) cd samba[-<version>]. For example, "cd samba-3.0.2".
+2) cp -a packaging/Debian/debian/ .
   It's important that you copy instead of symlink because the build
   tools in Potato have a problem that prevents the build to work with
-  a symlink.
+  a symlink. If you are running a recent Debian distribution you don't
+  have to copy the directory and you can use a symlink instead:
+  "ln -s packaging/Debian/debian/ ."
 3) dch -i (this is completely optional - only do it if you understand
    Debian version numbers! Don't complain later if you can't upgrade
    to official versions of the Samba packages for Debian.)
   - Edit the changelog and make sure the version is right. For example,
-    for Samba 3.0.0beta3, the version number should something like
-  3.0.0beta3-0.1.
-4) Run 'debian/rules binary'.
-  - It is better that you prefix the above command with 'fakeroot'.
-    If you have problems you might try building as root.
+    for Samba 3.0.2, the version number should something like 3.0.2-0.1.
+4) Run 'fakeroot debian/rules binary'.
 5) That's it. Your new packages should be in ../. Install with dpkg.
 
 Please e-mail samba@packages.debian.org with comments, questions or
diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog
index 0561f063fa6..382ee43eced 100644
--- a/packaging/Debian/debian/changelog
+++ b/packaging/Debian/debian/changelog
@@ -1,8 +1,39 @@
-samba (3.0.0-1) unstable; urgency=low
+samba (3.0.2-0.1) unstable; urgency=low
 
-  * Local build.
+  * New upstream release.
+
+ -- Debian User <debian-user@somewhere.net>  Wed,  4 Feb 2004 23:15:46 -0500
+
+samba (3.0.1-2) unstable; urgency=low
+
+  * Include ntlm_auth's man page.
+  * Don't create directories outside of the source directory during
+    package build time. (closes: #227221, #227238, #225862)
+  * Don't include the "Using Samba" book in the swat package, just a
+    symlink that points to the book included in the samba-doc package.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 13 Jan 2004 13:48:13 -0500
+
+samba (3.0.1-1) unstable; urgency=low
+
+  * New upstream version (closes: #225565)
+  * Add support in the dhcp hook for netbios scope, and handle better
+    the case of multiple DHCP-using interfaces (closes: #224109).
+  * Use "tail -n 1 ..." instead of "tail -1 ..." so POSIX-compliant
+    tail works. Thanks to Paul Eggert <eggert@twinsun.com>.
+  * Include /usr/bin/ntlm_auth in the winbind package.
+  * Run configure with "--with-piddir=/var/run/samba" since the
+    default got changed to /var/run in this new upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 30 Dec 2003 16:21:31 -0500
+
+samba (3.0.0final-1) unstable; urgency=low
+
+  * It's here, it's here, it's here, Samba 3.0.0 is here!
+  * Incorporate Japanese debconf translations; thanks to Kenshi Muto
+    <kmuto@debian.org>. (closes: #209291)
 
- -- Debian User <somebody@somewhere.com>  Tue, 23 Sep 2003 21:50:26 -0400
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 25 Sep 2003 13:39:28 -0400
 
 samba (3.0.0beta2+3.0.0rc4-1) unstable; urgency=low
 
@@ -24,8 +55,6 @@ samba (3.0.0beta2+3.0.0rc3-1) unstable; urgency=low
 samba (3.0.0beta2+3.0.0rc2-1) unstable; urgency=low
 
   * New upstream release.
-  * Incorporate Dutch debconf translations; thanks to Bart Cornelis
-    <cobaco@linux.be>. (closes: #207824)
   * Link against libgnutls7 instead of libgnutls5. (closes: #208151)
 
  -- Eloy A. Paris <peloy@debian.org>  Tue,  2 Sep 2003 21:37:13 -0400
diff --git a/packaging/Debian/debian/patches/documentation.patch b/packaging/Debian/debian/patches/documentation.patch
index c5e66232f9c..922b93f9900 100644
--- a/packaging/Debian/debian/patches/documentation.patch
+++ b/packaging/Debian/debian/patches/documentation.patch
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -91,6 +91,13 @@
  .SH "INSTALLATION"
  
  .PP
@@ -14,7 +14,7 @@
  Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&.
  
  .PP
-@@ -96,15 +103,15 @@
+@@ -98,15 +105,15 @@
  
  .TP 3
  \(bu
@@ -33,7 +33,7 @@
  
  .LP
  
-@@ -114,7 +121,7 @@
+@@ -116,7 +123,7 @@
  You need to edit your \fI/etc/inetd\&.conf \fR and \fI/etc/services\fR to enable SWAT to be launched via \fBinetd\fR\&.
  
  .PP
@@ -42,7 +42,7 @@
  
  .PP
  \fBswat 901/tcp\fR
-@@ -126,10 +133,10 @@
+@@ -128,10 +135,10 @@
  the choice of port number isn't really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your\fBinetd\fR daemon)\&.
  
  .PP
@@ -50,17 +50,17 @@
 +In \fI/etc/inetd\&.conf\fR you should add a line like this (not needed for Debian since the maintainer scripts do it. You need to uncomment the line, though, because it is added commented out for security reasons):
  
  .PP
--\fBswat stream tcp nowait.400 root /usr/local/samba/bin/swat swat\fR
+-\fBswat stream tcp nowait\&.400 root /usr/local/samba/bin/swat swat\fR
 +\fBswat stream tcp nowait.400 root /usr/sbin/swat swat\fR
  
  .PP
- One you have edited \fI/etc/services\fR and \fI/etc/inetd\&.conf\fR you need to send a HUP signal to inetd\&. To do this use \fBkill -1 PID \fR where PID is the process ID of the inetd daemon\&.
-@@ -155,8 +162,8 @@
+ One you have edited \fI/etc/services\fR and \fI/etc/inetd\&.conf\fR you need to send a HUP signal to inetd\&. To do this use \fBkill \-1 PID \fR where PID is the process ID of the inetd daemon\&.
+@@ -157,8 +164,8 @@
  
  
  .TP
 -\fI/usr/local/samba/lib/smb\&.conf\fR
--This is the default location of the \fBsmb.conf\fR(5) server configuration file that swat edits\&. Other common places that systems install this file are \fI /usr/samba/lib/smb\&.conf\fR and \fI/etc/smb\&.conf \fR\&. This file describes all the services the server is to make available to clients\&.
+-This is the default location of the \fBsmb\&.conf\fR(5) server configuration file that swat edits\&. Other common places that systems install this file are \fI /usr/samba/lib/smb\&.conf\fR and \fI/etc/smb\&.conf \fR\&. This file describes all the services the server is to make available to clients\&.
 +\fI/etc/samba/smb\&.conf\fR
 +This is the default location of the \fBsmb.conf\fR(5) server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&.
  
diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch
index 652641216b6..2ea7d96103b 100644
--- a/packaging/Debian/debian/patches/fhs.patch
+++ b/packaging/Debian/debian/patches/fhs.patch
@@ -1,15 +1,7 @@
 diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in
 --- samba-3.0.0beta2.orig/source/Makefile.in	2003-07-02 23:26:46.000000000 -0500
 +++ samba-3.0.0beta2/source/Makefile.in	2003-07-02 23:19:46.000000000 -0500
-@@ -67,6 +67,7 @@
- CONFIGDIR = @configdir@
- VARDIR = @localstatedir@
- MANDIR = @mandir@
-+DATADIR = @datadir@
- 
- # The permissions to give the executables
- INSTALLPERMS = 0755
-@@ -90,6 +91,13 @@
+@@ -92,6 +93,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -23,7 +15,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
  # the directory where pid files go
  PIDDIR = @piddir@
  # man pages language(s)
-@@ -114,7 +122,7 @@
+@@ -116,7 +124,7 @@
  PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
  PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
  	      -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
@@ -32,7 +24,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
  PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
  
  # Note that all executable programs now provide for an optional executable suffix.
-@@ -1203,7 +1211,7 @@
+@@ -1234,7 +1242,7 @@
  	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
  
  installdat: installdirs
@@ -41,16 +33,16 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
  
  installswat: installdirs
  	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
-diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/configure.in
---- samba-3.0.0beta2.orig/source/configure.in	2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/configure.in	2003-07-02 23:19:02.000000000 -0500
-@@ -17,18 +17,25 @@
+--- samba-3.0.1/source/configure.in.orig	2003-12-17 11:05:40.000000000 -0500
++++ samba-3.0.1/source/configure.in	2003-12-17 11:05:42.000000000 -0500
+@@ -17,19 +17,26 @@
  AC_ARG_WITH(fhs, 
  [  --with-fhs              Use FHS-compliant paths (default=no)],
      configdir="${sysconfdir}/samba"
--    lockdir="\${VARDIR}/cache/samba"
+-    lockdir="\${VARDIR}/lib/samba"
 +    lockdir="\${VARDIR}/run/samba"
-     piddir="\${VARDIR}/run/samba"
+     piddir="\${VARDIR}/run"
+     mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
      privatedir="\${CONFIGDIR}/private"
      libdir="\${prefix}/lib/samba"
@@ -73,7 +65,7 @@ diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/conf
  
  #################################################
  # set private directory location
-@@ -134,6 +141,9 @@
+@@ -154,6 +161,9 @@
  AC_SUBST(swatdir)
  AC_SUBST(bindir)
  AC_SUBST(sbindir)
@@ -159,7 +151,7 @@ diff -uNr samba-3.0.0beta2.orig/source/include/dynconfig.h samba-3.0.0beta2/sour
 diff -uNr samba-3.0.0beta2.orig/source/intl/lang_tdb.c samba-3.0.0beta2/source/intl/lang_tdb.c
 --- samba-3.0.0beta2.orig/source/intl/lang_tdb.c	2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/intl/lang_tdb.c	2003-07-02 23:19:02.000000000 -0500
-@@ -123,7 +123,7 @@
+@@ -128,7 +128,7 @@
  	/* if no lang then we don't translate */
  	if (!lang) return True;
  
@@ -168,7 +160,7 @@ diff -uNr samba-3.0.0beta2.orig/source/intl/lang_tdb.c samba-3.0.0beta2/source/i
  	if (stat(msg_path, &st) != 0) {
  		/* the msg file isn't available */
  		free(msg_path);
-@@ -131,7 +131,7 @@
+@@ -136,7 +136,7 @@
  	}
  	
  
@@ -192,7 +184,7 @@ diff -uNr samba-3.0.0beta2.orig/source/lib/account_pol.c samba-3.0.0beta2/source
 diff -uNr samba-3.0.0beta2.orig/source/lib/util.c samba-3.0.0beta2/source/lib/util.c
 --- samba-3.0.0beta2.orig/source/lib/util.c	2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/lib/util.c	2003-07-02 23:19:02.000000000 -0500
-@@ -2190,6 +2190,61 @@
+@@ -2195,6 +2195,61 @@
  }
  
  /**
@@ -311,7 +303,7 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/
  	pstrcat(fname,SERVER_LIST);
 --- samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c.orig	2003-08-28 17:42:44.000000000 -0400
 +++ samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c	2003-08-31 08:09:11.000000000 -0400
-@@ -228,7 +228,7 @@
+@@ -234,7 +234,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
  
@@ -320,7 +312,7 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/
  		DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
  			WINS_LIST, strerror(errno) ));
  		return True;
-@@ -1759,7 +1759,7 @@
+@@ -1765,7 +1765,7 @@
  		}
  	}
  
@@ -332,7 +324,7 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/
 diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta2/source/nsswitch/winbindd_cache.c
 --- samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c	2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/nsswitch/winbindd_cache.c	2003-07-02 23:19:02.000000000 -0500
-@@ -56,7 +56,7 @@
+@@ -57,7 +57,7 @@
  	if (opt_nocache)
  		return;
  
@@ -344,7 +336,7 @@ diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta
 diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c samba-3.0.0beta2/source/nsswitch/winbindd_util.c
 --- samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c	2003-07-01 15:44:25.000000000 -0500
 +++ samba-3.0.0beta2/source/nsswitch/winbindd_util.c	2003-07-02 23:19:02.000000000 -0500
-@@ -813,7 +813,7 @@
+@@ -874,7 +874,7 @@
  	SMB_STRUCT_STAT stbuf;
  	TDB_CONTEXT *idmap_tdb;
  
@@ -410,7 +402,7 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/privileges.c samba-3.0.0beta2/sour
 diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/passdb/secrets.c
 --- samba-3.0.0beta2.orig/source/passdb/secrets.c	2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/passdb/secrets.c	2003-07-02 23:19:02.000000000 -0500
-@@ -37,8 +37,7 @@
+@@ -38,8 +38,7 @@
  	if (tdb)
  		return True;
  
@@ -461,7 +453,7 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/s
 diff -uNr samba-3.0.0beta2.orig/source/printing/printing.c samba-3.0.0beta2/source/printing/printing.c
 --- samba-3.0.0beta2.orig/source/printing/printing.c	2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/printing/printing.c	2003-07-02 23:19:02.000000000 -0500
-@@ -174,8 +174,8 @@
+@@ -175,8 +175,8 @@
  	if (local_pid == sys_getpid())
  		return True;
  
@@ -475,7 +467,7 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/printing.c samba-3.0.0beta2/sour
 diff -uNr samba-3.0.0beta2.orig/source/printing/printing_db.c samba-3.0.0beta2/source/printing/printing_db.c
 --- samba-3.0.0beta2.orig/source/printing/printing_db.c	2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/printing/printing_db.c	2003-07-02 23:19:02.000000000 -0500
-@@ -86,7 +86,7 @@
+@@ -87,7 +87,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
  
@@ -535,7 +527,7 @@ diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/s
 diff -uNr samba-3.0.0beta2.orig/source/smbd/lanman.c samba-3.0.0beta2/source/smbd/lanman.c
 --- samba-3.0.0beta2.orig/source/smbd/lanman.c	2003-07-02 23:26:47.000000000 -0500
 +++ samba-3.0.0beta2/source/smbd/lanman.c	2003-07-02 23:19:02.000000000 -0500
-@@ -966,9 +966,9 @@
+@@ -970,9 +970,9 @@
    BOOL local_list_only;
    int i;
  
diff --git a/packaging/Debian/debian/patches/installswat.sh.patch b/packaging/Debian/debian/patches/installswat.sh.patch
index b425e3bef76..a2b1cf8f437 100644
--- a/packaging/Debian/debian/patches/installswat.sh.patch
+++ b/packaging/Debian/debian/patches/installswat.sh.patch
@@ -1,76 +1,15 @@
---- samba_3_0/source/script/installswat.sh.orig	2003-08-28 18:03:10.000000000 -0400
-+++ samba_3_0/source/script/installswat.sh	2003-08-28 18:11:14.000000000 -0400
-@@ -9,7 +9,7 @@
- echo Installing the Samba Web Administration Tool
+--- samba-3.0.1/source/script/installswat.sh.orig	2004-01-13 13:43:42.000000000 -0500
++++ samba-3.0.1/source/script/installswat.sh	2004-01-13 12:56:49.000000000 -0500
+@@ -85,7 +85,11 @@
  
- LANGS=". `cd $SRCDIR../swat/; /bin/echo lang/??`"
--echo Installing langs are `cd $SRCDIR../swat/lang/; /bin/echo ??`
-+echo Installing the following additional langs: `cd $SRCDIR../swat/lang/; /bin/echo ??`
- 
- for ln in $LANGS; do 
-  SWATLANGDIR=$SWATDIR/$ln
-@@ -23,21 +23,17 @@
- 	fi
-     fi
-  done
--done
--
--# Install images
--for ln in $LANGS; do
- 
--for f in $SRCDIR../swat/$ln/images/*.gif; do
-+ # Install images
-+ for f in $SRCDIR../swat/$ln/images/*.gif; do
-       FNAME=$SWATDIR/$ln/images/`basename $f`
-       echo $FNAME
-       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-       chmod 0644 $FNAME
--done
--
--# Install html help
-+ done
- 
--for f in $SRCDIR../swat/$ln/help/*.html; do
-+ # Install html help
-+ for f in $SRCDIR../swat/$ln/help/*.html; do
-       FNAME=$SWATDIR/$ln/help/`basename $f`
-       echo $FNAME
-       if [ "x$BOOKDIR" = "x" ]; then
-@@ -49,26 +45,24 @@
-       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-       rm -f $f
-       chmod 0644 $FNAME
--done
--
--# Install html documentation
--
--for f in $SRCDIR../docs/htmldocs/*.html; do
--      FNAME=$SWATDIR/help/`basename $f`
--      echo $FNAME
--      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
--      chmod 0644 $FNAME
--done
--
--# Install "server-side" includes
-+ done
+ # Install Using Samba book (but only if it is there)
  
--for f in $SRCDIR../swat/$ln/include/*.html; do
-+ # Install "server-side" includes
-+ for f in $SRCDIR../swat/$ln/include/*.html; do
-       FNAME=$SWATDIR/$ln/include/`basename $f`
-       echo $FNAME
-       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-       chmod 0644 $FNAME
-+ done
-+
- done
+-if [ "x$BOOKDIR" != "x" -a -f $SRCDIR../docs/htmldocs/using_samba/toc.html ]; then
++# Under Debian we don't actually install the book. The book is part of
++# the samba-doc package, so we just provide a symlink that points to
++# where the book is actually installed. The symlink is created in
++# debian/rules.
++if /bin/false; then
  
-+# Install html documentation
-+for f in $SRCDIR../docs/htmldocs/*.html; do
-+	FNAME=$SWATDIR/help/`basename $f`
-+	echo $FNAME
-+	ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
-+	chmod 0644 $FNAME
- done
+     # Create directories
  
- # Install Using Samba book (but only if it is there)
diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch
index 8707ec517ba..06d436408f5 100644
--- a/packaging/Debian/debian/patches/samba.patch
+++ b/packaging/Debian/debian/patches/samba.patch
@@ -28,66 +28,37 @@ diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source
  		}
  		strupper_m(username);
  	}
-diff -uNr samba-3.0.0beta1.orig/source/script/installbin.sh samba-3.0.0beta1/source/script/installbin.sh
---- samba-3.0.0beta1.orig/source/script/installbin.sh	2002-04-22 13:16:20.000000000 -0500
-+++ samba-3.0.0beta1/source/script/installbin.sh	2003-06-30 20:12:22.000000000 -0500
-@@ -22,9 +22,11 @@
+diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c
+--- samba-3.0.0beta1.orig/source/web/diagnose.c	2003-06-07 12:57:41.000000000 -0500
++++ samba-3.0.0beta1/source/web/diagnose.c	2003-06-30 20:12:22.000000000 -0500
+@@ -66,6 +66,7 @@
+ 	static struct cli_state cli;
+ 	extern struct in_addr loopback_ip;
+ 
++	loopback_ip.s_addr = htonl((127 << 24) + 1);
+ 	if (!cli_initialise(&cli))
+ 		return False;
+ 
+--- samba-3.0.1/source/script/installbin.sh.orig	2003-10-10 14:08:36.000000000 -0400
++++ samba-3.0.1/source/script/installbin.sh	2003-12-17 10:51:45.000000000 -0500
+@@ -24,12 +24,14 @@
   chmod $INSTALLPERMS $BINDIR/$p2
  
   # this is a special case, mount needs this in a specific location
 - if [ $p2 = smbmount ]; then
--   ln -sf $BINDIR/$p2 /sbin/mount.smbfs
+-   if [ ! -d $DESTDIR/sbin ]; then
+-      mkdir $DESTDIR/sbin
+-   fi 
+-   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
 - fi
 +# Commented out for the Debian Samba package. We take care of this
-+#	important symlink in debian/rules. (peloy@debian.org)
++# important symlink in debian/rules. (peloy@debian.org)
 +# if [ $p2 = smbmount ]; then
-+#   ln -sf $BINDIR/$p2 /sbin/mount.smbfs
++#   if [ ! -d $DESTDIR/sbin ]; then
++#      mkdir $DESTDIR/sbin
++#   fi 
++#   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
 +# fi
  done
  
  
-diff -uNr samba-3.0.0beta1.orig/source/smbd/service.c samba-3.0.0beta1/source/smbd/service.c
---- samba-3.0.0beta1.orig/source/smbd/service.c	2003-06-07 12:57:39.000000000 -0500
-+++ samba-3.0.0beta1/source/smbd/service.c	2003-06-30 20:12:57.000000000 -0500
-@@ -887,6 +887,9 @@
- 	file_close_conn(conn);
- 	dptr_closecnum(conn);
- 
-+	/* make sure we leave the directory available for unmount */
-+	vfs_ChDir(conn, "/");
-+
- 	/* execute any "postexec = " line */
- 	if (*lp_postexec(SNUM(conn)) && 
- 	    change_to_user(conn, vuid))  {
-@@ -906,8 +909,5 @@
- 		smbrun(cmd,NULL);
- 	}
- 
--	/* make sure we leave the directory available for unmount */
--	vfs_ChDir(conn, "/");
--
- 	conn_free(conn);
- }
-diff -uNr samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c samba-3.0.0beta1/source/smbwrapper/smbsh.c
---- samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c	2003-06-07 12:57:40.000000000 -0500
-+++ samba-3.0.0beta1/source/smbwrapper/smbsh.c	2003-06-30 20:12:22.000000000 -0500
-@@ -36,7 +36,7 @@
- int main(int argc, char *argv[])
- {
- 	char *p, *u;
--	const char *libd = dyn_BINDIR;
-+	const char *libd = dyn_LIBDIR;
- 	pstring line, wd;
- 	int opt;
- 	extern char *optarg;
-diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c
---- samba-3.0.0beta1.orig/source/web/diagnose.c	2003-06-07 12:57:41.000000000 -0500
-+++ samba-3.0.0beta1/source/web/diagnose.c	2003-06-30 20:12:22.000000000 -0500
-@@ -70,6 +70,7 @@
- 	static struct cli_state cli;
- 	extern struct in_addr loopback_ip;
- 
-+	loopback_ip.s_addr = htonl((127 << 24) + 1);
- 	if (!cli_initialise(&cli))
- 		return False;
- 
diff --git a/packaging/Debian/debian/patches/smbstatus-locking.patch b/packaging/Debian/debian/patches/smbstatus-locking.patch
index d37896a3699..50072c5c269 100644
--- a/packaging/Debian/debian/patches/smbstatus-locking.patch
+++ b/packaging/Debian/debian/patches/smbstatus-locking.patch
@@ -1,7 +1,7 @@
 diff -uNr samba-2.999+3.0.alpha21.orig/source/utils/status.c samba-2.999+3.0.alpha21/source/utils/status.c
 --- samba-2.999+3.0.alpha21.orig/source/utils/status.c	2002-11-26 20:54:22.000000000 -0600
 +++ samba-2.999+3.0.alpha21/source/utils/status.c	2002-12-16 23:37:14.000000000 -0600
-@@ -630,6 +630,16 @@
+@@ -667,6 +667,16 @@
  	if (!shares_only) {
  		int ret;
  
diff --git a/packaging/Debian/debian/po/ja.po b/packaging/Debian/debian/po/ja.po
new file mode 100644
index 00000000000..610b80f0d82
--- /dev/null
+++ b/packaging/Debian/debian/po/ja.po
@@ -0,0 +1,233 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2003-09-09 09:26+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Unix ファイルシステム向けの文字セット"
+
+#. Description
+#: ../samba-common.templates:3
+msgid ""
+"You currently have a \"character set\" configured in your smb.conf.  In "
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
+msgstr "現在、smb.conf に設定済みの \"character set\" があります。Samba 3.0 では、このオプションは新しいオプション \"unix charset\" に置き換えられています。Samba がファイルシステムのファイル名をどのように解釈するかを制御するこの新しいオプションのために、希望する文字セットを指定してください。"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "このオプションを空のままにすると、smb.conf は変更されません。"
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "DOS クライアント向けの文字セット"
+
+#. Description
+#: ../samba-common.templates:13
+msgid ""
+"You currently have a \"client code page\" set in your smb.conf.  In Samba "
+"3.0, this option is replaced by the option \"dos charset\".  Please specify "
+"the character set you wish to use for this new option.  In most cases, the "
+"default chosen for you will be sufficient.  Note that this option is not "
+"needed to support Windows clients, it is only for DOS clients.  If you leave "
+"this option blank, your smb.conf will not be changed."
+msgstr "現在、smb.conf に設定済みの \"client code page\" があります。Samba 3.0 では、このオプションは新しいオプション \"dos charset\" に置き換えられています。この新しいオプションのために、希望する文字セットを指定してください。ほとんどの場合、デフォルトの選択のままで十分でしょう。このオプションは Windows クライアントサポートには必要なく、DOS クライアントのみのためであることを注意しておきます。このオプションを空のままにすると、smb.conf は変更されません。"
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "DHCP から WINS 設定を使うよう smb.conf を変更しますか?"
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr "あなたのコンピュータがネットワーク上の DHCP サーバから IP アドレス情報を取得しているのであれば、DHCP サーバはネットワーク上にある WINS サーバ (NetBIOS ネームサーバ) についての情報を提供することもできます。DHCP で提供される WINS 設定は /etc/samba/dhcp.conf から自動的に読み込まれるため、smb.conf ファイルを変更する必要があります。"
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr "この機能を使うためには、dhcp3-client パッケージがインストールされている必要があります。"
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "debconf を通して smb.conf を設定しますか?"
+
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
+"line or an option that spans multiple lines, which could confuse debconf and "
+"require you to edit your smb.conf by hand to get it working again."
+msgstr "Samba の設定の残りの部分は、Samba プログラム (nmbd および smbd) を設定するのに使うファイル /etc/samba/smb.conf にあるパラメータに影響する質問です。現在の smb.conf は、'include' 行または複数行にまたがるオプションを含んでいます。これは debconf を混乱させる可能性があり、再び debconf が作動するようにすべく smb.conf の手動での修正を必要とします。"
+
+#. Description
+#: ../samba-common.templates:37
+msgid ""
+"If you don't use debconf to configure smb.conf, you will have to handle any "
+"configuration changes yourself, and will not be able to take advantage of "
+"periodic configuration enhancements.  Therefore, use of debconf is "
+"recommended if possible."
+msgstr "smb.conf の設定に debconf を使わない場合、すべての設定の変更をあなた自身が面倒を見る必要があります。これは定期的な設定改善には向いていません。そのため、可能なら debconf を使うのがお勧めです。"
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "ワークグループ/ドメイン名は何ですか?"
+
+#. Description
+#: ../samba-common.templates:52
+msgid ""
+"This controls what workgroup your server will appear to be in when queried "
+"by clients. Note that this parameter also controls the Domain name used with "
+"the security=domain setting."
+msgstr "これはクライアントから照会された際にあなたのサーバが現れるワークグループを制御します。このパラメータは security=domain 設定が使われたときのドメイン名も制御します。"
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "パスワードの暗号化を使いますか?"
+
+#. Description
+#: ../samba-common.templates:60
+msgid ""
+"Recent Windows clients communicate with SMB servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry. It is recommended that you use encrypted "
+"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
+"and that you set passwords in there for each user using the smbpasswd "
+"command."
+msgstr "最近の Windows クライアントは暗号化されたパスワードを使って SMB サーバとやり取りします。クリアテキストパスワードを使いたい場合は、あなたの Windows のレジストリのパラメータを変更する必要があります。暗号化されたパスワードを使うことを推奨します。こうする場合、有効な /etc/samba/smbpasswd ファイルがあることを確認し、各ユーザのパスワードは smbpasswd コマンドを使って設定します。"
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Samba パスワードデータベース /var/lib/samba/passdb.tdb を作成しますか?"
+
+#. Description
+#: ../samba.templates:4
+msgid ""
+"To be compatible with the defaults in most versions of Windows, Samba must "
+"be configured to use encrypted passwords.  This requires user passwords to "
+"be stored in a file separate from /etc/passwd. This file can be created "
+"automatically, but the passwords must be added manually (by you or the user) "
+"by running smbpasswd, and you must arrange to keep it up-to-date in the "
+"future.  If you do not create it, you will have to reconfigure samba (and "
+"probably your client machines) to use plaintext passwords. See /usr/share/"
+"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
+"details."
+msgstr "Windows のほとんどのバージョンのデフォルトと互換性を保つため、Samba は暗号化されたパスワードを使って設定されます。これはユーザのパスワードを /etc/passwd とは別のファイルに格納することを必要とします。このファイルは自動的に作成することができますが、パスワードは smbpasswd を実行して手動で (あなたあるいはユーザが) 追加しなければならず、将来に渡って最新状態を保ち続けるよう整えておく必要があります。このファイルを作成しない場合、プレインテキストパスワードを使うよう Samba (およびおそらくあなたのクライアントマシン) の再設定が必要です。詳細については、samba-doc パッケージにある /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html を参照してください。"
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Samba のログファイルは移動されました。"
+
+#. Description
+#: ../samba.templates:17
+msgid ""
+"Starting with the first packages of Samba 2.2 for Debian the log files for "
+"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
+"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
+msgstr "Debian 向けの Samba 2.2 の初期パッケージから、両 Samba デーモン (nmbd および smbd) のログファイルは /var/log/samba に格納されるようになっています。ファイル名は nmbd と smbd で別個になるよう、log.nmbd および log.smbd となります。"
+
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr "/var/log/ にあった古いログファイルは新しい場所に移動されます。"
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "inetd からの nmbd の実行はもうサポートされません"
+
+#. Description
+#: ../samba.templates:28
+msgid ""
+"Your system was previously configured to start nmbd and smbd from inetd.  As "
+"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
+"If you have modified your /etc/init.d/samba startup script, you may need to "
+"adjust it by hand now so that nmbd will start."
+msgstr "あなたのシステムには inetd から nmbd および smbd を起動する以前の設定があります。バージョン 2.999+3.0.alpha20-4 以降では、nmbd は inetd からはもう起動しません。/etc/init.d/samba スタートアップスクリプトを変更しているのであれば、nmbd が起動するよう手動で調整する必要があるでしょう。"
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "デーモン, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "どのように Samba を実行したいですか?"
+
+#. Description
+#: ../samba.templates:38
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr "Samba デーモン smbd は通常のデーモンとしての実行または inetd からの実行ができます。デーモンとして実行するのがお勧めの手段です。"
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "/etc/samba/smbpasswd を /var/lib/samba/passdb.tdb に移動しますか?"
+
+#. Description
+#: ../samba.templates:45
+msgid ""
+"Samba 3.0 introduces a newer, more complete SAM database interface which "
+"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
+"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
+"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
+"here."
+msgstr "Samba 3.0 では、/etc/samba/smbpasswd ファイルに代わる、より新しい、より完全な SAM データベースインターフェイスが導入されています。既存の smbpasswd ファイルを /var/lib/samba/passdb.tdb に移行しますか? 別の pdb バックエンド (LDAP など) を代わりに計画しているのであれば、ここでは 'いいえ' と答えるべきです。"
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "あなたの smb.conf は書き直されます!"
+
+#. Description
+#: ../swat.templates:3
+msgid ""
+"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
+"delete all comments, include= and copy= options. If you have a carefully "
+"crafted smb.conf then back it up or don't use SWAT!"
+msgstr "SWAT はあなたの smb.conf ファイルを書き直します。SWAT はエントリを再編成し、すべてのコメントおよび include= と copy= オプションを削除します。慎重に作成された smb.conf を持っているのであれば、バックアップしておくか、SWAT を使わないでください!"
diff --git a/packaging/Debian/debian/rules b/packaging/Debian/debian/rules
index 73e5d16bc19..e00693a814c 100755
--- a/packaging/Debian/debian/rules
+++ b/packaging/Debian/debian/rules
@@ -40,20 +40,6 @@ endif
 
 
 DESTDIR=`pwd`/debian/tmp
-SWATDIR=`pwd`/debian/swat
-
-IVARS = BASEDIR=$(DESTDIR)/usr \
-		prefix=$(DESTDIR)/usr \
-		BINDIR=$(DESTDIR)/usr/bin \
-		SBINDIR=$(DESTDIR)/usr/sbin \
-		MANDIR=$(DESTDIR)/usr/share/man \
-		LIBDIR=$(DESTDIR)/usr/lib/samba \
-		VARDIR=$(DESTDIR)/var \
-		INCLUDEDIR=$(DESTDIR)/usr/include \
-		SWATDIR=$(SWATDIR)/usr/share/samba/swat \
-		CODEPAGEDIR=$(DESTDIR)/usr/share/samba/ \
-		PRIVATEDIR=$(DESTDIR)/etc/samba \
-		CONFIGDIR=$(DESTDIR)/etc/samba
 
 patch: patch-stamp
 patch-stamp:
@@ -85,6 +71,7 @@ configure-stamp:
 		--sysconfdir=/etc \
 		--libdir=/etc/samba \
 		--with-privatedir=/etc/samba \
+		--with-piddir=/var/run/samba \
 		--localstatedir=/var \
 		--with-netatalk \
 		--with-smbmount \
@@ -143,11 +130,11 @@ install: build
 	         $(DESTDIR)/usr/lib/python2.3/site-packages
 
 	# Add here commands to install the package into debian/tmp.
-	$(MAKE) -C source install $(IVARS)
+	$(MAKE) -C source install DESTDIR=$(DESTDIR)
 
 	# libsmbclient files are not installed by the standard
 	#	'make install' - do it manually.
-	$(MAKE) -C source installclientlib $(IVARS)
+	$(MAKE) -C source installclientlib DESTDIR=$(DESTDIR)
 	mv $(DESTDIR)/usr/lib/libsmbclient.so $(DESTDIR)/usr/lib/libsmbclient.so.0.1
 	ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/libsmbclient.so.0
 	ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/libsmbclient.so
@@ -171,10 +158,11 @@ install: build
 	#	right location in the libpam-smbpass package.
 	install -m 0644 source/bin/pam_smbpass.so $(DESTDIR)/lib/security/
 
-	# Create the symlink that will allow us to do "mount -t smbfs ...".
-	#	Create also a symlink that will allow "mount -t smb ..." to
-	#	work too. The symlink is created in $(DESTDIR)/sbin/ but 
-	#	will be moved by dh_movefiles to the smbfs package later on.
+	# Create the symlinks that will allow us to do "mount -t smbfs ..."
+	# and "mount -t smb ...". Note that the source/script/installbin.sh
+	# tries to create the first symlink, but we have commented
+	# that code out and do everything here. We also create
+	# symlinks for the man pages.
 	ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smbfs
 	ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smb
 	ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smb.8
@@ -188,6 +176,12 @@ install: build
 	# Install man pages for files without man pages in the upstream sources
 	install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
 
+	# We don't provide the "Using Samba" book in the swat package.
+	# It's provided in the samba-doc package so in the swat package
+	# we just provide a symlink to the real book.
+	ln -s ../../doc/samba-doc/htmldocs/using_samba \
+	      $(DESTDIR)/usr/share/samba/swat/using_samba
+
 	# Delete unwanted stuff leftover from "make install"
 
 	# The smbwrapper package is not being generated anymore, so we must
diff --git a/packaging/Debian/debian/samba-common.config b/packaging/Debian/debian/samba-common.config
index ed76b95cb84..766f0ddb7ef 100644
--- a/packaging/Debian/debian/samba-common.config
+++ b/packaging/Debian/debian/samba-common.config
@@ -22,7 +22,7 @@ smbconf_retr() {
 		/^\[global\]/,/^[[:space:]]*\[/ {
 			s/^[[:space:]]*$1[[:space:]]*=[[:space:]]*//pi
 		}" $FILE \
-	| tail -1
+	| tail -n 1
 }
 
 FILE=/etc/samba/smb.conf
diff --git a/packaging/Debian/debian/samba-common.dhcp b/packaging/Debian/debian/samba-common.dhcp
index 3b2fa4ba191..3b5a05ff573 100644
--- a/packaging/Debian/debian/samba-common.dhcp
+++ b/packaging/Debian/debian/samba-common.dhcp
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+SAMBA_DHCP_CONF=/etc/samba/dhcp.conf
+
 netbios_setup() {
 	# No need to continue if we're called with an unsupported option
 
@@ -10,24 +12,45 @@ netbios_setup() {
 		return
 	fi
 
+	# Nor should we continue if no settings have changed
+	if [ "$new_netbios_name_servers" = "$old_netbios_name_servers" ] \
+	   && [ "$new_netbios_scope" = "$old_netbios_scope" ]
+	then
+		return
+	fi
+
+	# reparse our own file
+	local other_servers=`sed -n -e"s/[[:space:]]$interface:[^[:space:]]*//g; \
+		s/^[[:space:]]*wins server[[:space:]]*=[[:space:]]*//pi" \
+		$SAMBA_DHCP_CONF`
+
 	umask 022
 
-	if [ -z "$new_netbios_name_servers" ] || [ "$reason" = FAIL ] \
-	   || [ "$reason" = EXPIRE ]
+	local serverlist="$other_servers"
+	for server in $new_netbios_name_servers
+	do
+		serverlist="$serverlist $interface:$server"
+	done
+
+	echo -n > $SAMBA_DHCP_CONF
+
+	# If we're updating on failure/expire, AND there are no WINS
+	# servers for other interfaces, leave the file empty.
+	if [ -z "$other_servers" ]
+	then
+		if [ "$reason" = FAIL ] || [ "$reason" = EXPIRE ]
+		then
+			return
+		fi
+	fi
+
+	if [ -n "$serverlist" ]
 	then
-		# FIXME: add sed magic to only remove wins servers
-		# associated with this interface
-		echo -n > /etc/samba/dhcp.conf
-	elif [ "$new_netbios_name_servers" != "$old_netbios_name_servers" ]
+		echo "   wins server =$serverlist" >> $SAMBA_DHCP_CONF
+	fi
+	if [ -n "$new_netbios_scope" ]
 	then
-		local serverlist=""
-		for server in $new_netbios_name_servers
-		do
-			serverlist="$serverlist $interface:$server"
-		done
-		# FIXME: add sed magic to only update wins servers
-		# associated with this interface
-		echo "   wins server =$serverlist" > /etc/samba/dhcp.conf
+		echo "   netbios scope = $new_netbios_scope" >> $SAMBA_DHCP_CONF
 	fi
 }
 
diff --git a/packaging/Debian/debian/samba-common.files b/packaging/Debian/debian/samba-common.files
index 9fb3a3a1623..f5779fa8270 100644
--- a/packaging/Debian/debian/samba-common.files
+++ b/packaging/Debian/debian/samba-common.files
@@ -12,4 +12,8 @@ usr/share/man/man5/smb.conf.5
 usr/share/man/man7/samba.7
 usr/share/man/man8/net.8
 usr/share/man/man8/smbpasswd.8
-usr/share/samba/
+usr/share/samba/lowcase.dat
+usr/share/samba/panic-action
+usr/share/samba/smb.conf
+usr/share/samba/upcase.dat
+usr/share/samba/valid.dat
diff --git a/packaging/Debian/debian/samba.config b/packaging/Debian/debian/samba.config
index 89792d436e4..300b19a2e84 100644
--- a/packaging/Debian/debian/samba.config
+++ b/packaging/Debian/debian/samba.config
@@ -24,7 +24,7 @@ smbconf_retr() {
 		/^\[global\]/,/^[[:space:]]*\[/ {
 			s/^[[:space:]]*$1[[:space:]]*=[[:space:]]*//pi
 		}" $FILE \
-	| tail -1
+	| tail -n 1
 }
 
 FILE=/etc/samba/smb.conf
diff --git a/packaging/Debian/debian/samba.postinst b/packaging/Debian/debian/samba.postinst
index 1a25290ed27..7b0bdd92ad5 100644
--- a/packaging/Debian/debian/samba.postinst
+++ b/packaging/Debian/debian/samba.postinst
@@ -165,7 +165,7 @@ then
 			/^\[global\]/,/^[[:space:]]*\[/ \
 				s/^[[:space:]]*passdb backend[[:space:]]*=[[:space:]]*//pi" \
 			< /etc/samba/smb.conf \
-	 | tail -1`
+	 | tail -n 1`
 	if echo "$PASSDB" | egrep -q "(^|[[:space:]])smbpasswd"; then
 		if ! echo "$PASSDB" | egrep -q "(^|[[:space:]])tdbsam"; then
 			PASSDB=`echo $PASSDB | sed -e's/\(^\|[[:space:]]\)smbpasswd/\1tdbsam/'`
diff --git a/packaging/Debian/debian/swat.files b/packaging/Debian/debian/swat.files
index 6fed39111be..82fdf104d35 100644
--- a/packaging/Debian/debian/swat.files
+++ b/packaging/Debian/debian/swat.files
@@ -1,2 +1,3 @@
 usr/sbin/swat
+usr/share/samba/swat
 usr/share/man/man8/swat.8
diff --git a/packaging/Debian/debian/winbind.files b/packaging/Debian/debian/winbind.files
index 2834acf7caf..fbb76774d42 100644
--- a/packaging/Debian/debian/winbind.files
+++ b/packaging/Debian/debian/winbind.files
@@ -1,6 +1,8 @@
 usr/sbin/winbindd
 usr/bin/wbinfo
+usr/bin/ntlm_auth
 usr/share/man/man1/wbinfo.1
+usr/share/man/man1/ntlm_auth.1
 usr/share/man/man8/winbindd.8
 lib/security/pam_winbind.so
 lib/libnss_winbind.so.2