summaryrefslogtreecommitdiff
path: root/packaging/Debian
diff options
context:
space:
mode:
Diffstat (limited to 'packaging/Debian')
-rw-r--r--packaging/Debian/debian-sarge/README.build (renamed from packaging/Debian/debian-stable/README.build)0
-rw-r--r--packaging/Debian/debian-sarge/README.build-upstream78
-rw-r--r--packaging/Debian/debian-sarge/README.debian175
-rw-r--r--packaging/Debian/debian-sarge/TODO (renamed from packaging/Debian/debian-stable/TODO)0
-rw-r--r--packaging/Debian/debian-sarge/changelog2575
-rw-r--r--packaging/Debian/debian-sarge/config.cache (renamed from packaging/Debian/debian-stable/config.cache)0
-rw-r--r--packaging/Debian/debian-sarge/config.cache.alpha-linux (renamed from packaging/Debian/debian-stable/config.cache.alpha-linux)0
-rw-r--r--packaging/Debian/debian-sarge/config.cache.sparc-linux (renamed from packaging/Debian/debian-stable/config.cache.sparc-linux)0
-rw-r--r--packaging/Debian/debian-sarge/control201
-rw-r--r--packaging/Debian/debian-sarge/control.in201
-rw-r--r--packaging/Debian/debian-sarge/copyright30
-rw-r--r--packaging/Debian/debian-sarge/gdbcommands (renamed from packaging/Debian/debian-stable/gdbcommands)0
-rw-r--r--packaging/Debian/debian-sarge/libpam-smbpass.docs (renamed from packaging/Debian/debian-stable/libpam-smbpass.docs)0
-rw-r--r--packaging/Debian/debian-sarge/libpam-smbpass.examples (renamed from packaging/Debian/debian-stable/libpam-smbpass.examples)0
-rw-r--r--packaging/Debian/debian-sarge/libpam-smbpass.files (renamed from packaging/Debian/debian-stable/libpam-smbpass.files)0
-rw-r--r--packaging/Debian/debian-sarge/libsmbclient-dev.examples (renamed from packaging/Debian/debian-stable/libsmbclient-dev.examples)0
-rw-r--r--packaging/Debian/debian-sarge/libsmbclient-dev.files (renamed from packaging/Debian/debian-stable/libsmbclient-dev.files)0
-rw-r--r--packaging/Debian/debian-sarge/libsmbclient.files (renamed from packaging/Debian/debian-stable/libsmbclient.files)0
-rw-r--r--packaging/Debian/debian-sarge/libsmbclient.shlibs1
-rw-r--r--packaging/Debian/debian-sarge/mksmbpasswd.8 (renamed from packaging/Debian/debian-stable/mksmbpasswd.8)0
-rw-r--r--packaging/Debian/debian-sarge/mksmbpasswd.awk (renamed from packaging/Debian/debian-stable/mksmbpasswd.awk)0
-rw-r--r--packaging/Debian/debian-sarge/panic-action (renamed from packaging/Debian/debian-stable/panic-action)0
-rw-r--r--packaging/Debian/debian-sarge/patches/VERSION.patch8
-rw-r--r--packaging/Debian/debian-sarge/patches/cups.patch14
-rw-r--r--packaging/Debian/debian-sarge/patches/documentation.patch66
-rw-r--r--packaging/Debian/debian-sarge/patches/fhs.patch558
-rw-r--r--packaging/Debian/debian-sarge/patches/installswat.sh.patch15
-rw-r--r--packaging/Debian/debian-sarge/patches/make-distclean.patch27
-rw-r--r--packaging/Debian/debian-sarge/patches/nmbd-signalling.patch (renamed from packaging/Debian/debian-stable/patches/nmbd-signalling.patch)0
-rw-r--r--packaging/Debian/debian-sarge/patches/non-linux-ports.patch62
-rw-r--r--packaging/Debian/debian-sarge/patches/samba.patch64
-rw-r--r--packaging/Debian/debian-sarge/patches/smbclient-pager.patch (renamed from packaging/Debian/debian-stable/patches/smbclient-pager.patch)0
-rw-r--r--packaging/Debian/debian-sarge/patches/smbclient-tar.patch.unused (renamed from packaging/Debian/debian-stable/patches/smbclient-tar.patch.unused)0
-rw-r--r--packaging/Debian/debian-sarge/patches/smbmount-mtab-flags.patch (renamed from packaging/Debian/debian-stable/patches/smbmount-mtab-flags.patch)0
-rw-r--r--packaging/Debian/debian-sarge/patches/smbmount-nomtab.patch160
-rw-r--r--packaging/Debian/debian-sarge/patches/smbstatus-locking.patch20
-rw-r--r--packaging/Debian/debian-sarge/patches/undefined-symbols.patch22
-rw-r--r--packaging/Debian/debian-sarge/patches/version-fix-vscan.patch37
-rw-r--r--packaging/Debian/debian-sarge/po/POTFILES.in (renamed from packaging/Debian/debian-stable/po/POTFILES.in)0
-rw-r--r--packaging/Debian/debian-sarge/po/ca.po291
-rw-r--r--packaging/Debian/debian-sarge/po/cs.po289
-rw-r--r--packaging/Debian/debian-sarge/po/da.po290
-rw-r--r--packaging/Debian/debian-sarge/po/es.po (renamed from packaging/Debian/debian-stable/po/es.po)0
-rw-r--r--packaging/Debian/debian-sarge/po/fr.po (renamed from packaging/Debian/debian-stable/po/fr.po)0
-rw-r--r--packaging/Debian/debian-sarge/po/it.po287
-rw-r--r--packaging/Debian/debian-sarge/po/ja.po292
-rw-r--r--packaging/Debian/debian-sarge/po/nl.po (renamed from packaging/Debian/debian-stable/po/nl.po)0
-rw-r--r--packaging/Debian/debian-sarge/po/pt.po295
-rw-r--r--packaging/Debian/debian-sarge/po/pt_BR.po309
-rw-r--r--packaging/Debian/debian-sarge/po/ru.po223
-rw-r--r--packaging/Debian/debian-sarge/po/templates.pot (renamed from packaging/Debian/debian-stable/po/templates.pot)0
-rw-r--r--packaging/Debian/debian-sarge/po/tr.po283
-rw-r--r--packaging/Debian/debian-sarge/python2.3-samba.files1
-rwxr-xr-xpackaging/Debian/debian-sarge/rules362
-rw-r--r--packaging/Debian/debian-sarge/samba-common.config154
-rw-r--r--packaging/Debian/debian-sarge/samba-common.dhcp57
-rw-r--r--packaging/Debian/debian-sarge/samba-common.dirs (renamed from packaging/Debian/debian-stable/samba-common.dirs)0
-rw-r--r--packaging/Debian/debian-sarge/samba-common.files19
-rw-r--r--packaging/Debian/debian-sarge/samba-common.postinst (renamed from packaging/Debian/debian-stable/samba-common.postinst)0
-rw-r--r--packaging/Debian/debian-sarge/samba-common.postrm (renamed from packaging/Debian/debian-stable/samba-common.postrm)0
-rw-r--r--packaging/Debian/debian-sarge/samba-common.templates66
-rw-r--r--packaging/Debian/debian-sarge/samba-doc.docs8
-rw-r--r--packaging/Debian/debian-sarge/samba-doc.examples (renamed from packaging/Debian/debian-stable/samba-doc.examples)0
-rw-r--r--packaging/Debian/debian-sarge/samba.config92
-rw-r--r--packaging/Debian/debian-sarge/samba.cron.daily (renamed from packaging/Debian/debian-stable/samba.cron.daily)0
-rw-r--r--packaging/Debian/debian-sarge/samba.dirs7
-rw-r--r--packaging/Debian/debian-sarge/samba.docs4
-rw-r--r--packaging/Debian/debian-sarge/samba.files17
-rw-r--r--packaging/Debian/debian-sarge/samba.init (renamed from packaging/Debian/debian-stable/samba.init)0
-rw-r--r--packaging/Debian/debian-sarge/samba.logrotate21
-rw-r--r--packaging/Debian/debian-sarge/samba.pamd3
-rw-r--r--packaging/Debian/debian-sarge/samba.postinst230
-rw-r--r--packaging/Debian/debian-sarge/samba.postrm (renamed from packaging/Debian/debian-stable/samba.postrm)0
-rw-r--r--packaging/Debian/debian-sarge/samba.prerm (renamed from packaging/Debian/debian-stable/samba.prerm)0
-rw-r--r--packaging/Debian/debian-sarge/samba.templates50
-rw-r--r--[-rwxr-xr-x]packaging/Debian/debian-sarge/scripts/patch-source (renamed from packaging/Debian/debian-stable/scripts/patch-source)0
-rw-r--r--packaging/Debian/debian-sarge/scripts/unpatch-source20
-rw-r--r--packaging/Debian/debian-sarge/smb.conf (renamed from packaging/Debian/debian-stable/smb.conf)0
-rw-r--r--packaging/Debian/debian-sarge/smbclient.files (renamed from packaging/Debian/debian-stable/smbclient.files)0
-rw-r--r--packaging/Debian/debian-sarge/smbfs.files12
-rw-r--r--packaging/Debian/debian-sarge/smbwrapper.dirs (renamed from packaging/Debian/debian-stable/smbwrapper.dirs)0
-rw-r--r--packaging/Debian/debian-sarge/smbwrapper.docs (renamed from packaging/Debian/debian-stable/smbwrapper.docs)0
-rw-r--r--packaging/Debian/debian-sarge/smbwrapper.files (renamed from packaging/Debian/debian-stable/smbwrapper.files)0
-rw-r--r--packaging/Debian/debian-sarge/swat.config (renamed from packaging/Debian/debian-stable/swat.config)0
-rw-r--r--packaging/Debian/debian-sarge/swat.dirs (renamed from packaging/Debian/debian-stable/swat.dirs)0
-rw-r--r--packaging/Debian/debian-sarge/swat.files (renamed from packaging/Debian/debian-stable/swat.files)0
-rw-r--r--packaging/Debian/debian-sarge/swat.postinst (renamed from packaging/Debian/debian-stable/swat.postinst)0
-rw-r--r--packaging/Debian/debian-sarge/swat.postrm (renamed from packaging/Debian/debian-stable/swat.postrm)0
-rw-r--r--packaging/Debian/debian-sarge/swat.templates6
-rw-r--r--packaging/Debian/debian-sarge/winbind.dirs (renamed from packaging/Debian/debian-stable/winbind.dirs)0
-rw-r--r--packaging/Debian/debian-sarge/winbind.files (renamed from packaging/Debian/debian-stable/winbind.files)0
-rw-r--r--packaging/Debian/debian-sarge/winbind.init (renamed from packaging/Debian/debian-stable/winbind.init)0
-rw-r--r--packaging/Debian/debian-sarge/winbind.lintian (renamed from packaging/Debian/debian-stable/winbind.lintian)0
-rw-r--r--packaging/Debian/debian-sarge/winbind.logrotate (renamed from packaging/Debian/debian-stable/winbind.logrotate)0
-rw-r--r--packaging/Debian/debian-sarge/wins2dns.awk (renamed from packaging/Debian/debian-stable/wins2dns.awk)0
-rw-r--r--packaging/Debian/debian-stable/samba-doc.docs6
-rw-r--r--packaging/Debian/debian-woody/README.build397
-rw-r--r--packaging/Debian/debian-woody/README.build-upstream (renamed from packaging/Debian/debian-stable/README.build-upstream)0
-rw-r--r--packaging/Debian/debian-woody/README.debian (renamed from packaging/Debian/debian-stable/README.debian)4
-rw-r--r--packaging/Debian/debian-woody/TODO4
-rw-r--r--packaging/Debian/debian-woody/changelog (renamed from packaging/Debian/debian-stable/changelog)12
-rw-r--r--packaging/Debian/debian-woody/config.cache221
-rw-r--r--packaging/Debian/debian-woody/config.cache.alpha-linux12
-rw-r--r--packaging/Debian/debian-woody/config.cache.sparc-linux13
-rw-r--r--packaging/Debian/debian-woody/control (renamed from packaging/Debian/debian-stable/control)0
-rw-r--r--packaging/Debian/debian-woody/copyright (renamed from packaging/Debian/debian-stable/copyright)0
-rw-r--r--packaging/Debian/debian-woody/gdbcommands2
-rw-r--r--packaging/Debian/debian-woody/libpam-smbpass.docs2
-rw-r--r--packaging/Debian/debian-woody/libpam-smbpass.examples5
-rw-r--r--packaging/Debian/debian-woody/libpam-smbpass.files1
-rw-r--r--packaging/Debian/debian-woody/libsmbclient-dev.examples1
-rw-r--r--packaging/Debian/debian-woody/libsmbclient-dev.files3
-rw-r--r--packaging/Debian/debian-woody/libsmbclient.files2
-rw-r--r--packaging/Debian/debian-woody/libsmbclient.shlibs (renamed from packaging/Debian/debian-stable/libsmbclient.shlibs)0
-rw-r--r--packaging/Debian/debian-woody/mksmbpasswd.828
-rw-r--r--packaging/Debian/debian-woody/mksmbpasswd.awk5
-rw-r--r--packaging/Debian/debian-woody/mount.cifs.files (renamed from packaging/Debian/debian-stable/mount.cifs.files)0
-rw-r--r--packaging/Debian/debian-woody/panic-action48
-rw-r--r--packaging/Debian/debian-woody/patches/documentation.patch (renamed from packaging/Debian/debian-stable/patches/documentation.patch)0
-rw-r--r--packaging/Debian/debian-woody/patches/fhs.patch (renamed from packaging/Debian/debian-stable/patches/fhs.patch)32
-rw-r--r--packaging/Debian/debian-woody/patches/installswat.sh.patch (renamed from packaging/Debian/debian-stable/patches/installswat.sh.patch)0
-rw-r--r--packaging/Debian/debian-woody/patches/nmbd-signalling.patch20
-rw-r--r--packaging/Debian/debian-woody/patches/samba.patch (renamed from packaging/Debian/debian-stable/patches/samba.patch)0
-rw-r--r--packaging/Debian/debian-woody/patches/smbclient-pager.patch12
-rw-r--r--packaging/Debian/debian-woody/patches/smbclient-tar.patch.unused43
-rw-r--r--packaging/Debian/debian-woody/patches/smbmount-mtab-flags.patch15
-rw-r--r--packaging/Debian/debian-woody/patches/smbmount-nomtab.patch (renamed from packaging/Debian/debian-stable/patches/smbmount-nomtab.patch)0
-rw-r--r--packaging/Debian/debian-woody/patches/smbstatus-locking.patch (renamed from packaging/Debian/debian-stable/patches/smbstatus-locking.patch)0
-rw-r--r--packaging/Debian/debian-woody/patches/version-fix-vscan.patch37
-rw-r--r--packaging/Debian/debian-woody/po/POTFILES.in3
-rw-r--r--packaging/Debian/debian-woody/po/es.po298
-rw-r--r--packaging/Debian/debian-woody/po/fr.po301
-rw-r--r--packaging/Debian/debian-woody/po/nl.po302
-rw-r--r--packaging/Debian/debian-woody/po/pt_BR.po (renamed from packaging/Debian/debian-stable/po/pt_BR.po)0
-rw-r--r--packaging/Debian/debian-woody/po/templates.pot233
-rw-r--r--packaging/Debian/debian-woody/python2.2-samba.files (renamed from packaging/Debian/debian-stable/python2.2-samba.files)0
-rwxr-xr-xpackaging/Debian/debian-woody/rules (renamed from packaging/Debian/debian-stable/rules)0
-rw-r--r--packaging/Debian/debian-woody/samba-common.config (renamed from packaging/Debian/debian-stable/samba-common.config)0
-rw-r--r--packaging/Debian/debian-woody/samba-common.dhcp (renamed from packaging/Debian/debian-stable/samba-common.dhcp)0
-rw-r--r--packaging/Debian/debian-woody/samba-common.dirs2
-rw-r--r--packaging/Debian/debian-woody/samba-common.files (renamed from packaging/Debian/debian-stable/samba-common.files)0
-rw-r--r--packaging/Debian/debian-woody/samba-common.postinst139
-rw-r--r--packaging/Debian/debian-woody/samba-common.postrm10
-rw-r--r--packaging/Debian/debian-woody/samba-common.templates (renamed from packaging/Debian/debian-stable/samba-common.templates)0
-rw-r--r--packaging/Debian/debian-woody/samba-doc.docs8
-rw-r--r--packaging/Debian/debian-woody/samba-doc.examples2
-rw-r--r--packaging/Debian/debian-woody/samba.config (renamed from packaging/Debian/debian-stable/samba.config)0
-rw-r--r--packaging/Debian/debian-woody/samba.cron.daily16
-rw-r--r--packaging/Debian/debian-woody/samba.dirs (renamed from packaging/Debian/debian-stable/samba.dirs)0
-rw-r--r--packaging/Debian/debian-woody/samba.docs (renamed from packaging/Debian/debian-stable/samba.docs)0
-rw-r--r--packaging/Debian/debian-woody/samba.files (renamed from packaging/Debian/debian-stable/samba.files)2
-rw-r--r--packaging/Debian/debian-woody/samba.init83
-rw-r--r--packaging/Debian/debian-woody/samba.logrotate (renamed from packaging/Debian/debian-stable/samba.logrotate)0
-rw-r--r--packaging/Debian/debian-woody/samba.pamd (renamed from packaging/Debian/debian-stable/samba.pamd)0
-rw-r--r--packaging/Debian/debian-woody/samba.postinst (renamed from packaging/Debian/debian-stable/samba.postinst)0
-rw-r--r--packaging/Debian/debian-woody/samba.postrm26
-rw-r--r--packaging/Debian/debian-woody/samba.prerm10
-rw-r--r--packaging/Debian/debian-woody/samba.templates (renamed from packaging/Debian/debian-stable/samba.templates)0
-rwxr-xr-xpackaging/Debian/debian-woody/scripts/patch-source28
-rwxr-xr-xpackaging/Debian/debian-woody/scripts/unpatch-source (renamed from packaging/Debian/debian-stable/scripts/unpatch-source)0
-rw-r--r--packaging/Debian/debian-woody/smb.conf237
-rw-r--r--packaging/Debian/debian-woody/smbclient.files15
-rw-r--r--packaging/Debian/debian-woody/smbfs.files (renamed from packaging/Debian/debian-stable/smbfs.files)0
-rw-r--r--packaging/Debian/debian-woody/smbwrapper.dirs2
-rw-r--r--packaging/Debian/debian-woody/smbwrapper.docs2
-rw-r--r--packaging/Debian/debian-woody/smbwrapper.files1
-rw-r--r--packaging/Debian/debian-woody/swat.config11
-rw-r--r--packaging/Debian/debian-woody/swat.dirs2
-rw-r--r--packaging/Debian/debian-woody/swat.files3
-rw-r--r--packaging/Debian/debian-woody/swat.postinst23
-rw-r--r--packaging/Debian/debian-woody/swat.postrm22
-rw-r--r--packaging/Debian/debian-woody/swat.templates (renamed from packaging/Debian/debian-stable/swat.templates)0
-rw-r--r--packaging/Debian/debian-woody/winbind.dirs1
-rw-r--r--packaging/Debian/debian-woody/winbind.files9
-rw-r--r--packaging/Debian/debian-woody/winbind.init48
-rw-r--r--packaging/Debian/debian-woody/winbind.lintian6
-rw-r--r--packaging/Debian/debian-woody/winbind.logrotate10
-rw-r--r--packaging/Debian/debian-woody/wins2dns.awk38
178 files changed, 10794 insertions, 26 deletions
diff --git a/packaging/Debian/debian-stable/README.build b/packaging/Debian/debian-sarge/README.build
index 0a11a1f6ea..0a11a1f6ea 100644
--- a/packaging/Debian/debian-stable/README.build
+++ b/packaging/Debian/debian-sarge/README.build
diff --git a/packaging/Debian/debian-sarge/README.build-upstream b/packaging/Debian/debian-sarge/README.build-upstream
new file mode 100644
index 0000000000..8efe8164c8
--- /dev/null
+++ b/packaging/Debian/debian-sarge/README.build-upstream
@@ -0,0 +1,78 @@
+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/
+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.
+
+We try to maintain as much compatibility with previous releases
+of Debian as possible, so it is possible that the files in
+packaging/Debian/ can also be used to build Samba Debian packages for
+other Debian releases. However, sometimes this is just not possible
+because we need to use stuff that is only available on Debian unstable.
+
+Instructions
+------------
+
+If you want to build Samba packages for Debian and you just want to use
+upstream sources, i.e. you don't want to wait for us to put official
+packages out, or you want packages for a Debian version for which we
+don't provide deb's, or you don't want to use official packages, or
+you want to add --this-cool-switch to configure, or whatever, follow
+these instructions:
+
+0) Make sure you have the following packages installed (in addition
+to the normal Debian development packages -- dpkg-dev, libc6-dev,
+devscripts, etc.):
+
+ autoconf
+ debhelper (>= 4.1.13)
+ libpam0g-dev
+ libreadline4-dev
+ libcupsys2-dev
+ libacl1-dev, libacl1 (>= 2.2.11-1)
+ libkrb5-dev
+ libldap2-dev
+ po-debconf
+ python2.3-dev
+
+ Notes regarding the packages required to build Samba Debian packages:
+
+ * The libcupsys2-dev is not available in Debian Potato (Debian 2.2).
+ That's fine; the configure script won't detect CUPS support and the
+ resulting binaries won't support CUPS.
+
+ * The list above is current as of samba-3.0.0rc2, but it can get
+ out of date. The best way to check what packages are required to
+ 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.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. 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.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
+suggestions. Please talk to us and not to the Samba Team. They have
+better things to do and know nothing about the Debian packaging system.
+
+Eloy A. Paris <peloy@debian.org>
+Steve Langasek <vorlon@debian.org>
+
diff --git a/packaging/Debian/debian-sarge/README.debian b/packaging/Debian/debian-sarge/README.debian
new file mode 100644
index 0000000000..c5324a12ff
--- /dev/null
+++ b/packaging/Debian/debian-sarge/README.debian
@@ -0,0 +1,175 @@
+0. Samba Team Notes:
+This package is targeted at the current stable release of debian distribution
+(sarge) running on a 2.6.x kernel.
+This package has been made by Simo Sorce on behalf of the Samba Team.
+Do not use Debian BTS to report bugs, it's not a debian project package.
+Thanks to Eloy Paris and Steve "Vorlon" Langasek for the work they've done
+and continue to do on debian unstable packages. That greatly helps me in
+building up debian packages for the Team.
+
+
+WARNING: This package has been built on a 2.6.x kernel !
+
+Samba for Debian
+----------------
+
+This package was built by Eloy Paris <peloy@debian.org> and Steve Langasek
+<vorlon@debian.org>, current maintainers of the Samba packages for Debian,
+based on previous work from Bruce Perens <Bruce@Pixar.com>, Andrew
+Howell <andrew@it.com.au>, Klee Dienes <klee@debian.org> and Michael
+Meskes <meskes@topsystem.de>, all previous maintainers of the packages
+samba and sambades (merged together for longer than we can remember.)
+
+Contents of this README file:
+
+1. Notes
+2. Upgrading from Samba 2.2
+3. Packages Generated from the Samba Sources
+4. Support for NT Domains
+5. Reporting bugs
+
+
+1. Notes
+--------
+
+- As of Samba 2.0.6-1, the Debian version of Samba is compiled with
+ Pluggable Authentication Modules (PAM) support. PAM support was
+ discontinued during the libc5 -> libc6 migration process and I never
+ brought it back until 2.0.6-1.
+
+- The smbfs package does not support the 2.0.x Linux kernels anymore.
+ This has been the case since the very first packages of the CVS sources
+ that eventually became Samba 2.2. To use the smbfs package you need to
+ run a 2.2.x kernel or later.
+
+- Starting with the Debian packages for Samba 2.2, the Samba log files (for
+ nmbd and smbd) have been moved to a new location: /var/log/samba/. The
+ files also have new names: log.nmbd and log.smbd. The old files
+ (/var/log/{nmb,smb} were moved to the new location.
+
+
+2. Upgrading from Samba 2.2
+---------------------------
+
+Samba 3.0 provides greatly improved support for modern Windows systems,
+including support for Unicode and LDAP. In the process, Samba 3.0
+necessarily also breaks backward compatiblity with past releases. These
+issues are documented herein; if you are aware of other problems related
+to upgrading from Samba 2.2, please let us know at
+<samba@packages.debian.org>.
+
+Samba and LDAP
+--------------
+Starting with Samba 2.999+3.0cvs20020723-1 we are building Samba with
+LDAP support. However, the LDAP schema for Samba 3.0 differs
+substantially from the schema used by many sites with Samba 2.2 (not
+enabled in the Debian packages). If upgrading from an LDAP-enabled 2.2,
+you will need to run the convertSambaAccount script found in
+/usr/share/doc/samba-doc/examples/LDAP. A copy of the schema itself can
+also be found at /usr/share/doc/samba-doc/examples/LDAP/samba.schema.
+
+Character Sets
+--------------
+Samba 3.0 introduces support for negotiating Unicode (UCS-2LE) with
+Windows clients. Owing to the close similarity between Windows and Unix
+NLS charsets, in the past, many users were able to pass filenames
+containing non-ASCII characters between clients and servers without
+configuring Samba to know what character set was in use. Now, Samba
+must be able to convert Unix filenames to Unicode before sending to the
+client, so Samba must know what character set the filenames are being
+converted from. If you will be sharing files with non-ASCII names, and
+the filenames are not encoded with UTF-8, you will need to tell Samba
+which character set to use with the 'unix charset' option.
+
+If you had previously specified 'character set' and 'client code page'
+options under 2.2, these settings should be automatically converted for
+you.
+
+
+3. Packages Generated from the Samba Sources
+--------------------------------------------
+
+Currently, the Samba sources produce the following binary packages:
+
+samba: A LanManager like file and printer server for Unix.
+samba-common: Samba common files used by both the server and the client.
+smbclient: A LanManager like simple client for Unix.
+swat: Samba Web Administration Tool
+samba-doc: Samba documentation.
+smbfs: Mount and umount commands for the smbfs (works with 2.2.x and
+ above kernels, not with 2.0.x kernels.)
+libpam-smbpass: pluggable authentication module for SMB password
+ database.
+libsmbclient: Shared library that allows applications to talk to SMB servers.
+libsmbclient-dev: libsmbclient shared libraries.
+winbind: Service to resolve user and group information from a Windows NT
+ server.
+python2.2-samba: Python bindings that allow access to various aspects of
+ Samba.
+
+Please note that the package smbwrapper (a shared library that provides
+SMB client services that existed between Samba 2.0.0-1 and Samba-2.0.5a-4
+does not exist any more. The reason is that starting with Samba 2.0.6-1, that
+code does not even compile, and the upstream author (Andrew Tridgell)
+recommended to disable the compilation of smbwrapper until some issues
+with glibc2.1 get cleared out (the problem is with glibc, not with Samba
+itself).
+
+
+4. Support for NT Domains
+-------------------------
+
+Samba 2.2 includes preliminary support for NT domains. A Samba server
+can now be part of a Windows NT domain whose Primary Domain Controller
+is a Windows NT server. This feature is supposed to be stable although I
+haven't tried it myself. Read the documentation in the samba-doc package
+for help on how to do this (hint: "security = domain" in the smb.conf
+file).
+
+Samba 2.2 has also experimental support for Primary Domain
+Controller. This means that a Samba server can act now as a PDC. There
+are no special flags needed to compile Samba with NT domain PDC
+support. Please read the NTDOM PDC FAQ at www.samba.org (Documentation
+section).
+
+Please note that NT domain PDC support is far from complete and is still
+experimental.
+
+
+5. Reporting Bugs
+-----------------
+
+If you believe you have found a bug please make sure the possible bug
+also exists in the latest version of Samba that is available for the
+unstable Debian distribution. If you are running Debian stable this
+means that you will probably have to build your own packages. And if the
+problem does not exist in the latest version of Samba we have packaged it
+means that you will have to run the version of Samba you built yourself
+since it is not easy to upload new packages to the stable distribution,
+unless they fix critical security problems.
+
+If you can reproduce the problem in the latest version of Samba then
+it is likely to be a real bug. Your best shot is to search the Samba
+mailing lists to see if it is something that has already been reported
+and fixed - if it is a simple fix we can add the patch to our packages
+without waiting for a new Samba release.
+
+If you decide that your problem deserves to be submitted to the Debian
+Bug Tracking System (BTS) we expect you to be responsive if we request
+more information. If we request more information and do not receive
+any in a reasonable time frame expect to see your bug closed without
+explanation - we can't fix bugs we can't reproduce, and most of the
+time we need more information to be able to reproduce them.
+
+When submitting a bug to the Debian BTS please include the version of
+the Debian package you are using as well as the Debian distribution you
+are using. Think _twice_ about the severity you assign to the bug: we
+are _very_ sensitive about bug severities; the fact that it doesn't
+work for you doesn't mean that the severity must be such that it holds
+a major Debian release. In fact, that it doesn't work for you it
+doesn't mean that it doesn't work for others. So again: think _twice_.
+
+
+Eloy A. Paris <peloy@debian.org>
+Steve Langasek <vorlon@debian.org>
+
diff --git a/packaging/Debian/debian-stable/TODO b/packaging/Debian/debian-sarge/TODO
index 5883f72a92..5883f72a92 100644
--- a/packaging/Debian/debian-stable/TODO
+++ b/packaging/Debian/debian-sarge/TODO
diff --git a/packaging/Debian/debian-sarge/changelog b/packaging/Debian/debian-sarge/changelog
new file mode 100644
index 0000000000..0f8f381d0f
--- /dev/null
+++ b/packaging/Debian/debian-sarge/changelog
@@ -0,0 +1,2575 @@
+samba (3.0.20b-1) stable; urgency=low
+
+ * samba 3.0.20b Samba Team Release
+
+ -- Simo Sorce <idra@samba.org> Sun, 23 Oct 2005 11:58:30 +0200
+
+samba (3.0.14a-3) unstable; urgency=high
+
+ * Urgency set to high for a bug that makes smbclient/libsmbclient
+ /almost/ mostly unusable
+ * Fix smbclient's search continuation logic so that it works correctly
+ against 2K servers offering VFAT-hosted shares; many thanks to
+ Jeremy Allison for the timely upstream fix. Closes: #309798.
+ * Update pt_BR debconf translation. Thanks to Andre Luis Lopes
+ <andrelop@debian.org>. (closes: #308510)
+ * Add Russian debconf translation, thanks to Yuriy Talakan
+ <yt@amur.elektra.ru>. (closes: #310063)
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 26 May 2005 23:37:57 -0700
+
+samba (3.0.14a-2) unstable; urgency=low
+
+ * Point the sense of the file_is_special() check right way around;
+ thanks to Matthijs Mohlmann for catching this. Closes: #305747.
+ * debian/patches/dos7-xcopy-always-copies-files.patch:
+ Fix the MS-DOS 7 XCOPY copying files over and over bug
+ Closes: #309003
+ * Steve Langasek <vorlon@debian.org>:
+ - Add Christian Perrier to Uploaders:. Thanks, Christian :)
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 8 May 2005 04:43:21 -0700
+
+samba (3.0.14a-1) unstable; urgency=low
+
+ * New upstream version
+ - A more complete upstream fix for missing files in file listings,
+ should really give us working (closes: #302771); drop
+ xp-missing-files.patch, which has been superseded.
+ * Use the right path when removing mount.cifs binary in the clean
+ target. Closes: #303318.
+
+ -- Steve Langasek <vorlon@debian.org> Mon, 18 Apr 2005 03:22:29 -0700
+
+samba (3.0.11-1) unstable; urgency=high
+
+ * New upstream version
+ - Fixes duplicated entry in swat(8) manpage (closes: #292957).
+ - Fix queue handling so that processes serving print clients don't
+ spin off into infinity and clobber the system (closes: #274969).
+ - Make sure we use C-locale toupper/tolower functions for case
+ conversion, since Turkish pairing rules are incompatible
+ (closes: #286174).
+ * Fix logrotate script to exit true instead of false when nmbd.pid is
+ missing (closes: #287263).
+ * Added Portuguese debconf translation. Thanks to Miguel Figueiredo
+ <elmig@debianpt.org>. (closes: #286375)
+ * Added Italian debconf translation. Thanks to Luca Monducci
+ <luca.mo@tiscali.it>. (closes: #284125)
+ * Add support for building on the Debian BSD and Hurd ports; thanks to
+ Robert Millan for the patch. (closes: #266693)
+ * debian/patches/xp-missing-files.patch: import patch from upstream to
+ fix missing entries in directory listings when talking to WinXP
+ servers (closes: #297771).
+
+ -- Steve Langasek <vorlon@debian.org> Wed, 23 Mar 2005 00:13:16 -0800
+
+samba (3.0.10-1) unstable; urgency=high
+
+ * New upstream release.
+ - CAN-2004-1154: integer overflow can lead to remote code execution
+ by authenticated users; closes: #286023.
+ * High-urgency upload for sarge-targetted RC bugfix.
+ * Sync the fhs.patch to samba 3.0.10.
+ * Install mount.cifs suid root, to make user mounts possible
+ (closes: #283819).
+ * debian/patches/cups.patch: Change the default printing system, so we
+ can compile in CUPS support without making it the default -- CUPS is
+ not a reasonable default on Debian, at least for sarge.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 17 Dec 2004 11:56:01 -0800
+
+samba (3.0.9-1) unstable; urgency=low
+
+ * New upstream release
+ - Fixes Win9x printing; closes: #283530, #282571, #283818.
+ - Fixes a problem with setting dosmodes on filesystems without ACL
+ support; closes: #283661.
+ - Drop ldapsam_compat.patch, redundant now that a fix is integrated
+ upstream
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 2 Dec 2004 01:11:39 -0800
+
+samba (3.0.8-2) unstable; urgency=low
+
+ * Fix the module paths for python2.3-samba so that "import foo from samba"
+ works, and include the __init__.py glue; closes: #222867).
+ * Enable quota support; closes: #246839.
+ * Fix missing symbols in libsmbclient (and libnss_wins), and add
+ -Wl,-z,defs to the libsmbclient link options to prevent future
+ instances of undefined symbols (closes: #281181).
+ * Fix for the legacy ldapsam_compat backend; thanks to Fabien
+ Chevalier for the patch (closes: #274155).
+
+ -- Steve Langasek <vorlon@debian.org> Mon, 15 Nov 2004 06:54:13 -0800
+
+samba (3.0.8-1) unstable; urgency=high
+
+ * New upstream package. Urgency set to "high" because of a potential
+ Denial of Service vulnerability in previous 3.0.x releases
+ (CAN-2004-0930). (Eloy)
+ * Introduce new -dbg package, so we can make better sense out of the
+ cleverly-supplied backtrace emails. (Vorlon)
+ * Applied patch from Luke Mewburn <luke@mewburn.net> to fix missing
+ lock_path() to state_path() change in the FHS patches. (Eloy)
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 8 Nov 2004 13:39:34 -0500
+
+samba (3.0.7-2) unstable; urgency=high
+
+ * High-urgency upload for sarge-targetted RC fixes.
+ * Use autogen.sh in unpatch-source as well as in patch-source, to get
+ rid of the autom4te.cache cruft.
+ * debian/patches/make-distclean.patch: add some missing files to the
+ distclean target in source/Makefile.in (mostly-fixes: #276203).
+ * Change compile-time default of 'use sendfile' to 'no', since the
+ current Samba implementation is broken (closes: #261917, #275741,
+ #270175).
+ * Add mount.cifs into the smbfs package; thanks to Igor Belyi for
+ showing us just how simple this patch should be. ;) Since cifs is
+ the preferred kernel driver in 2.6, bugs related to smbfs and 2.6
+ are considered closed unless someone can show that they exist with
+ the cifs driver as well (closes: #249890, #269443, #227791, #236869,
+ #260707, #261808, #270175).
+ * Fix FHS migration code so that it only affects upgrades from old
+ package versions, and doesn't cause us to mess with non-standard
+ directories that may have been re-added by the admin
+ (closes: #251858).
+
+ -- Steve Langasek <vorlon@debian.org> Tue, 26 Oct 2004 01:35:23 -0700
+
+samba (3.0.7-1) unstable; urgency=high
+
+ * New upstream release. This release fixes two possible denial of
+ service conditions; one in nmbd and one in smbd. The CVE numbers
+ for these vulnerabilities are:
+
+ CAN-2004-0807 for the smbd DoS
+ CAN-2004-0808 for the nmbd DoS
+
+ Urgency is set to "high" because of these vulnerabilities; so this
+ new release propagates to testing ASAP.
+
+ Thanks to the Samba Team and the Debian Security Team for the
+ heads up.
+ * Remove post-3.0.6 patches that are now in 3.0.7.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 13 Sep 2004 00:53:38 -0400
+
+samba (3.0.6-4) unstable; urgency=low
+
+ * Update LDAP schema (closes: #269797).
+ * Applied a couple of upstream fixes that will be present in Samba 3.0.7.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 7 Sep 2004 15:28:42 -0400
+
+samba (3.0.6-3) unstable; urgency=low
+
+ * Put libsmbclient where it belongs, in /usr/lib. (closes: #267704)
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 25 Aug 2004 01:58:37 -0400
+
+samba (3.0.6-2) unstable; urgency=low
+
+ * Added Danish debconf translation. Thanks to Claus Hindsgaul
+ <claus_h@image.dk>. (closes: #232884)
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 23 Aug 2004 17:24:19 -0400
+
+samba (3.0.6-1) unstable; urgency=low
+
+ * New upstream version.
+ * Incorporate Turkish debconf translation; thanks to Recai Oktas
+ <roktas@omu.edu.tr>. (closes: #252031)
+ * Update pt_BR debconf translation. Thanks to Andre Luis Lopes
+ <andrelop@debian.org>. (closes: #208113)
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 23 Aug 2004 12:34:44 -0400
+
+samba (3.0.5-2) unstable; urgency=high
+
+ * Patches from Fabien Chevalier <fabien.chevalier@supelec.fr>
+ to fix:
+ + libnss_wins crashes other programs (closes: #252591)
+ + Can't list share files/dirs, but can acces deeper files/dirs
+ (closes: #264572)
+ + Samba 3.0.5 Printserver doesn't work with WinXP SP2 (closes: #265871)
+ * Urgency "high" to make it into testing as soon as possible since
+ at least #265871 is pretty bad now that WinXP SP2 has been released.
+ Thanks for the help Fabien! Both Vorlon and I have been very busy
+ lately.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 18 Aug 2004 13:25:41 -0400
+
+samba (3.0.5-1) unstable; urgency=high
+
+ * New upstream version. Urgency "high" because of potential buffer
+ overflows. The security fixes are the only difference between
+ 3.0.4 and 3.0.5.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 22 Jul 2004 08:07:36 -0400
+
+samba (3.0.4-5) unstable; urgency=low
+
+ * Doh! Build-depends on libcupsys2-dev (>=1.1.20final+cvs20040330-4),
+ not an unversioned libcupsys2-dev. (closes# 250523)
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 25 May 2004 07:43:54 -0400
+
+samba (3.0.4-4) unstable; urgency=low
+
+ * Rebuilt with libcupsys2-gnutls10 for unstable.
+ Closes: #250424, #250483, #250491, #250515, #250523, #250592, #250736
+ Closes: #250742, #250733
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 24 May 2004 22:32:52 -0400
+
+samba (3.0.4-3) unstable; urgency=low
+
+ * Color me stupid; I uploaded an experimental version to unstable.
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 22 May 2004 00:40:58 -0400
+
+samba (3.0.4-1) unstable; urgency=low
+
+ Eloy:
+
+ * New upstream version.
+ Closes: #247640 (New upstream version available)
+ Closes: #238905 (Printing crash fix)
+ Closes: #247090 (panic in viewing printerqueue)
+
+ Vorlon:
+
+ * Incorporate Catalan debconf translations; thanks to
+ Aleix Badia i Bosch <abadia@ica.es> and the Debian L10n Catalan Team.
+ (closes: #236640)
+ * Incorporate Czech debconf translations; thanks to
+ Miroslav Kure <kurem@upcase.inf.upol.cz> (closes: #236274).
+ * Update libsmbclient shlibs, due to an incompatibility with older
+ versions that prevents gnome-vfs from working correctly
+ (closes: #245869).
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 21 May 2004 11:42:19 -0400
+
+samba (3.0.2a-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 24 Feb 2004 10:30:47 -0500
+
+samba (3.0.2-2) unstable; urgency=high
+
+ * Apply patch from Urban Widmark <urban@teststation.com> to prevent
+ users from mounting remote filesystems containing suid files
+ (closes: 232327). This represents an exploitable security hole on
+ systems running Linux 2.6 kernels.
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 12 Feb 2004 21:38:40 -0600
+
+samba (3.0.2-1) unstable; urgency=high
+
+ * New upstream release.
+ - LaMont Jones: correct false failure LFS test that resulted
+ in _GNU_SOURCE not being defined (thus resulting in strndup()
+ not being defined) (closes: #226694)
+ - Segfault fixes. (closes: #230012) (maybe more, but we need bug
+ reporters to confirm.)
+
+ Urgency "high" due to a password initialization bug that could grant
+ an attacker unauthorized access to a user account created by the
+ mksmbpasswd.sh shell script. See WHATSNEWS.txt for details and
+ workarounds for those not wishing to upgrade (which is a bad idea
+ anyway since this new release fixes lots of other bugs.)
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 8 Feb 2004 10:06:29 -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)
+
+ -- 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
+
+ * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 13 Sep 2003 08:47:56 -0400
+
+samba (3.0.0beta2+3.0.0rc3-1) unstable; urgency=low
+
+ * New upstream release. Last Release Candidate according to the
+ Samba Team. Samba 3.0.0 is around the corner, in a week or so.
+ - Fixes use of non-PIC code in nss shared libraries (closes: #208773)
+ - 'unix password sync' option now runs the unix password program as
+ root again (closes: #209739).
+ * One-line patch to make packages buildable with distcc (closes: #210227)
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 9 Sep 2003 07:57:16 -0400
+
+samba (3.0.0beta2+3.0.0rc2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Link against libgnutls7 instead of libgnutls5. (closes: #208151)
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 2 Sep 2003 21:37:13 -0400
+
+samba (3.0.0beta2+3.0.0rc1-1) unstable; urgency=low
+
+ * New upstream version (skipped samba 3.0.0beta3 due to time
+ constraints.) This ugly version number will go away when the final
+ Samba 3.0.0 is released.
+ * Drag new unpackaged tools into the packages: smbcquotas (smbclient),
+ vfs modules (samba), smbtree(1) manpage (smbclient), tdbbackup(8)
+ manpage (samba). (closes: #151158)
+ * Switch to DH_COMPAT level 4:
+ - no explicit conffile listings needed
+ - the postinst for libsmbclient is now completely autogenerated
+ - use the default init script handling (with support for
+ invoke-rc.d) in debhelper, instead of the currently buggy upgrade
+ path (closes: #185439)
+ - add support for ${misc:Depends} in control for those packages with
+ init scripts
+ * Add versioned dependency on libpam-runtime and change
+ /etc/pam.d/samba to use the new common PAM config blocks.
+ * New python2.3-samba package (old python2.2-samba is no more.)
+ (closes: #206171)
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 25 Aug 2003 17:05:14 -0400
+
+samba (3.0.0beta2-1) unstable; urgency=low
+
+ * New upstream release
+ - The smb.conf(5) manpage documents config options again
+ (closes: #197963).
+ - Handling of winbind/idmap has been restructured; domain members
+ should be able to map domain accounts to local accounts again
+ (closes: #196815).
+ - Use the locale charset for 'display charset' by default
+ (closes: #194406).
+ - Fix for segfault in smbclient when using the -b option
+ (closes: #196833).
+ - Handle an empty 'passdb backend' list gracefully (closes: #193946).
+ * Don't set 'display charset' anymore on upgrade, since this is now
+ grabbed from the locale by default -- a much better option.
+ * Removed time.c.patch which is now in the upstream sources.
+ * Update FHS patch for two new tdb files (netsamlogon_cache.tdb,
+ privilege.tdb).
+ * Remove python-linker.patch, since the Kerberos package has been
+ fixed to no longer use rpath
+ * Remove configure.patch: the hppa glibc bug this was added for is
+ long since fixed, and upstream isn't interested in supporting this
+ kludge.
+ * Update references to missing documentation in sample smb.conf file
+ (closes: #187632).
+ * Fix handling of krb5 link line, building on a patch from Stefan
+ Metzmacher <metze@metzemix.de>.
+ * Add patch so smbclient's tar support works with popt
+ (closes: #194921).
+
+ -- Steve Langasek <vorlon@debian.org> Wed, 2 Jul 2003 20:59:09 -0500
+
+samba (3.0.0beta1-2) unstable; urgency=low
+
+ * Update build-deps to libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1)
+ to make sure we get the right shlib dependencies (closes: #193149).
+ * Update the dhcp config hooks so they're suitable for sourcing (i.e.,
+ don't call "exit") (closes: #196477).
+ * Bring package into line with current policy by adding support for
+ the DEB_BUILD_OPTIONS flag, and enabling debugging symbols (-gstabs)
+ by default
+ * Make sure libpam-smbpass is a self-contained DSO.
+ * Fix a typo in samba-common.dhcp that caused us to spuriously rewrite
+ the server list.
+ * Fix python install script to ignore -Wl linker flags, as seen in the
+ output from the latest krb5-config.
+ * Add LDAP and Unicode information about upgrading from 2.2 to
+ README.debian.
+ * Remove dangerous and confusing browse options from the default
+ smb.conf (closes: #198804).
+ * Reorder smb.conf options for clearer grouping, and clarify the
+ comments.
+ * Add a default [print$] share to the sample smb.conf, and create the
+ necessary tree under /var/lib/samba/printers. (closes: #168173)
+ * s/winbind/idmap/ in smb.conf, since the option names have changed.
+ * Fix the patch for postexec handling, so that we chdir("/") at the
+ right time.
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 12 Jun 2003 15:02:00 -0500
+
+samba (3.0.0beta1-1) unstable; urgency=low
+
+ * New upstream version.
+ - fix for empty browselist bug (closes: #194553)
+ - fix for tab completion segfault in smbclient (closes: #194776)
+ - Samba now works as a domain member again without segfaulting
+ (closes: #194134, #194394, #194775)
+ - WinXP machines can join a Samba-controlled domain again
+ (closes: #195362)
+ * Build-depend on python-dev >= 2.2 instead of on just python-dev
+ (without version).
+ * Added Vorlon'n patch to source/lib/time.c to fix #194075.
+ (closes: #194075)
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 8 Jun 2003 22:26:43 -0400
+
+samba (2.999+3.0.alpha24-3) unstable; urgency=low
+
+ * Make sure Samba DSOs are compiled with -fPIC. (closes: #194324)
+ * Rebuild against pristine Kerberos libs, to squelch warnings about
+ versioned symbols. (closes: #194431, #194396)
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 22 May 2003 15:32:00 -0500
+
+samba (2.999+3.0.alpha24-2) unstable; urgency=low
+
+ * Fixed description of the smbfs package. (closes: #194183)
+ * Negate the sense of the unixsam check when upgrading. (closes: #194234)
+
+ -- Steve Langasek <vorlon@debian.org> Wed, 21 May 2003 12:21:53 -0400
+
+samba (2.999+3.0.alpha24-1) unstable; urgency=low
+
+ * New upstream version. (closes: #189354)
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 20 May 2003 13:55:57 -0400
+
+samba (2.999+3.0.alpha23-5) unstable; urgency=low
+
+ * Move the python package from section "net" to section "python".
+ * Make sure we use PIC code for python on all platforms.
+ * French translation of an additional debconf template, courtesy of
+ Christian Perrier <bubulle@debian.org>. (closes: #188832)
+ * Updated Brazilian Portuguese translation from André Luís Lopes
+ <andrelop@ig.com.br>.
+ * s/unixsam/guest/ everywhere, since the unixsam backend is now
+ deprecated. (closes: #190095)
+ * Create our temp config file as /etc/samba/smb.conf.dpkg-tmp; not
+ only does using /tmp violate SELinux policies, it introduces the
+ possibility of data loss during the final copy if /tmp is a separate
+ filesystem. (closes: #189823)
+ * Pull in fix for SWAT, so that logins work again
+ (closes: #188255, #192077).
+ * Move passdb.tdb into /var/lib/samba, since it's not user-editable.
+ * Make sure with don't ship any .cvsignore files.
+ * Don't ship examples for python2.2-samba and samba-doc in an
+ "examples" directory inside another "examples" directory.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 6 May 2003 12:05:46 -0400
+
+samba (2.999+3.0.alpha23-4) unstable; urgency=low
+
+ * Instead of s/LPT1:/LPT:/, we need to do s/LPT:/LPT1:/ -- now all
+ non-RPC printing clients are working again.
+ * Change shlibs to 0 instead of 0.1. The library already in the
+ archive is using this soname, and there are no packages depending
+ on libsmbclient, so skip changing the package name for now.
+ (closes: #188661)
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 11 Apr 2003 14:42:00 -0500
+
+samba (2.999+3.0.alpha23-3) unstable; urgency=low
+
+ * Put the Samba Python modules in /usr/lib/python2.2/site-packages/,
+ not in /usr/lib/python2.2/lib-dynload/.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 9 Apr 2003 19:49:25 -0400
+
+samba (2.999+3.0.alpha23-2) unstable; urgency=low
+
+ * New package python2.2-samba that includes the Python modules
+ included in the Samba sources. Feedback on these modules and the new
+ package is welcome, as we (Debian Samba maintainers) don't use them.
+ (closes: #170731, #173322)
+ * Move libsmbclient-dev from section "devel" to "libdevel".
+ * Fix panic action script to give a sensible error message instead of
+ an empty backtrace when we don't have permission to attach to the
+ process. (closes: #188164)
+ * Fix libpam-smbpass so that it really does something. (closes: #178245)
+ * Apply patch to fix printing-related segfaults. (closes: #188076)
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 6 Apr 2003 21:40:33 -0400
+
+samba (2.999+3.0.alpha23-1) unstable; urgency=high
+
+ * new upstream release, includes security fix for DSA-262
+ * tweak the debconf templates to avoid references to specific
+ front-ends (closes: #183718)
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 9 Mar 2003 14:58:00 -0600
+
+samba (2.999+3.0.alpha21-5) unstable; urgency=low
+
+ * touch up the package descriptions a little bit (caps, punctuation)
+ * remove addtosmbpass, which snuck back in when we weren't looking
+ * reverse the position of the wins server tag, after looking more
+ closely at the code (closes: #183061)
+ * fix a glitch in the Spanish .po that rendered it invalid, plus a typo
+ * updated Brazilian Portuguese templates (closes: #183295)
+ * fix a typo in upstream manpage (s/shave/share/) (closes: #180546)
+ * run sed before we run sed, to deal with crazybad special chars
+ in the workgroup name (!) (closes: #176717)
+
+ -- Steve Langasek <vorlon@debian.org> Sat, 1 Mar 2003 15:14:00 -0600
+
+samba (2.999+3.0.alpha21-4) unstable; urgency=low
+
+ * add scripts to samba-common to grab the netbios-name-servers options
+ if we're running a DHCP client (closes: #38413)
+ * major rearrangement of build scripts: install target now operates on
+ debian/tmp, not debian/samba, so we can see when new files are
+ added and decide where to put them; several files that should have
+ been in samba-common but were in samba (for the above reason) --
+ smbcacls, -- have been moved, with a replaces: added.
+ * Fix rc script so that whitespace is consistent between inetd and
+ daemon modes (closes: #174677).
+ * smbclient -M must always connect to port 139, because port 445
+ doesn't support messaging and we can't do the port 135 stuff yet
+ (closes: #175292, #167859).
+ * Import the diff from upstream CVS, which has fixed a few bugs
+ (closes: #178219, #177583, #181467, #181487, #181603, #175864).
+ Remove a few patches of ours which are now superseded.
+ * Add po-debconf support to the tree, for better i18n.
+ * Install the libsmbclient.so symlink in the libsmbclient-dev package,
+ per policy (closes: #181466).
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 27 Dec 2002 00:37:00 -0600
+
+samba (2.999+3.0.alpha21-3) unstable; urgency=low
+
+ * Drop --with-ldapsam from the configure options, since this no longer
+ means what we thought it did. Revert patch for changing the 'passdb
+ backend' defaults.
+ * Add patch from CVS HEAD to fix pdbedit segfault; postinst script
+ should work better now. (Closes: #173936)
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 22 Dec 2002 13:29:00 -0600
+
+samba (2.999+3.0.alpha21-2) unstable; urgency=low
+
+ * add CONFIGDIR to the set of directories exported in the install
+ target, so we don't try to write to /etc/ on the autobuilders.
+ * Reset the default 'passdb backend' value to something sensible, so
+ that we don't unnecessarily break upgrading systems (closes: #173731).
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 20 Dec 2002 09:13:00 -0600
+
+samba (2.999+3.0.alpha21-1) unstable; urgency=low
+
+ * new upstream release, many patches now incorporated upstream
+
+ -- Steve Langasek <vorlon@debian.org> Mon, 16 Dec 2002 23:39:00 -0600
+
+samba (2.999+3.0.alpha20-4) unstable; urgency=low
+
+ * Remove obsolete comments about non-existant LDAP support in the
+ Debian Samba packages. (Closes: #165035)
+ * Apply patch for segfault in pam_smbpass when using the unixsam
+ backend.
+ * Drop support for nmbd in inetd, since it's not supported by
+ upstream and is reported to cause problems (closes: #23243, #137726,
+ 165037).
+ * Clarify example printing configs in smb.conf (closes: #168174).
+ * Make sure nmbd still responds to SIGTERM if it has no interfaces to
+ listen on (closes: #168079).
+ * Fix to get samba working again on 64-bit archs, after a
+ pointer<->int size mismatch bug. Already fixed in upstream CVS.
+ * Merge fix from CVS for broken libsmbclient.h references to internal
+ structures (closes: #162956).
+ * Add a default 'panic action' for Samba that will give us genuinely
+ useful debugging information after a crash.
+ * Fixed correct patch to example configurations in the libpam-smbpass
+ packages (closes: #169350).
+ * acl-dev is not in sid anymore; Build-Depend on libacl1-dev instead
+ (closes: #169682).
+ * Only ask the user for permission to edit if there's a chance of us
+ damaging something.
+
+ -- Steve Langasek <vorlon@debian.org> Mon, 18 Nov 2002 19:53:00 -0500
+
+samba (2.999+3.0.alpha20-3) unstable; urgency=low
+
+ * Make sure smbstatus behavior is sane when Samba *has* been started,
+ as well as when it has not (closes: #164179). Thank to Robbert Kouprie
+ <robbert@radium.jvb.tudelft.nl> for this patch.
+ * Not using 'killall' in any of the maintainer scripts (the last one
+ remaining was winbind.logrotate.) We now just use 'kill' to send
+ a SIGHUP to a specific PID (which is stored in a file in
+ /var/run/samba.)
+ * Do not depend on procps because we're not using killall anymore.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 15 Oct 2002 22:15:57 -0400
+
+samba (2.999+3.0.alpha20-2) unstable; urgency=low
+
+ * fix an off-by-one error in smbd/lanman.c, which should shut off the
+ flood of log messages (closes: #157432)
+ * add a --config-cache option to the configure invocation, since
+ autoconf 2.5 doesn't load config.cache by default (closes: #163504)
+
+ -- Steve Langasek <vorlon@debian.org> Sat, 5 Oct 2002 01:40:00 -0500
+
+samba (2.999+3.0.alpha20-1) unstable; urgency=low
+
+ * new upstream release
+ - non-primary groups appear to work again (closes: #161271)
+ * the official beginning of the upstream 3.0 branch
+ * exit without error from smbstatus when no connections have
+ been seen yet (closes: #161489)
+
+ -- Steve Langasek <vorlon@debian.org> Wed, 2 Oct 2002 19:02:00 -0500
+
+samba (2.999+3.0cvs20020906-1) unstable; urgency=low
+
+ * CVS update
+ - domain authentication works again (closes: #158698)
+ * Factor out common code in samba-common.config
+ * Handle character set settings in smb.conf on upgrade
+ (closes: #153913, #158770)
+ * Don't use killall in logrotate script; there are better ways
+ (closes: #160076)
+ * Ignore value of 'hostname lookups' for hosts allow/hosts deny
+ (closes: #154376)
+
+ -- Steve Langasek <vorlon@debian.org> Sat, 7 Sep 2002 11:46:00 -0500
+
+samba (2.999+3.0cvs20020829-1) unstable; urgency=low
+
+ * CVS update.
+ * Move the smb.conf manpage to the samba-common package (closes: #159572)
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 29 Aug 2002 17:53:25 -0500
+
+samba (2.999+3.0cvs20020827-1) unstable; urgency=low
+
+ * CVS update. (Closes: #158508)
+ * Part 1 of 3 of the library separation patch that Vorlon wrote has
+ gone upstream - removed the patch from our patches/ directory.
+ * Debconf note to warn users that their smb.conf will be re-written
+ and changed if they use Swat to maintain it. (Closes: #158479)
+ * Fixed typo in samba.prerm.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 27 Aug 2002 15:23:23 -0400
+
+samba (2.999+3.0cvs20020825-2) unstable; urgency=low
+
+ * scale back the tdbsam migration support, because of undesirable
+ side-effects; now always defaults to 'no'.
+ * strip out hyperactive library dependencies that are only needed by
+ smbd (closes: #155156).
+ * nuke any broken registry.tdb files left by previous CVS snapshots.
+ * support rolling back the smbpasswd->tdbsam conversion on downgrade,
+ since many people are likely to need to downgrade for a while.
+ * remove postrm handling of legacy directories, and add handling of
+ current ones.
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 28 Jul 2002 09:44:24 -0500
+
+samba (2.999+3.0cvs20020825-1) unstable; urgency=low
+
+ * CVS update. These packages are based on Samba 3.0alpha19 + any
+ code commited after 3.0alpha19 was released.
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 25 Aug 2002 14:56:46 -0400
+
+samba (2.999+3.0cvs20020723-1) unstable; urgency=medium
+
+ * remove spurious line from samba.config
+ * migrate from smbpasswd to tdbsam
+ * re-add the pdbedit util and manpage
+ * compile in ldapsam support (closes: #146935)
+ * add PRIVATEDIR to the list of vars we override for the install
+ target, so Samba doesn't try to create /etc/samba (closes: #153746).
+ * fix makefile handling of LOGBASEDIR, so that logs always end up in
+ the right place (closes: 153727).
+ * Fixed bug in the FHS migration path that causes nmbd to read its
+ state from one location, but write it out to another. (closes: #154210)
+ * Make sure nmbd is always looking for wins.tdb in the same place.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 19 Jul 2002 21:38:54 -0500
+
+samba (2.99.cvs.20020713-1) unstable; urgency=low
+
+ * first attempt for 3.0pre.
+ * only post a debconf note about moving logfiles if we're upgrading
+ from a version that had the logfiles in the old location
+ (closes: #152924).
+
+ -- Steve Langasek <vorlon@debian.org> Sat, 13 Jul 2002 12:54:25 -0500
+
+samba (2.2.5-2) unstable; urgency=low
+
+ * No longer ship make_printerdef, which is deprecated. (closes: #63059)
+ * Clean up some empty directories from the samba package.
+ * Add call to dh_installinit for winbind rc.x symlinks (closes: #151860).
+ * Clean up per-package documentation lists, to reduce clutter
+ (closes: #147638).
+ * Make sure we don't ship pdbedit's man page since we are still using
+ smbpasswd passwords. (closes: #152208)
+ * move libnss_wins.so to libnss_wins.so.2, where glibc expects to find
+ it (closes: #148586).
+ * reorder postinst, so that installing samba-common from scratch loads
+ the debconf answers properly (closes: #151985).
+ * add lintian overrides for winbind, to eliminate some noise.
+ * rename pam_smbpass changelog to comply with policy.
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 23 Jun 2002 22:45:04 -0500
+
+samba (2.2.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 9 Jun 2002 15:49:21 -0400
+
+samba (2.2.4+2.2.5pre1-1) experimental; urgency=low
+
+ * Getting ready for Samba 2.2.5.
+ * Remove patches/parse_spoolss.patch, now included upstream.
+ * Fixed thinko WRT POSIX ACL support, which we "half-enabled" in
+ 2.2.4-1. We don't use POSIX ACL support ourselves, so we'd
+ appreciate reports from those using this feature so we can
+ be sure this works.
+ * Fix the filename-matching algorithm used for smbtar's 'exclude'
+ functionality. (closes: #131571)
+ * Look for secrets.tdb in /var/lib/samba, and handle in the postinst.
+ This is not really a config file, because users don't edit it.
+ (closes: #147429)
+ * Doxygen fix for libsmbclient.h, thanks to Tommi Komulainen
+ <Tommi.Komulainen@iki.fi> for the patch. (closes: #144847)
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 28 May 2002 11:33:51 -0400
+
+samba (2.2.4-1) unstable; urgency=low
+
+ * New upstream release (closes: #144713)
+ * Building with POSIX ACL support (closes: #137819)
+ * Include samples, exclude INSTALL from libpam-smbpass (closes: #145055)
+ * Compile with --with-automount, for NIS homedir support (closes: #123396)
+ * Add a proper 'flags' field to the mount entry we write to /etc/mtab;
+ fixes a display bug with mount (closes: #140397)
+ * Added logic to /etc/init.d/samba so a help message is printed out
+ when Samba is running from inetd _and_ we are not booting, i.e. the
+ user called the init script manually. Thanks to Francesco
+ Potorti <pot@gnu.org> for the suggestion on how to implement this.
+ (Closes: #139807, #140204)
+ * samba.postinst: added logic so we don't call /etc/init.d/samba if
+ we are running from inetd (this prevents the stupid help message
+ to be printed during package upgrades if we are running from inetd.)
+ * samba.prerm: idem.
+ * /etc/init.d/samba: delete stale PID files after nmbd and smbd are
+ stopped. This prevents start-stop-daemon from printing an ugly
+ error message when called from '/etc/init.d/samba stop'. I prefer
+ this than running start-stop-daemon with --oknodo because
+ start-stop-daemon might print other important error messages that with
+ --oknodo it would otherwise not print. (Closes: #102187, #109301)
+ * Patch from jerry@samba.org to fix parsing of spoolss structures.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 23 May 2002 23:16:52 -0400
+
+samba (2.2.3a-7) unstable; urgency=medium
+
+ * More README.debian updates.
+ * Neutralize the smb.conf 'lock dir' directive, which doesn't mean
+ what the FHS says it should, and causes us no end of grief.
+ (Closes: #122299)
+ * LPRng-handling patch so that jobs printed to recent versions of
+ LPRng show up properly as 'done' instead of 'paused' in the Windows
+ print queue. Thanks to Jaroslav Serdula <serdula_jaroslav@vse.sk>
+ for this patch. (Closes: #139458)
+ * Applied patch from Urban Widmark <urban@teststation.com>
+ (smbfs upstream maintainer) to add a '-n' option to smbmount
+ that does the same as mount's '-n'. (Closes: #139590)
+ * Minor tweak to unpatch-source so we unpatch sources in the
+ reverse order we patched them.
+ * Don't depend on grep in samba.prerm to determine if Samba was
+ running before the upgrade starts.
+ * Tweak the wording of debconf templates.
+ * Incorporate debconf translations for French, Spanish and Portuguese;
+ thanks to Carlos Valdivia Yagüe <valyag@hotpop.com> (es),
+ Andre Luis Lopes <andrelop@ig.com.br> (pt_BR), and Philippe
+ Batailler and Denis Barbier <barbier@debian.org> (fr).
+ (closes: #142657, #142659, #141551, #141699, #141682)
+ * Fixed symlinks in the swat package so the point to /usr/share/doc/
+ instead of /usr/doc/. Added note to the description of the
+ swat packages that says that samba-doc must be installed for
+ the on-line documentation to work. Thanks to Torne Wuff
+ <torne@wolfpuppy.org.uk>. (Closes: #95437)
+ * 'dh_installinit -n' gives us no initscript handling -- we need to
+ handle all starting and stopping of daemons ourselves, which wasn't
+ happening in the {pre,post}rm scripts.
+ * Vary the priority of the debconf question "Do you want to generate
+ /etc/samba/smbpassd?" depending on whether the file already exists.
+ File exists -> priority 'medium', file does not exist -> priority
+ 'low'. Changed priorities of all other questions from 'high' to 'medium'.
+
+ -- Steve Langasek <vorlon@debian.org> Sat, 20 Apr 2002 17:48:27 -0400
+
+samba (2.2.3a-6) unstable; urgency=low
+
+ * Call db_stop as soon as we're done with debconf in the postinst, to
+ avoid hanging bugs (closes: #137813)
+ * Ony call 'update-inetd --add' on first installation, just as we only
+ call 'update-inetd --remove' on package purge.
+ * Bring our shipped smb.conf closer in line with the upstream
+ defaults: don't twiddle the send/recv buffer sizes, since the Linux
+ kernel already provides a much better default setting
+ (closes: #80966, #80934, #137415, #133477)
+ * Added libnss_wins.so to the winbind package (closes: #137201)
+ * Updates to README.debian.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 12 Mar 2002 10:57:40 -0500
+
+samba (2.2.3a-5) unstable; urgency=low
+
+ * Having multiple workgroup lines in your smb.conf, though wacky, is
+ perfectly valid. Account for this in samba-common.config.
+ (closes: #137157)
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 10 Mar 2002 21:52:51 -0600
+
+samba (2.2.3a-4) unstable; urgency=low
+
+ * Fixed typo in samba.postinst. Cosmetic fixes there as well.
+ * Fix to improper usage of /usr/bin/tr in samba-common config script
+ (closes: #137744)
+
+ -- Steve Langasek <vorlon@debian.org> Sat, 9 Mar 2002 14:14:02 -0500
+
+samba (2.2.3a-3) unstable; urgency=medium
+
+ * Make sure /etc/init.d/samba is executable before calling it
+ in the postinst. Quickly checked all other maintainer scripts
+ to make sure we are not calling an init script if it is not
+ executable. (closes: #137321)
+ * Fix up maintainer scripts to detect if samba was not running before
+ an upgrade. (closes: #33520, #130534)
+ * Make sure /etc/samba/ is included in the samba-common package.
+ Closes: #137157
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 8 Mar 2002 11:13:21 -0500
+
+samba (2.2.3a-2) unstable; urgency=low
+
+ * merge in debconf support:
+ - Moved all smb.conf-related questions to samba-common (smb.conf
+ is part of the samba-common package, not the samba package.)
+ - smb.conf is not a samba-common conffile anymore since it is
+ being managed by debconf. It is ABSOLUTELY necessary to make
+ sure /etc/samba/smb.conf _NEVER_ gets overwritten by changes
+ made via debconf. In other words, any changes made by the user
+ should be honored by the debconf interface.
+ - samba.postinst now moves old log files from /var/log/ to
+ /var/log/samba/. There's a Debconf note that informs the user
+ the log files are stored now in a new location.
+ - debian/control:
+ + Make samba depend on debconf.
+ - New file debian/samba.templates.
+ - New file debian/samba.config.
+ - Re-worked debian/samba.postinst.
+ + Got rid of all /etc/samba/debian_config sillyness.
+ - remove /usr/sbin/sambaconfig; "dpkg-reconfigure samba" replaces
+ it.
+ - Removed debian/samba.prerm.
+ - Cleaned up /etc/init.d/samba.
+ + Added infrastructure for debconf.
+ + Got rid of all /etc/samba/debian_config sillyness.
+ + Got rid of /etc/samba/smbpasswd conversion stuff for
+ compatibility with versions of Samba < 2.0.0final-2.
+ (closes: #127959, #34408, #113594)
+ * make samba.postinst ignore the absence of /var/log/{s,n}mb*;
+ makes for a clean upgrade path.
+ * Building with MSDFS support (closes: #116793)
+
+ -- Steve Langasek <vorlon@debian.org> Tue, 5 Mar 2002 14:14:33 -0600
+
+samba (2.2.3a-1) unstable; urgency=low
+
+ * New upstream version (closes: #135001)
+ * Potato builds were failing because debian/rules was not creating
+ debian/winbind/etc/logrotate.d/. A user having problems creating
+ Potato packages brought this to my attention. dh_installlogrotate
+ takes care of creating the directory for us, that's why we didn't
+ notice.
+ * Removed code that converts /etc/samba/smbpasswd from an ancient
+ format to the new format of Samba 2.0.0 and later.
+ Closes: #134375 - samba: postinst failed due to missing
+ /usr/bin/convert_smbpasswd.
+ * Re-organized FHS migration code in samba.postinst. Make sure we
+ don't fail when we move files that don't exist.
+ Closes: #133813 - samba: Install failed.
+ * Adding docs. to the libpam-smbpass package.
+ * Remove man pages for findsmb because we are not providing this
+ script.
+ Closes: #134181 - findsmb referenced, but not included.
+ * Removed replace.patch because it is now present upstream.
+ * Added patch from Jerry Carter to fix a problem when saving
+ document preferences for printing from NT clients.
+ * The real winbindd daemon is a forked process so we can't use
+ --make-pidfile when calling start-stop-daemon. Fixed
+ /etc/init.d/winbind to work around the issue. Thanks to
+ Lin Li <linl@xandros.com> for the patience and for reporting
+ the problems. Hopefully I got it right this time.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 20 Feb 2002 18:39:03 -0500
+
+samba (2.2.3-6) unstable; urgency=low
+
+ * Make sure there are actual files in /var/state/samba before trying
+ to move them (Closes: #133534, #133510).
+ * Fix up the 2.2.3 makefile so that pam_smbpass builds correctly
+ again.
+
+ -- Steve Langasek <vorlon@debian.org> Tue, 12 Feb 2002 09:19:29 -0600
+
+samba (2.2.3-5) unstable; urgency=low
+
+ * Whoops, missed a spot on the samba.postinst -- will fail badly if
+ /var/state/samba/ no longer exists. Better get this fix into the
+ next upload. ;) (Closes: #133088)
+ * Regenerate configure only if it is older than configure.in.
+ * Fix smbd handling of network neighborhood lists, which was missed
+ in the FHS conversion (Closes: #133091)
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 9 Feb 2002 16:37:57 -0500
+
+samba (2.2.3-4) unstable; urgency=low
+
+ * FHS cleanup; files in /var are now properly sorted according to
+ their nature. (Closes: #102101)
+ * Remove patches to source/configure, since we now call autoconf to
+ regenerate this file cleanly.
+ * lintian fixes:
+ - Create winbind.conffiles and add /etc/logrotate.d/winbind and
+ /etc/init.d/winbind to it.
+ - Use a relative symlink for /usr/lib/cups/backend/smb.
+ - Removal of a .cvsignore file in the samba-doc package.
+ * winbind.init fixes:
+ - Corrected name of the pid file (Steve)
+ - Make start-stop-daemon create a pid file for winbindd since it
+ does not create one on his own.
+ * #DEBHELPER# is not needed in samba.postinst because we are adding
+ manually everything that debhelper adds automatically. In fact,
+ since we are calling update-rc.d without standard paramaters I
+ think we can't use #DEBHELPER#.
+ * Fix fatal syntax error in samba.prerm.
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 7 Feb 2002 13:12:08 -0500
+
+samba (2.2.3-3) unstable; urgency=low
+
+ * work on lintian-cleanness in the package (wrong permissions,
+ maintainer scripts in need of debhelpering)
+ * /lib/security/pam_smbpass.so is now being included in the
+ libpam-smbpass package only, and not in both the libpam-smbpass and
+ samba packages (which was the case prior to 2.2.3-3.)
+ * Instead of making our patch scripts executable in the rules file
+ we run them through /bin/sh.
+ * New 'winbind' package that has all the winbind stuff that was in the
+ samba package in 2.2.3-2 and before.
+ * Added replace.patch: patch from Jeremy Allison to fix problems when
+ replacing or overwriting files in a Samba share. Patch was sent to
+ the samba mailing list.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 5 Feb 2002 21:12:48 -0500
+
+samba (2.2.3-2) unstable; urgency=low
+
+ * add support to debian/scripts/{patch-source,unpatch-source} for
+ automatic updating and cleaning of <version.h>. This was a request
+ from the Samba Team: they wanted us to clearly mark our packages
+ so it is always known a user is running Samba with (possibly)
+ Debian-specific patches.
+ * Change init.d killscript link to K19samba, so we stop before autofs
+ (closes: 117327)
+ * Make our patch scripts executable in the rules file -- dpkg won't do
+ this for us (closes: #132415).
+
+ -- Steve Langasek <vorlon@debian.org> Mon, 4 Feb 2002 09:51:00 -0600
+
+samba (2.2.3-1) unstable; urgency=low
+
+ * New upstream release (closes: #131228).
+ * Restructured build system that provides DBS-like separation of
+ patches
+ * Fix typo in smbfs description (closes: #116209).
+ * Use killall -q in logrotate.d script, to avoid spurious cron
+ emails (closes: #130100).
+
+ -- Steve Langasek <vorlon@debian.org> Sat, 2 Feb 2002 19:56:18 -0500
+
+samba (2.2.2-12) unstable; urgency=high
+
+ * (Steve) Patch for source/client/client.c.
+ Closes: #86438 smbclient: Transfering several GB causes the average
+ speed to be messed up.
+ * Uploading with urgency=high to expedite the move from unstable
+ to testing because of the security problem fixed in -11.
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 25 Jan 2002 22:31:12 -0500
+
+samba (2.2.2-11) unstable; urgency=low
+
+ * Building with --with-libsmbclient. We have created two new
+ packages: libsmbclient and libsmbclient-dev. Hopefully this
+ will help some people that want to add the capability of
+ speaking SMB to their applications.
+ Closes: #117132 - libsmbclient support library?
+ * (Steve) Make swat do the right thing when reading (parsing)
+ the saved preferences in smb.conf.
+ Closes: #55617 swat mutilates the linpopup message command.
+ * Updated README.Debian. Updated descriptions in debian/control.
+ * Remembered to bump up version number in source/include/version.h
+ (need to automate this or else I'll keep forgetting.)
+ * (Steve) one liner for source/web/diagnose.c.
+ Closes: #106976 - smbd/nmbd not running message with swat/linuxconf.
+ * Added '|| true' to the post-rotate script so logrotate doesn't
+ fail if either nmbd or smbd is not running.
+ Closes: #127897 - /etc/logrotate.d/samba fails if there is no smbd process.
+ * Fixed incorrect file locations in swat's man page and added a
+ Debian-specific note to /usr/share/doc/swat/README.
+ Closes: #71586 swat: needs documentation fixes for debian.
+ * smbmount in the smbfs package does not have the setuid bit set.
+ Apparently, smbmount uses libsmb without checking the environment.
+ Thanks to Christian Jaeger <christian.jaeger@sl.ethz.ch> for
+ finding the local root exploit.
+ * Applied old patch from Jerry) Carter" <jerry@samba.org> to correct
+ the following two problems in Samba 2.2.2:
+ - %U and %G could not be used in services names
+ in smb.conf.
+ - %G would fail to be expanded in an "include = ..."
+ line.
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 19 Jan 2002 21:35:26 -0500
+
+samba (2.2.2-10) unstable; urgency=low
+
+ * (Steve) Add missing manual pages.
+ Closes: Bug#128928: missing manpages in smbfs.
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 13 Jan 2002 14:39:55 -0500
+
+samba (2.2.2-9) unstable; urgency=low
+
+ * (Steve) Fix broken URL's in HTML docs.
+ Closes: Bug#17741: bad links in html docs (at last!!!)
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 11 Jan 2002 13:37:07 -0500
+
+samba (2.2.2-8) unstable; urgency=low
+
+ * Added "Replaces: samba (<= 2.2.2-5)" to the smbclient section in
+ debian/control so rpcclient.1, which was in samba-2.2.2-5, does not
+ cause problems now that it is part of smbclient (>= 2.2.2-6). Closes:
+ Closes: Bug#128684: error upgrading smbclient in sid.
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 11 Jan 2002 11:42:40 -0500
+
+samba (2.2.2-7) unstable; urgency=low
+
+ * (Steve) Patch to make behavior honor what the docs. say about "hosts allow"
+ taking precedence over "hosts deny".
+ Closes: Bug#49249: swat: error with host deny ?!
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 10 Jan 2002 12:36:58 -0500
+
+samba (2.2.2-6) unstable; urgency=low
+
+ * (Steve) Adds manpage for rpcclient to the proper file,
+ removes smbtorture from the distro because this tool isn't intended for
+ widespread consumption.
+ Closes: #63057 - no manual page for smbtorture.
+ * (Steve) Removed -gnu from the configure arguments (--build, --host) in
+ debian/rules so config.sub is able to properly create the host and target
+ tuples.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 9 Jan 2002 14:39:51 -0500
+
+samba (2.2.2-5) unstable; urgency=low
+
+ * Fixes from vorlon:
+ * Use /usr/bin/pager instead of more.
+ Closes: #125603: smbclient violates pager policy.
+ * Make /etc/logrotate.d/samba a conffile, send smbd and nmbd
+ a SIGHUP to have the log files reopened, fixes to
+ /etc/logrotate.d/samba.
+ Closes: #127897: log file rotation.
+ Closes: #118277: /etc/logrotate.d/samba not listed in conffiles.
+ * s/covert/convert/.
+ Closes: #121653 probable typo in install message.
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 6 Jan 2002 03:14:58 -0500
+
+samba (2.2.2-4) unstable; urgency=low
+
+ * Applied patch from Steve to work around problem in glibc that affects the
+ HPPA architecure. The patch detects the error condition at configure time
+ and compiles without LFS support if necessary.
+ Closes: Bug#126763: samba completely broken on hppa.
+ * Including unicode_map.1251.
+ Closes: Bug#126719: samba-common: unicode_map.1251 missing.
+ * Updated smbd daemon version to match Debian package version.
+ Closes: Bug#127199: Package version and smbd daemon version don't match.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 31 Dec 2001 14:32:47 -0500
+
+samba (2.2.2-3) unstable; urgency=low
+
+ * Added some spaces in package description in debian/control.
+ Closes: #120730 - missing spaces in package description for nice
+ alignment.
+ * Spelling fixes.
+ Closes: #125328, #125329, #125330, #125367, #125365, #125403.
+ * Steve Langasek <vorlon@debian.org> is the co-maintainer of the Debian
+ Samba packages!!! Added him to the uploaders field in debian/control.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 18 Dec 2001 00:54:25 -0500
+
+samba (2.2.2-2) unstable; urgency=low
+
+ * Backed out changes to source/filename.c per Andrew Tridgell's request.
+ This changes were introduced in 2.2.1a-7 as an attempt to fix #47493.
+ Tridge found out that they break smbd.
+ * Changed version number in source/includes/version.h so it is clear that
+ this is a version of Samba packaged for Debian. This is another request from
+ Tridge and will help the Samba Team to get bogus bug reports.
+ * Added Samba-HOWTO-Collection.pdf and other README files to the
+ /usr/share/doc/<package>/ directories.
+ * Installing libnss_winbind.so and pam_winbind.so.
+ Closes: #116790: nss and pam modules for winbind missing.
+ * Removed user-emacs-settings from changelog.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 29 Oct 2001 19:16:26 -0500
+
+samba (2.2.2-1) unstable; urgency=low
+
+ * New upstream version.
+ * Temporary fix for #113763 (Steve Langasek)
+ * Quick hack to avoid smbmount reveal password length. Please note
+ that even with this hack there is a small window when password is
+ completely visible with 'ps aux'. There are other methods that should
+ be used to automate mounting of SMB shares.
+ Closes: #112195: smbmount-2.2.x reveals password length.
+ * Applied patch from Steve Langasek <vorlon@debian.org> to prevent
+ forcing use of setresuid() in Sparc.
+ Closes: #112779: samba build forces use of setresuid, which causes
+ smbd to fail on Sparc.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 15 Oct 2001 10:26:10 -0400
+
+samba (2.2.1a-9) unstable; urgency=low
+
+ * Replaced $(LD) with $(CC) all the way through source/Makefile.
+ Closes: #111036: ld shouldn't be used to link shlibs.
+ * s/\/bin\/mail/\/usr\/bin\/mail/ in smb.conf's man page (HTML and
+ sgml as well.)
+ Closes: #110963: smb.conf: mail should be /usr/bin/mail.
+ * Documented better smbclient's -W behavior. Patch from Steve
+ Langasek.
+ Closes: #53672: smbclient: -W flag is interpreted as domain, not
+ workgroup.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 4 Sep 2001 23:10:41 -0400
+
+samba (2.2.1a-8) unstable; urgency=low
+
+ * Set some reasonable default perms for the samba logdir (again,
+ thanks to vorlon :-)
+ Closes: #72529: insecure permissions on log files.
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 26 Aug 2001 15:40:47 -0400
+
+samba (2.2.1a-7) unstable; urgency=low
+
+ * Another attempt at fixing #47493. Patch from Steve Langasek
+ <vorlon@netexpress.net>. Let's keep our fingers crossed Steve!
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 26 Aug 2001 13:37:06 -0400
+
+samba (2.2.1a-6) unstable; urgency=low
+
+ * Backed out fix to #47493 introduced in 2.2.1a-4 as it is causing
+ smbd to die with signal 11 under some unidentified situations.
+ Closes: #109774: Latest debian version breaks printer driver download.
+ Closes: #109946: not all files appear in samba-exported directories.
+ * Another patch from Steve Langasek. This one adds quotes around
+ printer names for print systems it's reasonable for Debian to
+ support. Together with the patch in #29957 (see changelog for
+ 2.2.1a-4), this should take care of the problems with multi-word
+ printer names in Samba.
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 24 Aug 2001 21:12:27 -0400
+
+samba (2.2.1a-5) unstable; urgency=low
+
+ * Important changes that affect how Samba is built on Debian
+ machines are implemented in this release. All of this changes
+ were suggested by the energetic Steve Langasek <vorlon@debian.org>,
+ and his arguments were so sound and reasonable that I decided
+ to implement them. Here's Steve's original changelog:
+
+ * Fix up the build system to avoid needing to run configure
+ as root to answer questions we already know the answers to.
+ * In the process, make surprising progress towards being able to
+ cross-compile the samba packages.
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 24 Aug 2001 01:08:06 -0400
+
+samba (2.2.1a-4) unstable; urgency=low
+
+ * Fixed typo in smbmount's mount page.
+ Closes: #109317: smbfs: mistype in smbmount manpage.
+ * Included symlink to smbspool to better support CUPS printing.
+ Closes: #109509: include symlink for cups samba support.
+ * Applied patch from Steve Langasek <vorlon@netexpress.net> to
+ fix bug #29957.
+ Closes: #29957: samba strips trailing " from strings in smb.conf.
+ * First attempt at fixing #47493. Another patch from Steve "I want
+ a bug-free Samba" Langasek.
+ Closes: #47493: Samba doesn't handle ':' in dir names right.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 21 Aug 2001 23:26:38 -0400
+
+samba (2.2.1a-3) unstable; urgency=low
+
+ * Steve Langasek <vorlon@netexpress.net> has been hard at work in
+ the last few days looking at the long list of open bugs filed
+ against the Samba packages. I don't know how to thank him. It's been
+ a pleasure working with Steve, and all the fixes, patches, etc. in
+ this release come from him. The bug list is greatly reduced thanks
+ to Steve's efforts.
+ * Steve's additions/modifications/patches/etc. are:
+ - New package that (libpam-smbpass) provides pam_smbpass. Before, this
+ was provided in another package but now the sources are part of
+ the Samba sources so we can start providing it from here.
+ Closes: #107043 - pam_smbpass now present in Samba source,
+ should be built from there
+ - Patch to source/smbd/service.c that allows admins to call
+ /bin/umount from the root postexec of a Samba share.
+ Closes: #40561 - samba pre/postexec commands do not work.
+ - Clear TMPDIR before starting smbd in /etc/init.d/samba.
+ Closes: #51295 - Problems with Samba and TMPDIR.
+ - Correction to documentation of "guest only".
+ Closes #38282 - "guest only" share still requires a password.
+ * Applied patch from Santiago Vila <sanvila@unex.es> to convert
+ /usr/sbin/mksmbpasswd from a shell script into a real awk script.
+ Sorry it took so long, Santiago; I hadn't realized you even
+ provided a patch :-)
+ Closes: #77891 - mksmbpasswd could be a real awk script.
+ * Updated description of the smbfs and smbclient packages. Also have
+ each package recommend the other.
+ Closes: #108650: Should suggest or recommend smbfs.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 13 Aug 2001 22:21:55 -0400
+
+samba (2.2.1a-2) unstable; urgency=low
+
+ * Build-depends: depend on debhelper (>=2.0.103).
+ Closes: #105795: Build-Depends are wrong.
+ * Run samba's preinst and postinst scripts without -e so failed commands
+ do not abort installation.
+ Closes: #106384: postinstall crashes abnormally. (And really closes
+ #104471.)
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 26 Jul 2001 00:30:37 -0400
+
+samba (2.2.1a-1) unstable; urgency=low
+
+ * New upstream version.
+ * Make sure samba's postinst script exits with a zero status.
+ Closes: #104471: Samba postinst problem.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 12 Jul 2001 21:55:21 -0400
+
+samba (2.2.1-1) unstable; urgency=low
+
+ * New upstream version.
+ Closes: #103339: config.guess and config.sub update required.
+ Closes: #98518: Samba 2.2 can't act as PDC for NT4/W2K due to
+ incompatibility with PAM.
+ Closes: #97447: nmbd crashes due to bugs in DAVE 2.5.2.
+ Closes: #95777: Samba 2.2 is unable to join or authenticate against
+ Samba 2.2 PDC domain.
+ Closes: #68842: samba should use PAM for password changing (I
+ haven't personally tried this one, but it's been
+ advertised this works.)
+ Closes: #102506: PAM account checking fails.
+ Closes: #102518: Complains about unknown paramter "obey pam
+ restrictions"
+ Closes: #94774: Build failure on PARISC machines.
+ * Moved away from /etc/cron.weekly/samba for log file rotation.
+ Now using logrotate.
+ Closes: #95548: typo in /etc/cron.weekly/samba.
+ Closes: #74951: nmbd does not rename its log file.
+ * Removed Debian-specific addtosmbpass.8 man page since this script
+ is not longer provided upstream. Users should use the smbpasswd
+ program instead.
+ * Updated sample /etc/samba/smb.conf to reflect the recent changes
+ affecting handling of PAM authentication. Also updated
+ /etc/pam.d/samba.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 11 Jul 2001 00:44:14 -0400
+
+samba (2.2.0.final.a-1) unstable; urgency=high
+
+ * New upstream version (contains security fix from DSA-065-1.)
+ Closes: #97241: samba 2.2.0 fails to process hostnames in
+ "hosts allow" config line.
+ * Removed Debian-specific addtosmbpass.8 man page since this script
+ is not longer provided upstream. Users should use the smbpasswd
+ program instead.
+ Closes: #98365: addtosmbpass is missing from 2.2.0.final-2.
+ * Updated sample /etc/samba/smb.conf to reflect the recent changes
+ affecting handling of PAM authentication. Also updated
+ /etc/pam.d/samba.
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 24 Jun 2001 11:11:59 -0400
+
+samba (2.2.0.final-2) unstable; urgency=low
+
+ * Added libcupsys2-dev to Build-Depends.
+ * Samba depends now (again) on netbase so update-inetd is always
+ available for the Samba maintainer scripts.
+ Closes: #86063: Fails to uninstall if inetd is not installed.
+ * Updated source/config.{sub,guess} so ARM built doesn't fail.
+ Closes: #94480: config.sub out of date; can't build on arm.
+ Closes: #85801: config.sub/guess out of date.
+ * Not using brace expansion, i.e. {foo,bar} in any of the maintainers
+ scripts nor in debian/rules.
+ Closes: #88007: samba postrm has is not POSIX sh compliant.
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 21 Apr 2001 17:27:18 -0400
+
+samba (2.2.0.final-1) unstable; urgency=low
+
+ * New upstream release. Lots of new things. See WHATSNEW.txt.
+ * Goofy version number because of my stupidity when assigning version
+ numbers to the CVS packages I have been uploading to experimental.
+ Will be fixed when 2.2.1 is released. I've no doubts a 2.2.1 release
+ will follow soon.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 17 Apr 2001 22:58:14 -0400
+
+samba (2.2.0.cvs20010416-1) experimental; urgency=low
+
+ * CVS update.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 16 Apr 2001 21:25:15 -0400
+
+samba (2.2.0.cvs20010410-1) experimental; urgency=low
+
+ * CVS update.
+ * Added libreadline4-dev to Build-Depends.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 10 Apr 2001 16:53:45 -0400
+
+samba (2.2.0.cvs20010407-1) experimental; urgency=low
+
+ * CVS update. Includes what is in 2.2.0alpha3.
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 7 Apr 2001 16:00:33 -0400
+
+samba (2.2.0.cvs20010316-1) experimental; urgency=low
+
+ * Started working on Samba 2.2.0. Using the SAMBA_2_2_0 branch
+ from Samba CVS.
+ * Not compiling rpctorture as it has compile errors. Change in
+ debian/rules.
+ * Removed Linux kernel 2.0.x and smbfs compatibility baggage. Now
+ the smbfs does not support 2.0.x kernels; a kernel > 2.2.x is
+ needed to use smbfs. Updated debian/control, debian/rules and
+ README.Debian to reflect this change.
+ * Added to swat a versioned dependency on samba (so a user is forced to
+ install a new version of swat each time a new version of samba is
+ installed.)
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 18 Mar 2001 14:21:14 -0500
+
+samba (2.0.7-5) unstable; urgency=medium
+
+ * Transition from suidmanager to dpkg-statoverride.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 18 Jan 2001 23:51:56 -0500
+
+samba (2.0.7-4) unstable; urgency=medium
+
+ * Applied Urban Widmark <urban@teststation.com> fixes to smbmount. Urban
+ is the maintainer of the smbfs in the kernel and of the userland
+ utilities.
+ * Links to HTML documents are correct now.
+ Closes: #69439: swat: Broken help file symlinks
+ Closes: #72615: samba-doc directory changed: removed htmldocs from path
+ Closes: #75847: swat: Wrong symlink
+ Closes: #66857: Wrong links to html documents.
+ Closes: #77912: misplaced documentation symlinks for swat
+ * Building Samba with CUPS support. For this I reverted the change to
+ source/configure.in that I did in 2.0.7-3 and re-ran autoconf.
+ Closes: #59038: samba: not compiled with cups support.
+ * Fix against previous known/unknown user time difference patch to swat
+ (make username / password lookups take the same time.) Remove CGI
+ logging code in Swat.
+ Closes: #76341 - Security holes in swat
+ * Updated Build-depends.
+ * Updated debian/copyright to refer to the correct location of the GPL.
+ * debian/rules: changed DESTDIR to `pwd`/debian/samba (was
+ `pwd`/debian/tmp.)
+ * debian/rules: added '--sourcedir=debian/samba' to dh_movefiles (for some
+ strange reason dh_installdirs is not creating debian/tmp/ so I needed
+ to tweak everything to install stuff in debian/samba rather than in
+ debian/tmp.)
+ * debian/control: changed section of samba-docs to 'doc' (was 'docs')
+ * Using relative symlinks in /usr/share/samba/swat/ (changed debian/rules
+ and source/scripts/installswat.sh.)
+ * Fixed (by tweaking debian/rules)
+ /usr/bin/{smbmnt,smbumount-2.*,smbmount-2.*} to be suid.
+ * Added "Provides: samba-client" to smbclient's section in control.
+ Closes: #71143: smbclient: Smbclient should provide samba-client.
+ * Fix for desired_access being zero in map_share_mode() (patch to
+ source/smbd/nttrans.c.) Thanks to Gary Wilson
+ <wilsong@sergievsky.cpmc.columbia.edu> for bringing this patch to my
+ attention.
+ * Hacked source/lib/util_sec.c so smbd works fine in both 2.0.x and
+ 2.2.x kernels even when the build is done in a system running
+ a 2.2.x kernel.
+ Closes: #78858: samba-common: samba2.0.7 needs kernel 2.2.x but
+ doesnt depend on it.
+ Closes: #72758: README.Debian should comment on 2.0.x kernels.
+ Closes: #56935: Samba 2.0.6 and Kernel 2.0.x.
+ Closes: #58126: Samba 2.0.6 and Kernel 2.0.x -- more info.
+ Closes: #60580: samba: failed to set gid.
+ Closes: #64280: Samba panics, can't set gid.
+ Closes: #66816: Must deal with brokenness under 2.0.x.
+ Closes: #67682: potatoe samba 2.0.7-3 out of order, 2.0.5a-1 OK.
+ Closes: #69735: PANIC: failed to set gid
+ Closes: #66122: "smbclient -L localhost -U%" returns with "tree
+ connect failed: code 0".
+ Closes: #57637: Samba says tree connect error.
+ Closes: #58015: potato samba wins support is broken.
+ * Fixed comments in sample smb.conf to point to the correct location.
+ Closes: #69578: comments in smb.conf points to wrong path.
+ * Move codepages from /etc/samba/codepages/ to
+ /usr/share/samba/codepages/.
+ Closes: #63813: samba; codepages should go in /usr/lib.
+ * Moved /var/samba/ to /var/state/samba/.
+ Closes: #49011: samba package not FHS compliant.
+ * Hacked source/configure.in (and re-ran autoconf) so yp_get_default_domain()
+ is found.
+ Closes: #44558: netgroup support missing in samba 2.0.5a-1.
+ * /etc/init.d/samba was calling start-stop-daemon with both --pidfile and
+ --exec. Got rid of --exec so --pidfile works.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 11 Jan 2001 00:15:57 -0500
+
+samba (2.0.7-3) frozen unstable; urgency=high
+
+ * Release manager: this closes a RC bug.
+ * Commented out the section in source/configure.in that auto-detects
+ CUPS support and then ran autoconf to generate a new configure
+ script. This was done to prevent machines that have libcupsys-dev
+ installed from detecting CUPS support and adding an unwanted
+ dependency on libcupsys. This way the whole printing system
+ won't break on upgrades. CUPS support should be added after
+ Potato is released.
+ Closes: #65185: samba-common: Upgrading removes printing system.
+ Closes: #64496: smbfs: smbfs on powerpc has a dependency on cupsys.
+ * Updated README.debian.
+ Closes: #64594: Old README.Debian in /usr/share/doc/samba.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 20 Jun 2000 19:16:04 -0400
+
+samba (2.0.7-2) frozen unstable; urgency=high
+
+ * Release manager: this closes RC bug #63839 that prevents Samba
+ to be built from source.
+ * Fixed a stupid typo in debian/rules that was preventing Samba
+ to be built from source.
+ Closes: #63839: samba_2.0.7-1(frozen): build error (SAMBABOOK dir)
+ * I forgot to mention that O'Reilly's book "Using Samba" was donated
+ to the Open Source community. The book was included in Samba 2.0.7
+ in HTML format and is part of the Debian Samba package since
+ Samba 2.0.7-1.
+ * In Samba 2.0.7-1, the "Using Samba" book and a number of HTML help
+ files were supposed to be provided in both the swat and the samba-doc
+ packages. This duplication was a waste of space. Starting with
+ Samba 2.0.7-2, swat recommends samba-doc and the book and the HTML
+ files are included only in samba-doc, and are accessed via symlinks
+ from within swat.
+ Closes: #58810: superfluous files in swat?
+ * Added a 'echo "."' to /etc/init.d/samba in the reload) section.
+ Closes: #63394: "echo ." missing in reload section of init.d script
+ * Fixed typo in docs/htmldocs/using_samba/ch06_05.html.
+ Closes: #64344: typo "encrypted passwords"
+ * Cleaned up samba's postrm script so important common files aren't
+ deleted when samba is purged. Created a samba-common.postrm script.
+ Closes: #62675: purging samba removes /etc/samba/smb.conf.
+ Closes: #63386: samba --purge removes /etc/samba dir even though
+ smbclient/smbfs/samba-common packages are still installed
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 3 May 2000 02:42:07 -0400
+
+samba (2.0.7-1) frozen unstable; urgency=low
+
+ * New upstream version. Dear Release Manager: please allow this
+ package to go to frozen as it contains fixes to a _lot_ of problems.
+ You can take a look at all the problems fixed by this release in
+ the official upstream announcement at
+ http://us1.samba.org/samba/whatsnew/samba-2.0.7.html.
+ * Added --with-utmp to add utmp support to smbd (this is new in Samba
+ 2.0.7)
+ * Closes: #62148 - samba not rotating filled logs.
+ * Closes: #56711: Samba doesn't manage well long share name (please note
+ that it's possible to connect to shares with names longer than
+ 14 characters but the share will be listed with a name truncated to
+ 13 characters.)
+ * Closes: #51752 - NT DOMAIN - NET USE * /HOME not mapping (error 67).
+ Closes: #50907 - logon path not working.
+ This is not a bug, it's just Samba doing the same thing an NT server
+ does. See WHATSNEW.txt and smb.conf's man page for details.
+ * Closes: #48497 - error executing smbsh in debian-potato. (smbwrapper
+ is not supported anymore.)
+ * Closes: #58994 swat: typo in swat description.
+ * Closes: #45931 - Samba dies with SIGILL on startup. (Hardware
+ problems, person that reported the bug never came back.)
+ Closes: #54398 - smbadduser fails, looks for ypcat.
+ * Fixed swat's man page to include Debian specific installation
+ instructions. There's not necessary to edit /etc/services or
+ /etc/inetd.conf.
+ (Closes: #58616 - incomplete install config && incorrect installation
+ instructions.)
+ * s/SBINDIR/\"/usr/sbin\"/g in source/web/startstop.c to prevent swat
+ to look for smbd and nmbd in the wrong place when requested to start or
+ stop smbd or nmbd.
+ (Closes: #55028 - swat can't start samba servers.)
+ * Closes: #37274: smbclient does not honour pot. (Tested and seems to be
+ working now.)
+ * Not confirmed, but should fix #56699, #62185, #56247, #52218, #43492,
+ #50479, #39818, #54383, #59411.
+ (please re-open any of this if the problem still exists - I was unable
+ to confirm any of this because I could never reproduce them.)
+ Closes: #56699 - Samba's nmbd causes random kernel oops several
+ times in a row.
+ Closes: #62185 - nmbd's forking until no more file descriptors are
+ available.
+ Closes: #56247 - session setup failed: ERRSRV - ERRbadpw.
+ Closes: #52218 - Either wins proxy does not work, or I don't understand
+ it.
+ Closes: #43492 - intermittent problem changing password.
+ Closes: #50479 - Can't access windows 2000 shares with samba.
+ Closes: #39818 - samba-common: Upgrading Samba from the Slink version.
+ Closes: #54383 - samba-common: Missing /etc/smb.conf.
+ Closes: #59411 - smbclient: cannot browse Win2k shares.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 27 Apr 2000 16:07:45 -0400
+
+samba (2.0.6-5) frozen unstable; urgency=low
+
+ * Oppsss! samba-common doesn't depend on libcupsys1 so the binaries
+ in this package are broken unless libcupsys1 is installed.
+ samba-common has a "grave" bug because of this. Instead of adding
+ libcupsys1 to the Depends: list of each package in debian/control
+ I investigated why dh_shlibs was not picking the dependency
+ automatically. It turns out that it's probably a bug in libcupsys1
+ because the format of its shlibs file is not correct. I fixed that
+ file (/var/lib/dpkg/info/libcupsys1.shlibs) and now dependencies are
+ picked correctly. I'll talk to the libcupsys1 maintainer.
+
+ I think the addition of CUPS support to Samba is a big change that
+ should not go into Frozen. So, I decided to back up the addition
+ of CUPS support I did in 2.0.6-4 to minimize problems. I'll add
+ CUPS support again when I start working on Samba for Woody.
+ (Closes: #59337 - samba-common has a missing dependency)
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 1 Mar 2000 08:40:02 -0500
+
+samba (2.0.6-4) frozen unstable; urgency=low
+
+ * It seems that sometimes nmbd or smbd are not killed when upgrading.
+ I think it is because in samba's prerm script I was calling
+ start-stop-daemon with the --pidfile switch and in old versions of
+ Samba the nmbd and smbd daemons did not store their PIDs in a file in
+ /var/samba/. I changed debian/samba.prerm so the existence of the
+ PID files is checked before calling "start-stop-daemon --pidfile ..."
+ If the PID files do not exist then start-stop-daemon is called
+ without the --pidfile parameter.
+ (Closes: #58058 - upgrade from slink went badly)
+ * Fixed typo in description of swat package in debian/control.
+ * Installed libcupsys1-dev so the configure script picks up CUPS
+ and Samba is compiled with CUPS support. Also added libcupsys1 to
+ the Depends: list of package samba in debian/control.
+ (Closes: #59038 - samba not compiled with cups support)
+ * Added a small paragraph to debian/README.debian warning about possible
+ problems with the WINS code in Samba 2.0.6.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 28 Feb 2000 14:00:42 -0500
+
+samba (2.0.6-3) frozen unstable; urgency=low
+
+ * Applied patch posted by Jeremy Allison to the samba mailing list
+ that should take care of the internal errors reported in bug #52698
+ (release-critical). Wichert: please test as I never could reproduce
+ it here.
+ (Closes: #52698 - samba gets interbal errors)
+ * Moved samba-docs to the 'docs' section.
+ (Closes: #51077 - samba-doc: wrong section)
+ * Added reload capability to /etc/init.d/samba (only for smbd because
+ nmbd does not support reloading after receiving a signal).
+ (Closes: #50954 - patch to add reload support to /etc/init.d/samba)
+ * Corrected "passwd chat" parameter in sample /etc/samba/smb.conf so
+ Unix password syncronization works with the passwd program currently
+ in Potato. Thanks to Augustin Luton <aluton@hybrigenics.fr> for
+ the correct chat script.
+ * Stole source/lib/util_sec.c from the CVS tree of what will become
+ Samba 2.0.7 or whatever so we can use the same binaries under
+ both 2.0.x and 2.2.x kernels.
+ (Closes: #51331 - PANIC: failed to set gid)
+ * smbadduser is now provided as an example and it's customized for Debian.
+ I am not providing this script in /usr/sbin/ because then I would need
+ a dependency on csh, something that I don't want to do.
+ (Closes: #51697, #54052)
+ * Fixed the short description of the smbfs package in debian/control.
+ (Closes: 53534 - one-line description out of date).
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 23 Nov 1999 16:32:12 -0500
+
+samba (2.0.6-2) unstable; urgency=low
+
+ * samba-common now depends on libpam-modules (not on libpam-pwdb, which
+ I have been told is obsolete). I modified /etc/pam.d/samba accordingly
+ to reflect the change.
+ (Closes: Bug#50722: pam pwdb dependence?).
+ * The old /etc/pam.d/samba file which had references to pam_pwdb caused
+ smbd to die with a signal 11. The new /etc/pam.d/samba file fixes
+ this problem.
+ (Closes: #50876, #50838, #50698)
+ * Compiled with syslog support (use at your own risk: syslog support
+ is still experimental in Samba). I added the parameters "syslog = 0"
+ and "syslog only = no" to the sample smb.conf to avoid pestering
+ users that do not want Samba to log through syslog.
+ (Closes: Bug#50703 - syslog only option doesn't work)
+ * Removed the stupid code in the smbmount wrapper script that tries
+ to load the smbfs module if smbfs is not listed in /proc/filesystems.
+ (Closes: Bug#50759 - Non-root can't run smbmount if SMBFS is compiled
+ as a module in the kernel)
+ * Added /bin/mount.smb as a symlink pointing to /usr/bin/smbmount so
+ 'mount -t smb ...' works just as 'mount -t smbfs ...'.
+ (Closes: Bug#50763 - 'mount -t smb' doesn't work)
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 20 Nov 1999 18:53:35 -0500
+
+samba (2.0.6-1) unstable; urgency=low
+
+ * Samba 2.0.6 has been released. This is the first try of the Debian
+ Samba packages. I know for sure that smbd won't work properly on
+ 2.0.x kernels because the patch that Wichert sent me does not apply
+ to the new source/lib/util_sec.c in Samba 2.0.6. That file was
+ completely re-written by Tridge.
+ * Updated README.Debian.
+ * A new client utility called smbspool appeared in Samba 2.0.6. I added
+ this utility to the smbclient package, although I haven't tried it yet.
+ * Added the symlink /sbin/mount.smbfs that points to /usr/bin/smbmount.
+ This is to be able to type "mouont -t smbfs ...". This symlink goes
+ in the smbfs package, of course.
+ * This new release should close the following bugs (some of these
+ are fixed for sure in this new upstream release, some others I could
+ not reproduce but I believe they are fixed if they were real bugs.
+ As always, please feel free to re-open the bugs if the problem is not
+ solved).
+ Closes: Bug#33240: icmp mask needs a bug workaround.
+ Closes: Bug#37692: samba: Has problems detecting interfaces.
+ Closes: Bug#38988: samba: Truly bizzare behavour from nmbd.
+ Closes: Bug#46432: samba-2.0.5a-2: nmbd does not appear to broadcast
+ properly.
+ Closes: Bug#44131: smbfs: no longer possible to set file and
+ directory-modes.
+ Closes: Bug#46992: smbmount-2.2.x manpage wrong.
+ Closes: Bug#42335: smbfs: missing options from the new 2.2.x commandline.
+ Closes: Bug#46605: smbmnt segfaults.
+ Closes: Bug#48186: smbmount.
+ Closes: Bug#38040: smbfs: Please add /sbin/mount.smb [included].
+ Closes: Bug#47332: smbmount: could -f and -P be added back?
+ * Samba has been compiled with PAM support (closes: Bug#39512 - samba PAM
+ module). To succesfully add PAM support, I created /etc/pam.d/samba and
+ added this file as a conffile for the samba-common package. I also made
+ samba-common depend on libpam-pwdb.
+ * Added simple man pages for the wrapper scripts smbmount and smbmount.
+ (Closes: Bug#44705 - Missing smbmount man page)
+ * Installed libreadlineg2-dev in my system so smbclient now has a
+ "history" command and libreadline support :-)
+ * This time I did add a check to the smbmount wrapper script to see if
+ the kernel has support for smbfs, as suggested by Jeroen Schaap
+ <J.Schaap@physiology.medfac.leidenuniv.nl>. I mentioned in the changelog
+ for samba-2.0.5a-3 that I did this but I forgot at the end.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 11 Nov 1999 12:08:15 -0500
+
+samba (2.0.5a-5) unstable; urgency=low
+
+ * I am sorry to report that the smbwrapper package is gone for the
+ moment. The reason for this is twofold: first of all, smbwrapper
+ is completely broken in Samba-2.0.5a (it compiles but it doesn't
+ run) and in the upcoming Samba-2.0.6 it doesn't even compile. Second,
+ when I asked Andrew Tridgell (father of Samba) about the state of
+ smbwrapper he told me that Ulrich Drepper (head of the glibc project)
+ broke on purpose the glibc stuff in which smbwrapper is based.
+ Consequently, Tridge recommended me to compile Samba without
+ support for smbwrapper. When, I have no idea. Sorry folks. Here is
+ the original message I received from Andrew:
+
+ > 1) 2.0.5a's smbwrapper doesn't work under glibc2.1, and pre-2.0.6's
+ > smbwrapper doesn't even compile under glibc2.1.
+
+ yep, Ulrich deliberately broke it. It won't get fixed till glibc
+ allows the sorts of games it plays to work again. I suggest you turn
+ it off in your build scripts until that gets sorted out.
+
+ * Swat's file are now in /usr/share/samba/ instead of
+ /usr/lib/samba/ (bug #49011).
+ * Man pages now in /usr/share/man/ instead of /usr/man/ (bug #49011).
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 2 Nov 1999 12:59:13 -0500
+
+samba (2.0.5a-4) unstable; urgency=low
+
+ * Applied patch from our fearless leader (Wichert) to fix the darn bug
+ that prevents Samba to work on 2.0.x kernels if it was compiled
+ in a system running a 2.2.x kernel. This closes #40645 (build uses
+ setresuid which doesn't work under 2.0.34 (does apparently under
+ 2.2.x) ).
+ * Fixed the entry that swat's postinst script adds to /etc/inetd.conf
+ so it is '#<off># swat\t\tstream\ttcp\tnowait.400 ...' instead of
+ '#<off>#swat\t\tstream\ttcp\tnowait.400 ...'. The old way caused
+ 'update-inetd --enable swat' to leave the entry for swat disabled.
+ Thanks to Dave Burchell <burchell@inetnebr.com> for finding out
+ this problem. This closes #48762 (swat uses non-standard syntax to
+ comment out inetd.conf entry).
+ * /usr/sbin/swat does not think anymore that the smbd daemon lives
+ in /usr/local/samba/bin/. To fix this I am running now source/configure
+ with "--prefix=/usr --exec-prefix=/usr". This closes #47716 (samba
+ 'swat' fails: incorrect hardwired path in the binary).
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 31 Oct 1999 03:42:38 -0500
+
+samba (2.0.5a-3) unstable; urgency=low
+
+ * I am pretty darn busy with my MBA, I apologize for the long time it's
+ taking to squash bugs in the Samba packages.
+ * Built with debhelper v2 for FHS compliancy. Changed a couple of
+ things in debian/rules to accomodate for the new place for the docs.
+ I also had to change debian/{samba.postinst,samba.prerm,swat.postinst}
+ to make sure that the symlink from /usr/doc/xxx exists and points to
+ /usr/share/doc/xxx (the reason for this is that I am not letting
+ debhelper to create these scripts for me automatically).
+ * Built with latest libc6.
+ * smbfs: finally, the nasty bug that causes smbmount to die after
+ a while is gone thanks to Ben Tilly <Ben_Tilly@trepp.com>.
+ The problem was just a typo in source/client/smbmount.c.
+ This closes grave bug #42764 (smbmount dies) and #43341
+ (smbfs-2.2.x won't function after a while).
+ * Fixed the smbmount wrapper script to eliminate a bashism (closes
+ #45202 - "wrapper scripts use $* instead of "$@") and to recognize
+ 2.3.x and 2.4.x kernels (closes #47688 - "smbfs: does not recognize
+ kernel 2.3.x").
+ * Added a check to the smbmount wrapper script to see if the
+ kernel has support for smbfs, as suggested by Jeroen Schaap
+ <J.Schaap@physiology.medfac.leidenuniv.nl>.
+ * swat's man page is now part of the swat package, not of the samba
+ package. This closes #44808 (Samba has a man page for swat, but
+ the binary is not included).
+ * The interface program smbrun is not longer needed by smbd because
+ of the availability of execl() under Linux. Because of this, the
+ smbrun is not even being compiled. Since there is no need for smbrun
+ now, the smbrun man page was taken out of the samba package. This
+ closes #45266 (/usr/bin/smbrun missing).
+ * smbpasswd is now part of the samba-common package, and not part of
+ the samba package. This is to let administrators that do not want
+ to install a full Samba server administer passwords in remote
+ machines. This closes bug #42624 (smbpasswd should be included in
+ smbclient). This bug report also suggests that swat becomes part of
+ the samba package, that smbfs becomes part of the smbclient package,
+ and that the binary smbpasswd becomes part of the smbclient package.
+ I moved smbpasswd to the samba-common package but I am reluctant to
+ do the other things the bug report suggests.
+ * In order to keep dpkg happy when moving smbpasswd from the samba
+ package to samba-common, I had to add a "Replaces: samba (<= 2.0.5a-2)"
+ in the control section of the samba-common package and a
+ "Replaces: samba-common (<= 2.0.5a-2)" in the control section of the
+ samba package (in debian.control).
+ * Samba is now being compiled with the "--with-netatalk" option. This
+ closes #47480 (Could samba be compiled with the --with-netatalk option).
+ * All packages that depend on samba-common have a versioned dependency
+ now. This was accomplished by adding "(= ${Source-Version})" to the
+ relevant sections of debian/control. Thanks t Antti-Juhani Kaijanaho
+ <gaia@iki.fi> for the hint. This closes #42985 (samba should probably
+ have a versioned depends on samba-common).
+ * Made sure the file docs/textdocs/DIAGNOSIS.txt gets installed in all
+ the Samba packages. This closes bug #42049 (no DIAGNOSTICS.txt file).
+ * Added the smbadduser helper script to the samba package. This closes
+ #44480 (Samba doesn't come with the smbadduser program).
+ * Applied patch from szasz@triton.sch.bme.hu that prevents smbmount
+ to leave an entry in /etc/mtab for a share that could not be mounted
+ because of invalid user of password. The patch also allows smbumount
+ to unmount the share in the event that something goes wrong with the
+ smbmount process. This closes bug #48613 (Mount/umount problems +
+ patch) as well as #44130 (failed mount is still mounted).
+ * smbmount-2.2.x is now setuid root. This is needed for the patch
+ applied above to be effective. If smbmount-2.2.x is not setuid root
+ then an entry will be left in /etc/mtab even when the mount
+ fails. I had to add "usr/bin/smbmount-2.2.x" to debian/smbfs.suid
+ for this to work.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 27 Oct 1999 10:36:13 -0400
+
+samba (2.0.5a-2) unstable; urgency=low
+
+ * This version is basically the same as 2.0.5a-1 but it was compiled
+ on a Potato system with glibc2.1. See below the change log for 2.0.5a-1
+ for more information.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 27 Jul 1999 02:25:29 -0400
+
+samba (2.0.5a-1) stable; urgency=high
+
+ * I'm back from the Honey Moon. We are pretty busy because we are moving
+ to Pittsburgh (from Caracas, Venezuela) in aprox. 24 hours and we still
+ have plenty of things to pack and to do. Samba 2.0.5 was released
+ while I was in the Honey Moon and it is just now (almost 3 AM) when
+ I have time to package it.
+ * Because of the security problems fixed in 2.0.5, this upload goes
+ to both stable and unstable (the Security Team asked for this).
+ * This release (2.0.5a-1) was compiled on a Slink system. 2.0.5a-2 will
+ be compiled on a Potato system.
+ * Added a "Replaces: samba (<= 1.9.18p10-7)" to the samba-common
+ section in debian/control (as suggested by Steve Haslam
+ <araqnid@debian.org>) to fix the problems that appear when upgrading
+ from the Samba package in Slink. Please test this as I am completely
+ unable to do so. This should fix bug #39818 (Upgrading Samba from the
+ Slink version).
+ * Removed the hacks to the autoconf stuff that I added to 2.0.4b-2 in
+ order to have defined several socket options when compiling with
+ Linux 2.2.x kernel headers - the fix is now upstream.
+ * Finally!!! smbmount was re-written (thanks Tridge :-) to use a command
+ line syntax similar to the one used by the old smbmount (for 2.0.x
+ kernels). This means that the wrapper script is no longer necessary
+ so I removed it. In its place there is a simple wrapper script that
+ calls smbmount-2.0.x or smbmount-2.2.x depending on the kernel that is
+ running.
+ * Because of the wedding, the Honey Moon, and our move to Pittsburgh,
+ I can't work on fixing other bugs in this release.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 27 Jul 1999 02:18:51 -0400
+
+samba (2.0.4b-3) unstable; urgency=low
+
+ * Stupid mistake: I forgot to add /usr/bin/smbumount to debian/smbfs.files
+ and because of this /usr/bin/smbumount was part of the samba package
+ instead of part of the smbfs package.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 1 Jul 1999 01:51:24 -0400
+
+samba (2.0.4b-2) unstable; urgency=low
+
+ * Dark (and archive maintainers): please remove from Potato the smbfsx
+ binary package and also the old source package for smbfs. smbfs and
+ smbfsx have been merged starting with this version.
+ * Merged the old smbfs package with Samba. Now there is only one package
+ for the smbfs utilities and is called "smbfs". The package smbfsx
+ does not exist any more and this new smbfs package must be used
+ for both 2.0.x and > 2.1.x kernels.
+ * A wrapper script was added to handle the syntax change in smbmount
+ in the new smbfs utilities (required for kernels > 2.1.70). The
+ home page for this script is http://www.wittsend.com/mhw/smbmount.html.
+ Please _note_ that this will change (for good) in Samba 2.0.5 :-)
+ * Added debian/smbumount.sh. It's another wrapper that calls smbumount-2.2.x
+ or smbumount-2.0.x depending on the kernel currently running.
+ * Not using -t for savelog in cron.weekly script.
+ * Recompiled without libreadlineg-dev (Samba does not seem to be using
+ it so unnecessary dependencies are produced).
+ * glibc2.1 build.
+ * Removed smbpasswd.8 man page from the debian/ directory because it is
+ now being provided upstream.
+ * Got rid of the ugly hack I put in source/lib/util_sock.c to have
+ IPTOS_LOWDELAY and IPTOS_THROUGHPUT defined. Now I patched the
+ autoconf stuff to #include <netinet/ip.h>. I've sent the patch to
+ Jeremy Allison so we have this upstream.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 28 Jun 1999 17:47:19 -0400
+
+samba (2.0.4b-1) unstable; urgency=low
+
+ * New upstream release. This release fixes the following Debian bugs:
+ #33838 (Amanda/ Samba 2.0.2 and backing up large filesystems) and
+ #33867 (Amanda 2.4.1 and Samba 2.0.2 and large filesystems). Jeremy
+ Allison released Samba 2.0.4 and found out that there were a couple
+ of minor bugs so he released 2.0.4a. Then he found out about more
+ serious bugs and released 2.0.4b. I have built this package several
+ times between yesterday and today because of this. Now I am releasing
+ the Debian packages for Samba with what I believe will be the latest
+ release the Samba Team will make at least in the next 4 days (Jeremy
+ is taking a short vacation).
+ * Still compiling against glibc2.0 (sorry about that :-)
+ * Hacked source/smbwrapper/smbsh.c to fix the problem
+ of smbsh not finding the shared library smbwrapper.so. It looks
+ now in /usr/lib/samba/ for this file. This fixes #32971, #32989,
+ #33278, #34911 and #36317.
+ * Made smbfsx depend on samba-common because smbfsx uses /etc/samba/smb.conf
+ and /etc/samba/codepages/. This fixes #33128 (smbmount complains about
+ missing /etc/smb.conf).
+ * Package swat does not depend on httpd anymore (there's no need to).
+ This fixes #35795 (swat requires httpd).
+ * Renamed smbmount-2.1.x and smbumount-2.1.x to smbmount-2.2.x and
+ smbumount-2.2.x. Same applies to the man pages.
+ * Changed minor type in smbmount's man page (changed "\"" by "\'"). This
+ fixes #34070 (wrong quotes in manpage).
+ * Used Fabrizio Polacco's <fpolacco@icenet.fi> procedure to create the
+ Debian package for Samba. This closes #35781 (samba has no pristine
+ source).
+ * Changes to /etc/cron.weely/samba: rotate /var/log/{nmb,smb}.old only
+ if the size of either is different than 0. Also, added comments at the
+ beginning of this script to explain how rotation of log files works in
+ Samba. Thanks to ujr@physik.phy.tu-dresden.de (Ulf Jaenicke-Roessler)
+ for the suggestions. This closes #37490 (cron.weekly script rotates not
+ used [sn]mb.old files). As I side effect, this should also close
+ #31462 (still trouble with /etc/cron.weekly/samba).
+ * Check for old /etc/pam.d/samba file which is not provided by this version
+ of the Debian Samba package but was provided in older versions. If this
+ file exists we delete it. We check for this in the postinst. This closes
+ #37356 (samba put stuff in pam.d that pam complains about) and #34312
+ (libpam0g: questions during upgrade).
+ * Make sure the mode of /etc/samba/smbpasswd is set to 600. This is done
+ in the postinst script. This closes #35730 (Security problem with
+ /etc/samba/smbpasswd when upgrading from samba 1.9.18p8-2 to 2.0.3-1).
+ * I have just checked and it looks like #28748 (smbfsx doesn't "return ")
+ has been fixed. This might have been fixed since a long time ago.
+ * Long long standing bug #18488 (smbclient: internal tar is broken) is
+ closed in this release of Samba. The bug might have been closed for a
+ long long time, but I did not check for this before.
+ * Temporary fix to the annoying "Unknown socket option IPTOS_LOWDELAY"
+ message. This fixes #33698 (socket option IPTOS_LOWDELAY no longer works),
+ #34148 (warnings from smbd) and #35333 (samba warnings).
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 20 May 1999 00:35:57 -0400
+
+samba (2.0.3-1) unstable; urgency=low
+
+ * New upstream version.
+ * Removed the convert_smbpasswd.pl program I created and put in
+ /usr/doc/samba/ because there's a convert_smbpasswd script in the
+ upstream sources that does the same thing. I modified the postinst
+ script to use this script instead of the one I created.
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 28 Feb 1999 01:35:37 -0400
+
+samba (2.0.2-2) unstable; urgency=low
+
+ * Updated the README.Debian file.
+ * Updated the description of the samba package in the control file.
+ * The binaries smbmnt and smbumount-2.1.x in the smbfsx package are now
+ installed setuid root as they should be. This was done by doing a
+ a "chmod u+s" for each binary in debian/rules and by creating the
+ file debian/smbfsx.suid.
+ * Minor patch to source/client/smbumount.c to allow normal users
+ to umount what they have mounted (problem was a kernel vs. libc6
+ size mismatch). I sent the patch upstream.
+ * Created debian/smbwrapper.dirs so the directory /usr/lib/samba/ is
+ created.
+ * Modified debian/rules to move smbwrapper.so from debian/tmp/usr/bin/ to
+ debian/smbwrapper/usr/lib/samba/.
+ * Hacked source/smbwrapper/smbsh.c to fix the problem
+ of smbsh not finding the shared library smbwrapper.so.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 11 Feb 1999 18:11:34 -0400
+
+samba (2.0.2-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 11 Feb 1999 01:35:51 -0400
+
+samba (2.0.1-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 6 Feb 1999 06:51:18 -0400
+
+samba (2.0.0final-4) unstable; urgency=low
+
+ * The samba postinst made an unwarranted assumption that the file
+ /etc/samba/smbpasswd exists. If the file did not exist (which is
+ perfectly valid) the postinst will fail. This fixes #32953.
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 5 Feb 1999 23:32:46 -0400
+
+samba (2.0.0final-3) unstable; urgency=low
+
+ * Added to debian/control a "Depends: ${shlibs:Depends}" line for the
+ samba-common package so dependencies for this package are set
+ correctly (thanks to Dark for pointing this out).
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 4 Feb 1999 09:45:21 -0400
+
+samba (2.0.0final-2) unstable; urgency=low
+
+ * Finally!!! The first upload to unstable. Sorry for the delay folks
+ but I have been quite busy lately :-) Another reason for the delay
+ is that I wanted to ease the migration from Samba 1.9.18p10 and
+ before to Samba 2.0.0. I changed the location of the config. files
+ from /etc/ to /etc/samba/ and this made things a little bit harder.
+ * This package needs 2.2 kernel headers to compile (well, this is
+ true for the smbfsx package, all others compile fine with 2.0 kernel
+ headers).
+ * Created a preinst script for the samba package to take care of the
+ location migration of smb.conf (from /etc/ to /etc/samba/). The
+ preinst script also takes care of moving /etc/smbpasswd to its new
+ location (/etc/samba/).
+ * Created postinst and postrm scripts to add/remove an entry for swat
+ in /etc/inetd.conf.
+ * I had forgotten to install the sambaconfig script so I changed
+ debian/rules to install this script.
+ * Added a postrm script for the samba package (I had forgotten to add
+ this script to the new Samba packages after the migration from 1.9.18
+ to 2.0.0).
+ * Created a small Perl script that is called from the samba postinst
+ to convert the smbpasswd from the old format used in version prior
+ to 2.0.0 to the new one used in 2.0.0 and beyond.
+ * The upgrade process should be automatically now. Please let me know
+ of any problems you encounter.
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 23 Jan 1999 09:34:10 -0400
+
+samba (2.0.0final-1) experimental; urgency=low
+
+ * Finally!!! Samba 2.0.0 is here! I am not uploading to unstable
+ because I still have to work out the migration from the old
+ samba packages to the new ones. I also need to work more on the
+ new swat package.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 14 Jan 1999 22:40:02 -0400
+
+samba (2.0.0beta5-1) experimental; urgency=low
+
+ * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 5 Jan 1999 00:37:57 -0400
+
+samba (2.0.0beta4-1) experimental; urgency=low
+
+ * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 23 Dec 1998 18:37:45 -0400
+
+samba (2.0.0beta3-1) experimental; urgency=low
+
+ * New upstream version.
+ * I have just realized that the documentation patches (for man pages)
+ that I used for the 1.9.18 release are not longer necessary because
+ there was a major re-write of all the Samba documentation that added
+ the missing bits of information. So, I have just removed these minor
+ patches.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 8 Dec 1998 12:00:30 -0400
+
+samba (2.0.0beta2-1) experimental; urgency=low
+
+ * New upstream version.
+ * This new version fixes the potential security problem that
+ was posted to debian-private (using the "message command" parameter
+ to execute arbitrary commands from messages sent from LinPopUp).
+ * Changed /etc/init.d/samba to use one of the variables stored in
+ /etc/samba/debian_config to know how Samba is being run (from inetd or
+ as daemons) instead of grepping /etc/inetd.conf which may not exist
+ if the user is running xinetd (this fixes bug #29687 - assumes using
+ vanilla inetd)
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 23 Nov 1998 23:32:03 -0400
+
+samba (2.0.0beta1-1) experimental; urgency=low
+
+ * First beta release of the samba-2.0.0 code. Before the beta I was
+ working with sources downloaded directly from the CVS server. This
+ package goes into experimental and I plan to release the new
+ samba to unstable as soon as it gets out of beta.
+ * Created several packages out of the Samba sources. They are:
+ samba (nmbd and smbd daemons + related programs), smbclient (FTP
+ like command line utility to retrieve files from SMB servers),
+ swat (Samba Web Administration Tool), samba-common (common files
+ used by samba, smbclient and swat), smbfsx (smbfs utilities for
+ kernels >= 2.1.70), smbwrapper and samba-doc (Samba documentation).
+ * Refreshed debian/samba-doc.docs so recently added docs. are
+ installed in the samba-doc package. New additions include man
+ pages in the /usr/doc/samba-doc/htmldocs/ directory.
+ * Deleted Debian specific nmblookup(1) man page as it is now upstream.
+ * Added smbtorture to smbclient package.
+ * Moved rpcclient from the samba package to the smbclient package.
+ * The Samba daemons (nmbd and smbd) now create a PID file so I changed
+ all calls to start-stop-daemon to use the PID file.
+ * Fixed debian/rules to install mksmbpasswd (fixes #27655).
+ * Modified /etc/init.d/samba so nmbd is started without the -a (append
+ to the log file instead of overwrite) switch. The new behavior of
+ nmbd is to NOT overwrite log files, so the -a switch can be deleted
+ safely.
+ * Moved from debstd to debhelper.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 1 Oct 1998 08:37:41 -0400
+
+samba (1.9.18p10-5) frozen unstable; urgency=high
+
+ * Oppsss!!! While fixing bug #26884 I introduced a bug even worse than
+ the one I was trying to fix: in /etc/init.d/samba I got rid of the test
+ that tells us whether the Samba daemons are running from inetd or as
+ standalone daemons. I corrected the problem by editing again
+ /etc/init.d/samba to uncomment the test.
+ * Wishlist bug #28298 (typos in samba) was fixed.
+ * Wishlist bug #28309 (typos in smb.conf) was fixed.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 28 Oct 1998 09:11:47 -0400
+
+samba (1.9.18p10-4) unstable; urgency=low
+
+ * Minor patch to debian/rules to delete *substvars instead of only
+ substvars when doing a "debian/rules clean" (thanks to Daniel Jacobowitz
+ <dmj@andrew.cmu.edu> for this).
+ * Small patch to source/shmem_sysv.c that eases compilation under
+ glibc-2.1 (thanks to Daniel <dmj@andrew.cmu.edu> for this).
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 17 Sep 1998 15:33:49 -0400
+
+samba (1.9.18p10-3) unstable; urgency=low
+
+ * Patched smbclient again to fix minor formatting problem introduced
+ by Magosanyi Arpad's smbclient patch.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 3 Sep 1998 11:03:23 -0400
+
+samba (1.9.18p10-2) unstable; urgency=low
+
+ * Sync'ed include files for the smbfs utilities with the ones in
+ kernel 2.1.119.
+ * Added to the /usr/doc/samba/examples/ directory a new script called
+ wins2dns (courtesy of Jason Gunthorpe <jgg@deltatee.com>) that
+ generates BIND sonze files for hosts in the WINS database.
+ * Patched smbclient to include enhancements by Magosanyi Arpad
+ <mag@bunuel.tii.matav.hu> that make scripting easier.
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 28 Aug 1998 13:34:54 -0400
+
+samba (1.9.18p10-1) stable unstable; urgency=low
+
+ * New upstream version (see /usr/doc/samba/WHATSNEW.txt for a
+ description of what has changed). I built a 1.9.18p9-1 but I
+ never released it because an obscure bug was found just a couple
+ of days before the official release, so the Samba Team stopped
+ the rollover of 1.9.18p9.
+ * Updated documentation (new files were added to the docs/ directory
+ that were not installed in /usr/doc/samba/).
+ * Fixed long standing bug #7695 (smb.conf's man page doesn't document
+ 'printing=lprng') - I made a couple of changes to the man page to
+ include references to lprng.
+ * Fixes bug #24930 (samba needs to suggest psmisc?). I don't think it
+ is necessary to make samba suggest psmisc just because the postinst
+ script mentions to call killall. So, I removed all references to
+ "killall" in the scripts.
+ * Fixes bug #25999 (Samba does not by default work with unix password
+ sync): I added the "passwd program" and "passwd chat" parameters to
+ the sample smb.conf to reflect the Debian environment.
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 21 Aug 1998 08:59:18 -0400
+
+samba (1.9.18p9-1) unstable; urgency=low
+
+ * New upstream version (see /usr/doc/samba/WHATSNEW.txt for a
+ description of what has changed).
+ * Removed Jeremy Allison's patch applied to 1.9.18p8-2 because it is
+ now part of the new upstream version.
+ * Corrected small typo in addtosmbpass' man page (fixes #25629).
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 11 Aug 1998 08:53:08 -0400
+
+samba (1.9.18p8-2) frozen unstable; urgency=medium
+
+ * Applied patch received from Jeremy Allison (Samba Team) that fixes
+ "grave" bug #23903 (samba maps username before authenicating with
+ NT password server).
+ * Added a "sleep 2" between "start-stop-daemon --stop" and
+ "start-stop-daemon --start" in /etc/init.d/samba so when this script
+ is called with the "restart" parameter the Samba daemons are restarted
+ properly. This fixes bug #24211 (init.d script doesn't restart).
+ * Sent start-stop-daemon output in /etc/init.d/samba to /dev/null to
+ avoid annoying warning messages.
+ * Added perfomance tune parameters to sample /etc/smb.conf (SO_SNDBUF=4096
+ and SO_RCVBUF=4096 to "socket options" in /etc/smb.conf). I can't
+ find who sent this suggestion to me. If you are listening, drop me a
+ note and I'll put your name here :-)
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 29 Jun 1998 08:45:01 -0400
+
+samba (1.9.18p8-1) frozen unstable; urgency=low
+
+ * New upstream release that fixes _lots_ of "ugly" bugs. The list of
+ fixed bugs is too long to include here (see /usr/doc/samba/WHATSNEW.txt).
+ * Fixed postinst to quote arguments to if [ arg .. ] constructs
+ (fixes #22881).
+ * Applied Jeremy Allison's patch (posted to the samba-ntdom mailing
+ list) that solves a problem with username maps (the Samba Team did
+ not catch this problem before final 1.9.18p8).
+ * Made /etc/init.d/samba to print out a warning when Samba is running
+ from inetd and the user runs /etc/init.d/samba to start|stop|restart
+ Samba (there's no point on doing this because inetd will start the
+ daemons again when there is traffic on UDP port 137-139).
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 13 Jun 1998 00:18:25 -0400
+
+samba (1.9.18p7-4) frozen unstable; urgency=medium
+
+ * Fixes the serious problem of having the WINS name server
+ database getting deleted at boot time. That happened because the
+ WINS database was being stored under /var/lock/samba/ and all files
+ under /var/lock/ are deleted at boot time. The place where the WINS
+ database is stored was moved to /var/samba/.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 18 May 1998 20:24:29 -0400
+
+samba (1.9.18p7-3) stable; urgency=high
+
+ * Libc5 version for Bo (stable) that fixes the recently reported
+ security hole.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 18 May 1998 20:19:33 -0400
+
+samba (1.9.18p7-2) frozen unstable; urgency=low
+
+ * Added patches from the non-mantainer upload that make us able
+ to compile Samba on Alpha systems. This fixes bug #22379.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 13 May 1998 20:38:51 -0400
+
+samba (1.9.18p7-1) frozen unstable; urgency=low
+
+ * New upstream release (just bug fixes, no new functionality).
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 13 May 1998 11:47:32 -0400
+
+samba (1.9.18p6-2) frozen unstable; urgency=low
+
+ * Uploaded to frozen (I forgot to upload last version to frozen
+ so it got installed only in unstable).
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 12 May 1998 18:10:17 -0400
+
+samba (1.9.18p6-1.1) unstable; urgency=low
+
+ * non-maintainer upload for Alpha
+ * patch needed for source/quota.c (_syscall4() confusion)
+
+ -- Paul Slootman <paul@debian.org> Tue, 12 May 1998 20:39:13 +0200
+
+samba (1.9.18p6-1) unstable; urgency=low
+
+ * New upstream release that fixes a possible buffer overflow.
+ This security hole was reported on BugTraq by Drago. The
+ previous Debian version (1.9.18p5-1) was not released because
+ 1.9.18p5 and 1.9.18p6 were released very closely.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 11 May 1998 20:28:33 -0400
+
+samba (1.9.18p5-1) unstable; urgency=low
+
+ * New upstream release (no new funcionality, just bug fixes - see
+ /usr/doc/samba/WHATSNEW.txt.gz).
+ * Backed off Debian patches that were added upstream.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 11 May 1998 08:43:53 -0400
+
+samba (1.9.18p4-2) frozen unstable; urgency=low
+
+ * Patched smbclient(1) man page to not reference the unsopported
+ -A parameter (fixes #6863).
+ * Changes to start nmbd with the -a option (in /etc/init.d/samba
+ and in the entry added to /etc/inetd.conf).
+ * Fixed typo in sample smb.conf (fixes #21484).
+ * Fixed yet another typo in sample smb.conf (fixes #21447).
+
+ -- Eloy A. Paris <peloy@debian.org> Fri, 17 Apr 1998 22:19:23 -0400
+
+samba (1.9.18p4-1) frozen unstable; urgency=low
+
+ * New upstream version that fixes several bugs.
+ * New scheme for keeping track of Debian specific configuration.
+ This new scheme fixes bug #18624 (Samba always asks the user about
+ configuration options). New scheme stores Debian specific
+ configuration information in /etc/samba/debian_config.
+ * Changes to /usr/sbin/sambaconfig, prerm and postinst to support the
+ new configuration scheme.
+ * Moved required kernel 2.1.x include files inside the source tree
+ so I don't have to do very nasty things like creating crazy
+ symlinks in /usr/include to make this package compile. This
+ allows non-root users to build the package and fixes bug
+ #20104.
+ * Fixed address of the FSF in /usr/doc/samba/copyright (problem
+ reported by lintian).
+ * The /etc/init.d/samba script now supports the force-reload
+ argument, as required by the policy (problem reported by lintian).
+ * Added a "rm /etc/cron.weekly/samba" at the end of the postinst.
+ * Now the samba package can be installed even if no nmbd or smbd processes
+ are running. This fixes the following bugs: #8917, #9334, #10268,
+ #10411, #11146 and #13387.
+ * Provides the original README in /usr/doc/samba. This fixes bug #9693.
+ * Added a --no-reload option to sambaconfig to not reload Samba
+ after configuration.
+ * Created man pages for sambaconfig(8), addtosmbpass(8),
+ mksmbpasswd(8) and nmblookup(1).
+ * Corrected small typo in sample /etc/smb.conf.
+ * Added two new parameters to /etc/smb.conf: "preserver case" and
+ "short preserve case".
+ * "rm -Rf /var/lock/samba" in postrm when package is being purged.
+ * Patched upstream source (nmbd.c) to not overwrite log files when
+ nmbd is called with the -a parameter (fixes #17704: nmbd ignores
+ -a option).
+ * /etc/init.d/samba now starts the nmbd daemon with the -a parameter
+ to not overwrite log files.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 23 Mar 1998 21:22:03 -0400
+
+samba (1.9.18p3-1) unstable; urgency=low
+
+ * New upstream version.
+ * Oppsss!!! I really screwed it up (actually, debstd did).
+ 1.9.18p2-2 still contained man pages (smbmount and smbumount) part
+ of other packages. This version does have this corrected. If not,
+ I no longer deserve to be a Debian developer! So, this version
+ fixes bug #18438 and some of the bugs I claimed to fix in
+ 1.9.18p2-2. Oh, by the way, I fixed the problem by running debstd
+ with -m in debian/rules (man pages are installed by "make install"
+ so it's a bad idea to re-install man pages with debstd).
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 23 Feb 1998 17:32:42 -0400
+
+samba (1.9.18p2-2) unstable; urgency=low
+
+ * Fixes bugs #18017, #17999, #17961, #17932: old 1.9.18p2-1 provided
+ a man page for smbmount, which conflicts with package smbfs. This
+ was solved by creating a multi-binary package that produces
+ package samba and new package smbfsx.
+ * Fixes bug #18000 (typo in postinst).
+ * Fixes bug #17958 (postinst asks obsolete question). Actually,
+ the question is still asked, but only if Samba is run as daemons.
+ * Created a multi-binary package from the Samba sources: package
+ samba and new package smbfsx which provides SMB mount utilities
+ for kernels > 2.1.70.
+
+ -- Eloy A. Paris <peloy@debian.org> Mon, 9 Feb 1998 19:47:05 -0400
+
+samba (1.9.18p2-1) unstable; urgency=low
+
+ * New upstream version.
+ * Removed /etc/cron.weekly/samba because Samba does not handle well
+ rotation of log files (if the log file is rotated Samba will
+ continue to log to the rotated file, instead of the just created
+ one). In any case, Samba will rotate log files after an specific
+ file size.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 27 Jan 1998 22:34:27 -0400
+
+samba (1.9.18p1-2) unstable; urgency=low
+
+ * Created a multi-binary package out of the Samba sources to provide
+ packages samba and smbfsx (userland utilities to work with
+ smbfs with kernels > 2.1.x.
+
+ -- Eloy A. Paris <peloy@debian.org> Sat, 17 Jan 1998 09:23:48 -0400
+
+samba (1.9.18p1-1) unstable; urgency=low
+
+ * New upstream version.
+ * Created /etc/cron.daily/samba to save a copy of /etc/smbpasswd in
+ /var/backups/smbpasswd.bak.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 14 Jan 1998 13:40:56 -0400
+
+samba (1.9.18alpha14-1) unstable; urgency=low
+
+ * New upstream version.
+ * Added a note to the postinst script telling the user that he/she
+ needs to run smbpasswd manually after creating a new /etc/smbpasswd
+ from /etc/passwd.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 23 Dec 1997 23:44:37 -0400
+
+samba (1.9.18alpha13-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 16 Dec 1997 13:02:32 -0400
+
+samba (1.9.18alpha12-1) unstable; urgency=low
+
+ * New upstream version.
+ * Conflicts with the sambades package because the new Samba 1.9.18
+ series do not depend on the DES libraries to support encrypted
+ passwords.
+ * Added parameter "encrypt passwords = yes" to /etc/smb.conf.
+ * Compiled with support for quotas in disk_free().
+ * Home directories are now exported read only by default.
+ * Re-worked debian/rules.
+ * Re-worked sample smb.conf.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 4 Dec 1997 22:50:34 -0400
+
+samba (1.9.17p4-1) unstable; urgency=low
+
+ * New upstream version.
+ * Made /etc/smb.conf readable by everybody because some Samba utilities
+ will fail otherwise when run by non-root users.
+ * Dropped PAM support while the PAM libraries are ported to libc6.
+
+ -- Eloy A. Paris <peloy@debian.org> Tue, 21 Oct 1997 18:08:49 -0400
+
+samba (1.9.17p3-1) unstable; urgency=low
+
+ * New upstream version.
+ * Made /etc/smb.conf readable only by root as suggested by smbd's man page.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 15 Oct 1997 09:21:25 -0400
+
+samba (1.9.17p2-2) unstable; urgency=low
+
+ * Running Samba as daemons instead of from inetd.
+ * Removing netbios entries in /etc/inetd.conf.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 9 Oct 1997 23:37:25 -0400
+
+samba (1.9.17p2-1) unstable; urgency=low
+
+ * New upstream version that fixes a serious security hole.
+ * Removed Debian patches added in 1.9.17-1 and 1.9.17p1-1 because
+ these patches are now part of the upstream release.
+
+ -- Eloy A. Paris <peloy@debian.org> Sun, 28 Sep 1997 22:54:33 -0400
+
+samba (1.9.17p1-1) unstable; urgency=low
+
+ * New upstream version.
+ * Defined symbol _LINUX_C_LIB_VERSION_MAJOR as 6 in includes.h to shut up
+ compiler warnings.
+ * Included rpcsvc/ypclnt.h in includes.h to shut up compiler warnings.
+ * Included crypt.h to have function prototype for crypt().
+ * Included netinet/tcp.h to have some socket options included.
+ * Included netinet/ip.h to have some socket options included.
+ * Linking with libcrypt (LIBM='... -lcrypt'). Without including this
+ library smbd generates a seg. fault when authenticating users (?).
+
+ -- Eloy A. Paris <debian.org> Wed, 10 Sep 1997 22:09:18 -0400
+
+samba (1.9.17-1) unstable; urgency=low
+
+ * New upstream version (called the "Browse Fix Release")
+ * Added the option --oknodo to the start-stop-daemon invocation in prerm
+ script. This was because the prerm was failing because start-stop-daemon
+ was returning an error code if no nmbd or smbd daemons were found
+ to kill.
+ * The function yp_get_default_domain(), referenced in three source
+ files was part of libc5 but with libc6 (glibc2) it has been moved
+ to libnss_nis. Since the linker was unable to find the function
+ I had to add LIBSM='-lnss_nis' to debian/rules.
+ * Added -DNO_ASMSIGNALH and -DGLIBC2 to FLAGSM in debian/rules
+ because compiling was failing because of conflicts with glibc2.
+ * Patched source/includes.h to include termios.h if GLIBC2 is defined.
+
+ -- Eloy A. Paris <peloy@debian.org> Wed, 27 Aug 1997 08:39:32 -0400
+
+samba (1.9.17alpha5-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org> Thu, 14 Aug 1997 18:05:02 -0400
+
+samba (1.9.16p11-3) unstable; urgency=low
+
+ * Fixed accidental omission of /etc/pam.d/samba.
+
+ -- Klee Dienes <klee@debian.org> Sat, 15 Mar 1997 22:31:26 -0500
+
+samba (1.9.16p11-2) unstable; urgency=low
+
+ * Recompiled against newer PAM libraries.
+ * Added /etc/pam.d/samba.
+
+ -- Klee Dienes <klee@debian.org> Sat, 8 Mar 1997 01:16:28 -0500
+
+samba (1.9.16p11-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added PAM support.
+
+ -- Klee Dienes <klee@debian.org> Tue, 25 Feb 1997 18:00:12 -0500
+
+samba (1.9.16p9-2) unstable; urgency=low
+
+ * minor packaging changes
+
+ -- Klee Dienes <klee@sauron.sedona.com> Sun, 3 Nov 1996 11:45:37 -0700
+
+samba (1.9.16p9-1) unstable; urgency=low
+
+ * upgraded to new upstream version
+
+ -- Klee Dienes <klee@sauron.sedona.com> Sat, 26 Oct 1996 21:38:20 -0700
+
+1.9.16alpha10-1:
+ 960714
+ * Removed Package_Revision from control file.
+ * Removed -m486 compiler option.
+ * Added Architecture, Section and Priority fields to control file.
+ * Upgraded to latest upstream version.
+ * Uses update-inetd now.
+ * Added shadow passwords support.
+ * Fixed Bug#1946: nmbd won't browse
+
+1.9.15p4-1:
+ 951128
+ * Upgraded to latest upstream version.
+ * Fixed many bugs.
+ * Adds Master Browsing support.
+ * Converted to ELF.
+ * Fixed bug #1825 - nmbd is now killed when removing samba.
+
+1.9.14-1:
+ 950926 Andrew Howell <andrew@it.com.au>
+ * Upgraded to latest version.
+ * Fixed Bug #1139 - samba won't print
+
+1.9.14alpha5-1:
+ * Fixes killing of inetd problem in debian.postint and debian.postrm
+
+1.9.14alpha5-0:
+ 950704 Andrew Howell <andrew@it.com.au>
+ * Taken over samba package from Bruce Perens.
+ * Upgraded to newest version of samba.
+
+1.9.02-1:
+ 9-January-1994 Bruce Perens <Bruce@Pixar.com>
+ * Added Debian GNU/Linux package maintenance system files, and
+ configured for Debian systems.
diff --git a/packaging/Debian/debian-stable/config.cache b/packaging/Debian/debian-sarge/config.cache
index 8872a27b76..8872a27b76 100644
--- a/packaging/Debian/debian-stable/config.cache
+++ b/packaging/Debian/debian-sarge/config.cache
diff --git a/packaging/Debian/debian-stable/config.cache.alpha-linux b/packaging/Debian/debian-sarge/config.cache.alpha-linux
index 6d17192026..6d17192026 100644
--- a/packaging/Debian/debian-stable/config.cache.alpha-linux
+++ b/packaging/Debian/debian-sarge/config.cache.alpha-linux
diff --git a/packaging/Debian/debian-stable/config.cache.sparc-linux b/packaging/Debian/debian-sarge/config.cache.sparc-linux
index a2a21b1d3a..a2a21b1d3a 100644
--- a/packaging/Debian/debian-stable/config.cache.sparc-linux
+++ b/packaging/Debian/debian-sarge/config.cache.sparc-linux
diff --git a/packaging/Debian/debian-sarge/control b/packaging/Debian/debian-sarge/control
new file mode 100644
index 0000000000..712c57c144
--- /dev/null
+++ b/packaging/Debian/debian-sarge/control
@@ -0,0 +1,201 @@
+Source: samba
+Section: net
+Priority: optional
+Maintainer: Simo Sorce <idra@samba.org>
+Uploaders: Simo Sorce <idra@samba.org>
+Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), autoconf, libacl1-dev (>= 2.2.11-1) [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64 amd64], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1)
+Standards-Version: 3.5.10
+
+Package: samba
+Architecture: any
+Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules
+Replaces: samba-common (<= 2.0.5a-2)
+Suggests: samba-doc
+Description: a LanManager-like file and printer server for Unix
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains all the components necessary to turn your
+ Debian GNU/Linux box into a powerful file and printer server.
+ .
+ Currently, the Samba Debian packages consist of the following:
+ .
+ samba - LanManager-like file and printer server for Unix.
+ samba-common - Samba common files used by both the server and the client.
+ smbclient - LanManager-like simple client for Unix.
+ swat - Samba Web Administration Tool
+ samba-doc - Samba documentation.
+ smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above).
+ libpam-smbpass - pluggable authentication module for SMB password database
+ libsmbclient - Shared library that allows applications to talk to SMB servers
+ libsmbclient-dev - libsmbclient shared libraries
+ winbind: Service to resolve user and group information from Windows NT servers
+ python2.3-samba: Python bindings that allow access to various aspects of Samba
+ .
+ It is possible to install a subset of these packages depending on
+ your particular needs. For example, to access other SMB servers you
+ should only need the smbclient and samba-common packages.
+
+Package: samba-common
+Architecture: any
+Depends: debconf, libpam-modules, ${shlibs:Depends}
+Replaces: samba (<< 2.999+3.0.alpha21-4)
+Description: Samba common files used by both the server and the client
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains the common files that are used by both the server
+ (provided in the samba package) and the client (provided in the smbclient
+ package).
+
+Package: smbclient
+Architecture: any
+Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}
+Replaces: samba (<< 2.999+3.0.alpha21-4)
+Provides: samba-client
+Suggests: smbfs
+Description: a LanManager-like simple client for Unix
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains some client components of the Samba suite. In
+ particular it includes the command line utilities smbclient, smbtar,
+ and smbspool. If you want to mount shares exported from Microsoft
+ Windows machines or a Samba server you must install the smbfs package.
+
+Package: swat
+Architecture: any
+Depends: debconf, samba (= ${Source-Version}), ${shlibs:Depends}
+Recommends: samba-doc
+Description: Samba Web Administration Tool
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains the components of the Samba suite that are needed
+ for Web administration of the Samba server.
+ .
+ Note: if you want to use the on-line documentation that is accesible
+ through the Swat front-end you must install the samba-doc package.
+
+Package: samba-doc
+Section: doc
+Architecture: all
+Description: Samba documentation
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains all the documentation that comes in the original
+ tarball.
+
+Package: smbfs
+Section: otherosfs
+Priority: optional
+Architecture: any
+Depends: netbase (>= 2.02), samba-common (= ${Source-Version}), ${shlibs:Depends}
+Suggests: smbclient
+Replaces: smbfsx
+Conflicts: smbfsx, suidmanager (<< 0.50)
+Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x)
+ Smbfs is a filesystem which understands the SMB protocol.
+ This is the protocol Windows for Workgroups, Windows NT or
+ LAN Manager use to talk to each other. It was inspired by
+ samba, the program by Andrew Tridgell that turns any unix
+ site into a file server for DOS or Windows clients.
+ .
+ If you want to use command-line utilities like smbclient, smbtar
+ and/or smbspool you just need to install the smbclient package.
+ .
+ Starting with the Debian Samba packages version 2.2.0-1, the old smbfs
+ utilities for 2.0.x have been removed. There are no wrapper scripts
+ that call a specific smbmount/smbumount depending on the kernel
+ version. If you are using a 2.0.x kernel please upgrade or use the
+ latest Samba 2.0.7 Debian package.
+
+Package: libpam-smbpass
+Section: admin
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: samba
+Description: pluggable authentication module for SMB password database
+ This is a stackable PAM module that allows a system administrator to easily
+ migrate to using encrypted passwords for Samba and to keep smb passwords in
+ sync with unix passwords. Unlike other solutions, it does this without
+ requiring users to change their existing passwords or login to Samba using
+ cleartext passwords.
+
+Package: libsmbclient
+Section: libs
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: shared library that allows applications to talk to SMB servers
+ libsmbclient allows to write applications that use the SMB protocol.
+ This gives applications the ability to talk to Microsoft Windows servers
+ and Unix servers running Samba.
+ .
+ This package contains the libsmbclient shared library.
+
+Package: libsmbclient-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libsmbclient (= ${Source-Version})
+Description: libsmbclient static libraries and headers
+ libsmbclient allows to write applications that use the SMB protocol.
+ This gives applications the ability to talk to Microsoft Windows servers
+ and Unix servers running Samba.
+ .
+ This package contains the libsmbclient static libraries and headers
+ needed to build applications that use SMB services.
+
+Package: winbind
+Section: net
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: samba (<= 2.2.3-2)
+Description: service to resolve user and group information from Windows NT servers
+ This package provides the winbindd daemon, which provides a
+ service for the Name Service Switch capability that is present
+ in most modern C libraries (like the GNU C Library - glibc.)
+ .
+ The service provided by winbindd is called `winbind' and
+ can be used to resolve user and group information from a
+ Windows NT server. The service can also provide authentication
+ services via an associated PAM module.
+
+Package: python2.3-samba
+Section: python
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, python2.3
+Description: Python bindings that allow access to various aspects of Samba
+ The Samba Python bindings allow you to access various aspects of Samba.
+ At the moment their status is "experimental" but they have been reported
+ to work well.
+ .
+ See /usr/share/doc/python2.3-samba/examples for a couple of examples.
+
+Package: samba-dbg
+Section: devel
+Architecture: any
+Depends: samba (= ${Source-Version})
+Description: Samba debugging symbols
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains debugging symbols for the programs included in
+ the samba and smbclient packages.
diff --git a/packaging/Debian/debian-sarge/control.in b/packaging/Debian/debian-sarge/control.in
new file mode 100644
index 0000000000..0e25412e67
--- /dev/null
+++ b/packaging/Debian/debian-sarge/control.in
@@ -0,0 +1,201 @@
+Source: samba
+Section: net
+Priority: optional
+Maintainer: Simo Sorce <idra@samba.org>
+Uploaders: Simo Sorce <idra@samba.org>
+Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), autoconf, libacl1-dev (>= 2.2.11-1) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1)
+Standards-Version: 3.5.10
+
+Package: samba
+Architecture: any
+Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules
+Replaces: samba-common (<= 2.0.5a-2)
+Suggests: samba-doc
+Description: a LanManager-like file and printer server for Unix
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains all the components necessary to turn your
+ Debian GNU/Linux box into a powerful file and printer server.
+ .
+ Currently, the Samba Debian packages consist of the following:
+ .
+ samba - LanManager-like file and printer server for Unix.
+ samba-common - Samba common files used by both the server and the client.
+ smbclient - LanManager-like simple client for Unix.
+ swat - Samba Web Administration Tool
+ samba-doc - Samba documentation.
+ smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above).
+ libpam-smbpass - pluggable authentication module for SMB password database
+ libsmbclient - Shared library that allows applications to talk to SMB servers
+ libsmbclient-dev - libsmbclient shared libraries
+ winbind: Service to resolve user and group information from Windows NT servers
+ python2.3-samba: Python bindings that allow access to various aspects of Samba
+ .
+ It is possible to install a subset of these packages depending on
+ your particular needs. For example, to access other SMB servers you
+ should only need the smbclient and samba-common packages.
+
+Package: samba-common
+Architecture: any
+Depends: debconf, libpam-modules, ${shlibs:Depends}
+Replaces: samba (<< 2.999+3.0.alpha21-4)
+Description: Samba common files used by both the server and the client
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains the common files that are used by both the server
+ (provided in the samba package) and the client (provided in the smbclient
+ package).
+
+Package: smbclient
+Architecture: any
+Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}
+Replaces: samba (<< 2.999+3.0.alpha21-4)
+Provides: samba-client
+Suggests: smbfs
+Description: a LanManager-like simple client for Unix
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains some client components of the Samba suite. In
+ particular it includes the command line utilities smbclient, smbtar,
+ and smbspool. If you want to mount shares exported from Microsoft
+ Windows machines or a Samba server you must install the smbfs package.
+
+Package: swat
+Architecture: any
+Depends: debconf, samba (= ${Source-Version}), ${shlibs:Depends}
+Recommends: samba-doc
+Description: Samba Web Administration Tool
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains the components of the Samba suite that are needed
+ for Web administration of the Samba server.
+ .
+ Note: if you want to use the on-line documentation that is accesible
+ through the Swat front-end you must install the samba-doc package.
+
+Package: samba-doc
+Section: doc
+Architecture: all
+Description: Samba documentation
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains all the documentation that comes in the original
+ tarball.
+
+Package: smbfs
+Section: otherosfs
+Priority: optional
+Architecture: any
+Depends: netbase (>= 2.02), samba-common (= ${Source-Version}), ${shlibs:Depends}
+Suggests: smbclient
+Replaces: smbfsx
+Conflicts: smbfsx, suidmanager (<< 0.50)
+Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x)
+ Smbfs is a filesystem which understands the SMB protocol.
+ This is the protocol Windows for Workgroups, Windows NT or
+ LAN Manager use to talk to each other. It was inspired by
+ samba, the program by Andrew Tridgell that turns any unix
+ site into a file server for DOS or Windows clients.
+ .
+ If you want to use command-line utilities like smbclient, smbtar
+ and/or smbspool you just need to install the smbclient package.
+ .
+ Starting with the Debian Samba packages version 2.2.0-1, the old smbfs
+ utilities for 2.0.x have been removed. There are no wrapper scripts
+ that call a specific smbmount/smbumount depending on the kernel
+ version. If you are using a 2.0.x kernel please upgrade or use the
+ latest Samba 2.0.7 Debian package.
+
+Package: libpam-smbpass
+Section: admin
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: samba
+Description: pluggable authentication module for SMB password database
+ This is a stackable PAM module that allows a system administrator to easily
+ migrate to using encrypted passwords for Samba and to keep smb passwords in
+ sync with unix passwords. Unlike other solutions, it does this without
+ requiring users to change their existing passwords or login to Samba using
+ cleartext passwords.
+
+Package: libsmbclient
+Section: libs
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: shared library that allows applications to talk to SMB servers
+ libsmbclient allows to write applications that use the SMB protocol.
+ This gives applications the ability to talk to Microsoft Windows servers
+ and Unix servers running Samba.
+ .
+ This package contains the libsmbclient shared library.
+
+Package: libsmbclient-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libsmbclient (= ${Source-Version})
+Description: libsmbclient static libraries and headers
+ libsmbclient allows to write applications that use the SMB protocol.
+ This gives applications the ability to talk to Microsoft Windows servers
+ and Unix servers running Samba.
+ .
+ This package contains the libsmbclient static libraries and headers
+ needed to build applications that use SMB services.
+
+Package: winbind
+Section: net
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: samba (<= 2.2.3-2)
+Description: service to resolve user and group information from Windows NT servers
+ This package provides the winbindd daemon, which provides a
+ service for the Name Service Switch capability that is present
+ in most modern C libraries (like the GNU C Library - glibc.)
+ .
+ The service provided by winbindd is called `winbind' and
+ can be used to resolve user and group information from a
+ Windows NT server. The service can also provide authentication
+ services via an associated PAM module.
+
+Package: python2.3-samba
+Section: python
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, python2.3
+Description: Python bindings that allow access to various aspects of Samba
+ The Samba Python bindings allow you to access various aspects of Samba.
+ At the moment their status is "experimental" but they have been reported
+ to work well.
+ .
+ See /usr/share/doc/python2.3-samba/examples for a couple of examples.
+
+Package: samba-dbg
+Section: devel
+Architecture: any
+Depends: samba (= ${Source-Version})
+Description: Samba debugging symbols
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains debugging symbols for the programs included in
+ the samba and smbclient packages.
diff --git a/packaging/Debian/debian-sarge/copyright b/packaging/Debian/debian-sarge/copyright
new file mode 100644
index 0000000000..78dbaf25c6
--- /dev/null
+++ b/packaging/Debian/debian-sarge/copyright
@@ -0,0 +1,30 @@
+This is the Samba Team prepackaged version of the Samba SMB
+(LAN-Manager) server for Debian systems. Samba was written by
+Andrew Tridgell <tridge@samba.org>, the Samba Team and many others.
+
+This package has been produced by Simo Sorce <idra@samba.org>
+using scripts put together by Eloy Paris <peloy@debian.org>,
+Steve Langasek <vorlon@debian.org>, and Víctor Pérez Pereira
+<vperez@debianvenezuela.org> based on previous work by Klee Dienes
+<klee@debian.org>, Andrew Howell <andrew@it.com.au> and Bruce Perens
+<bruce@pixar.com> from sources found at
+<URL:http://www.samba.org/samba/ftp/>.
+
+Copyright:
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ MA 02111-1307, USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/packaging/Debian/debian-stable/gdbcommands b/packaging/Debian/debian-sarge/gdbcommands
index 5774b9ae31..5774b9ae31 100644
--- a/packaging/Debian/debian-stable/gdbcommands
+++ b/packaging/Debian/debian-sarge/gdbcommands
diff --git a/packaging/Debian/debian-stable/libpam-smbpass.docs b/packaging/Debian/debian-sarge/libpam-smbpass.docs
index 89fbbf9042..89fbbf9042 100644
--- a/packaging/Debian/debian-stable/libpam-smbpass.docs
+++ b/packaging/Debian/debian-sarge/libpam-smbpass.docs
diff --git a/packaging/Debian/debian-stable/libpam-smbpass.examples b/packaging/Debian/debian-sarge/libpam-smbpass.examples
index 48d841b2c1..48d841b2c1 100644
--- a/packaging/Debian/debian-stable/libpam-smbpass.examples
+++ b/packaging/Debian/debian-sarge/libpam-smbpass.examples
diff --git a/packaging/Debian/debian-stable/libpam-smbpass.files b/packaging/Debian/debian-sarge/libpam-smbpass.files
index 4263df5c0f..4263df5c0f 100644
--- a/packaging/Debian/debian-stable/libpam-smbpass.files
+++ b/packaging/Debian/debian-sarge/libpam-smbpass.files
diff --git a/packaging/Debian/debian-stable/libsmbclient-dev.examples b/packaging/Debian/debian-sarge/libsmbclient-dev.examples
index 2094c40b55..2094c40b55 100644
--- a/packaging/Debian/debian-stable/libsmbclient-dev.examples
+++ b/packaging/Debian/debian-sarge/libsmbclient-dev.examples
diff --git a/packaging/Debian/debian-stable/libsmbclient-dev.files b/packaging/Debian/debian-sarge/libsmbclient-dev.files
index a52c17cfc5..a52c17cfc5 100644
--- a/packaging/Debian/debian-stable/libsmbclient-dev.files
+++ b/packaging/Debian/debian-sarge/libsmbclient-dev.files
diff --git a/packaging/Debian/debian-stable/libsmbclient.files b/packaging/Debian/debian-sarge/libsmbclient.files
index 18b7f3b165..18b7f3b165 100644
--- a/packaging/Debian/debian-stable/libsmbclient.files
+++ b/packaging/Debian/debian-sarge/libsmbclient.files
diff --git a/packaging/Debian/debian-sarge/libsmbclient.shlibs b/packaging/Debian/debian-sarge/libsmbclient.shlibs
new file mode 100644
index 0000000000..532b5de4d1
--- /dev/null
+++ b/packaging/Debian/debian-sarge/libsmbclient.shlibs
@@ -0,0 +1 @@
+libsmbclient 0 libsmbclient (>= 3.0.2a-1)
diff --git a/packaging/Debian/debian-stable/mksmbpasswd.8 b/packaging/Debian/debian-sarge/mksmbpasswd.8
index 0a500102e8..0a500102e8 100644
--- a/packaging/Debian/debian-stable/mksmbpasswd.8
+++ b/packaging/Debian/debian-sarge/mksmbpasswd.8
diff --git a/packaging/Debian/debian-stable/mksmbpasswd.awk b/packaging/Debian/debian-sarge/mksmbpasswd.awk
index a7b41a725d..a7b41a725d 100644
--- a/packaging/Debian/debian-stable/mksmbpasswd.awk
+++ b/packaging/Debian/debian-sarge/mksmbpasswd.awk
diff --git a/packaging/Debian/debian-stable/panic-action b/packaging/Debian/debian-sarge/panic-action
index 13f773c1ef..13f773c1ef 100644
--- a/packaging/Debian/debian-stable/panic-action
+++ b/packaging/Debian/debian-sarge/panic-action
diff --git a/packaging/Debian/debian-sarge/patches/VERSION.patch b/packaging/Debian/debian-sarge/patches/VERSION.patch
new file mode 100644
index 0000000000..efa7d85d4d
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/VERSION.patch
@@ -0,0 +1,8 @@
+--- samba-3.0.0rc2/source/VERSION.orig 2003-09-02 21:56:11.000000000 -0400
++++ samba-3.0.0rc2/source/VERSION 2003-09-02 21:56:30.000000000 -0400
+@@ -78,4 +78,4 @@
+ # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
+ # -> "CVS 3.0.0rc2-VendorVersion" #
+ ########################################################
+-SAMBA_VERSION_VENDOR_SUFFIX=
++SAMBA_VERSION_VENDOR_SUFFIX="Debian"
diff --git a/packaging/Debian/debian-sarge/patches/cups.patch b/packaging/Debian/debian-sarge/patches/cups.patch
new file mode 100644
index 0000000000..8b1b8653d9
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/cups.patch
@@ -0,0 +1,14 @@
+--- samba-3.0.10.orig/source/include/includes.h
++++ samba-3.0.10/source/include/includes.h
+@@ -940,10 +940,7 @@
+ #endif
+
+ #ifndef DEFAULT_PRINTING
+-#ifdef HAVE_CUPS
+-#define DEFAULT_PRINTING PRINT_CUPS
+-#define PRINTCAP_NAME "cups"
+-#elif defined(SYSV)
++#if defined(SYSV)
+ #define DEFAULT_PRINTING PRINT_SYSV
+ #define PRINTCAP_NAME "lpstat"
+ #else
diff --git a/packaging/Debian/debian-sarge/patches/documentation.patch b/packaging/Debian/debian-sarge/patches/documentation.patch
new file mode 100644
index 0000000000..505a53c51b
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/documentation.patch
@@ -0,0 +1,66 @@
+--- samba-3.0.4/docs/manpages/swat.8.orig 2004-05-05 10:22:50.000000000 -0400
++++ samba-3.0.4/docs/manpages/swat.8 2004-05-10 13:25:53.000000000 -0400
+@@ -80,6 +80,13 @@
+ .SH "INSTALLATION"
+
+ .PP
++\fBDebian-specific Note\fR: all these steps have already been done for
++you. However, by default, swat is not enabled. This has been done for
++security reasons. To enable swat you need to edit /etc/inetd.conf,
++uncomment the swat entry (usually at the end of the file), and then
++restart inetd.
++
++.PP
+ 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
+@@ -87,13 +94,13 @@
+
+ .TP 3
+ \(bu
+-/usr/local/samba/sbin/swat
++/usr/sbin/swat
+ .TP
+ \(bu
+-/usr/local/samba/swat/images/*
++/usr/share/samba/swat/images/*
+ .TP
+ \(bu
+-/usr/local/samba/swat/help/*
++/usr/share/samba/swat/help/*
+ .LP
+
+ .SS "Inetd Installation"
+@@ -102,7 +109,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
+-In \fI/etc/services\fR you need to add a line like this:
++In \fI/etc/services\fR you need to add a line like this (not needed for Debian):
+
+ .PP
+ \fBswat 901/tcp\fR
+@@ -114,10 +121,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
+-In \fI/etc/inetd\&.conf\fR you should add a line like this:
++In \fI/etc/inetd\&.conf\fR you should add a line like this (not needed for Debian since the maintainer scripts do it automatically. 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/sbin/swat swat\fR
++\fBswat stream tcp nowait\&.400 root /usr/sbin/swat swat\fR
+
+ .PP
+ Once 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\&.
+@@ -141,8 +148,8 @@
+ This file must contain a mapping of service name (e\&.g\&., swat) to service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
+
+ .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\&.
++\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\&.
+
+ .SH "WARNINGS"
+
diff --git a/packaging/Debian/debian-sarge/patches/fhs.patch b/packaging/Debian/debian-sarge/patches/fhs.patch
new file mode 100644
index 0000000000..0790c17b2f
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/fhs.patch
@@ -0,0 +1,558 @@
+diff -uNr samba-3.0.10.orig/source/Makefile.in samba-3.0.10/source/Makefile.in
+--- samba-3.0.10.orig/source/Makefile.in 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/Makefile.in 2004-12-17 03:55:29.000000000 -0800
+@@ -90,6 +90,13 @@
+ # the directory where lock files go
+ LOCKDIR = @lockdir@
+
++# FHS directories; equal to LOCKDIR if not using --with-fhs
++CACHEDIR = @cachedir@
++STATEDIR = @statedir@
++
++# Where to look for (and install) codepage databases.
++CODEPAGEDIR = @codepagedir@
++
+ # the directory where pid files go
+ PIDDIR = @piddir@
+ # man pages language(s)
+@@ -114,7 +121,7 @@
+ PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
+ PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
+ -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
+-PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
++PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" -DCACHEDIR=\"$(CACHEDIR)\" -DSTATEDIR=\"$(STATEDIR)\"
+ PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
+
+ # Note that all executable programs now provide for an optional executable suffix.
+@@ -1319,7 +1326,7 @@
+ @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
+
+ installdat: installdirs
+- @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir)
++ @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(CODEPAGEDIR) $(srcdir)
+
+ installmsg: installdirs
+ @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR)$(LIBDIR) $(srcdir)
+diff -uNr samba-3.0.10.orig/source/configure.in samba-3.0.10/source/configure.in
+--- samba-3.0.10.orig/source/configure.in 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/configure.in 2004-12-17 03:55:29.000000000 -0800
+@@ -35,7 +35,7 @@
+ [ --with-fhs Use FHS-compliant paths (default=no)],
+ [ case "$withval" in
+ yes)
+- lockdir="\${VARDIR}/lib/samba"
++ lockdir="\${VARDIR}/run/samba"
+ piddir="\${VARDIR}/run"
+ mandir="\${prefix}/share/man"
+ logfilebase="\${VARDIR}/log/samba"
+@@ -43,6 +43,10 @@
+ libdir="\${prefix}/lib/samba"
+ configdir="${sysconfdir}/samba"
+ swatdir="\${DATADIR}/samba/swat"
++ codepagedir="\${DATADIR}/samba"
++ statedir="\${VARDIR}/lib/samba"
++ cachedir="\${VARDIR}/cache/samba"
++ AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
+ ;;
+ esac])
+
+@@ -201,6 +205,9 @@
+ AC_SUBST(swatdir)
+ AC_SUBST(bindir)
+ AC_SUBST(sbindir)
++AC_SUBST(codepagedir)
++AC_SUBST(statedir)
++AC_SUBST(cachedir)
+
+ dnl Unique-to-Samba variables we'll be playing with.
+ AC_SUBST(SHELL)
+diff -uNr samba-3.0.10.orig/source/dynconfig.c samba-3.0.10/source/dynconfig.c
+--- samba-3.0.10.orig/source/dynconfig.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/dynconfig.c 2004-12-17 03:55:29.000000000 -0800
+@@ -53,6 +53,13 @@
+ pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
+
+ /**
++ * @brief Samba data directory.
++ *
++ * @sa data_path() to get the path to a file inside the CODEPAGEDIR.
++ **/
++pstring dyn_CODEPAGEDIR = CODEPAGEDIR;
++
++/**
+ * @brief Samba library directory.
+ *
+ * @sa lib_path() to get the path to a file inside the LIBDIR.
+@@ -70,3 +77,27 @@
+
+ const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE;
+ const pstring dyn_PRIVATE_DIR = PRIVATE_DIR;
++
++
++/* In non-FHS mode, these should be configurable using 'lock dir =';
++ but in FHS mode, they are their own directory. Implement as wrapper
++ functions so that everything can still be kept in dynconfig.c.
++ */
++
++char *dyn_STATEDIR(void)
++{
++#ifdef FHS_COMPATIBLE
++ return STATEDIR;
++#else
++ return lp_lockdir();
++#endif
++}
++
++char *dyn_CACHEDIR(void)
++{
++#ifdef FHS_COMPATIBLE
++ return CACHEDIR;
++#else
++ return lp_lockdir();
++#endif
++}
+diff -uNr samba-3.0.10.orig/source/groupdb/mapping.c samba-3.0.10/source/groupdb/mapping.c
+--- samba-3.0.10.orig/source/groupdb/mapping.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/groupdb/mapping.c 2004-12-17 03:55:29.000000000 -0800
+@@ -140,7 +140,7 @@
+
+ if (tdb)
+ return True;
+- tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++ tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ if (!tdb) {
+ DEBUG(0,("Failed to open group mapping database\n"));
+ return False;
+diff -uNr samba-3.0.10.orig/source/include/dynconfig.h samba-3.0.10/source/include/dynconfig.h
+--- samba-3.0.10.orig/source/include/dynconfig.h 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/include/dynconfig.h 2004-12-17 03:55:29.000000000 -0800
+@@ -31,8 +31,12 @@
+ extern pstring dyn_CONFIGFILE;
+ extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
+ extern pstring dyn_LIBDIR;
++extern pstring dyn_CODEPAGEDIR;
+ extern const fstring dyn_SHLIBEXT;
+ extern const pstring dyn_LOCKDIR;
+ extern const pstring dyn_PIDDIR;
+ extern const pstring dyn_SMB_PASSWD_FILE;
+ extern const pstring dyn_PRIVATE_DIR;
++
++char *dyn_STATEDIR(void);
++char *dyn_CACHEDIR(void);
+diff -uNr samba-3.0.10.orig/source/intl/lang_tdb.c samba-3.0.10/source/intl/lang_tdb.c
+--- samba-3.0.10.orig/source/intl/lang_tdb.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/intl/lang_tdb.c 2004-12-17 03:55:29.000000000 -0800
+@@ -128,7 +128,7 @@
+ if (!lang)
+ return True;
+
+- asprintf(&msg_path, "%s.msg", lib_path((const char *)lang));
++ asprintf(&msg_path, "%s.msg", data_path((const char *)lang));
+ if (stat(msg_path, &st) != 0) {
+ /* the msg file isn't available */
+ DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path,
+diff -uNr samba-3.0.10.orig/source/lib/account_pol.c samba-3.0.10/source/lib/account_pol.c
+--- samba-3.0.10.orig/source/lib/account_pol.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/lib/account_pol.c 2004-12-17 03:55:29.000000000 -0800
+@@ -35,7 +35,7 @@
+
+ if (tdb)
+ return True;
+- tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++ tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ if (!tdb) {
+ DEBUG(0,("Failed to open account policy database\n"));
+ return False;
+diff -uNr samba-3.0.10.orig/source/lib/util.c samba-3.0.10/source/lib/util.c
+--- samba-3.0.10.orig/source/lib/util.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/lib/util.c 2004-12-17 03:55:29.000000000 -0800
+@@ -2362,6 +2362,61 @@
+ }
+
+ /**
++ * @brief Returns an absolute path to a file in the Samba data directory.
++ *
++ * @param name File to find, relative to CODEPAGEDIR.
++ *
++ * @retval Pointer to a static #pstring containing the full path.
++ **/
++
++char *data_path(const char *name)
++{
++ static pstring fname;
++ snprintf(fname, sizeof(fname), "%s/%s", dyn_CODEPAGEDIR, name);
++ return fname;
++}
++
++/*****************************************************************
++a useful function for returning a path in the Samba state directory
++ *****************************************************************/
++char *state_path(char *name)
++{
++ static pstring fname;
++
++ pstrcpy(fname,dyn_STATEDIR());
++ trim_string(fname,"","/");
++
++ if (!directory_exist(fname,NULL)) {
++ mkdir(fname,0755);
++ }
++
++ pstrcat(fname,"/");
++ pstrcat(fname,name);
++
++ return fname;
++}
++
++/*****************************************************************
++a useful function for returning a path in the Samba cache directory
++ *****************************************************************/
++char *cache_path(char *name)
++{
++ static pstring fname;
++
++ pstrcpy(fname,dyn_CACHEDIR());
++ trim_string(fname,"","/");
++
++ if (!directory_exist(fname,NULL)) {
++ mkdir(fname,0755);
++ }
++
++ pstrcat(fname,"/");
++ pstrcat(fname,name);
++
++ return fname;
++}
++
++/**
+ * @brief Returns the platform specific shared library extension.
+ *
+ * @retval Pointer to a static #fstring containing the extension.
+diff -uNr samba-3.0.10.orig/source/lib/util_unistr.c samba-3.0.10/source/lib/util_unistr.c
+--- samba-3.0.10.orig/source/lib/util_unistr.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/lib/util_unistr.c 2004-12-17 03:55:29.000000000 -0800
+@@ -54,8 +54,8 @@
+ if (initialised) return;
+ initialised = 1;
+
+- upcase_table = map_file(lib_path("upcase.dat"), 0x20000);
+- lowcase_table = map_file(lib_path("lowcase.dat"), 0x20000);
++ upcase_table = map_file(data_path("upcase.dat"), 0x20000);
++ lowcase_table = map_file(data_path("lowcase.dat"), 0x20000);
+
+ /* we would like Samba to limp along even if these tables are
+ not available */
+@@ -161,7 +161,7 @@
+ return;
+ }
+
+- valid_file = map_file(lib_path("valid.dat"), 0x10000);
++ valid_file = map_file(data_path("valid.dat"), 0x10000);
+ if (valid_file) {
+ valid_table = valid_file;
+ mapped_file = 1;
+diff -uNr samba-3.0.10.orig/source/libsmb/samlogon_cache.c samba-3.0.10/source/libsmb/samlogon_cache.c
+--- samba-3.0.10.orig/source/libsmb/samlogon_cache.c 2004-12-17 03:50:08.000000000 -0800
++++ samba-3.0.10/source/libsmb/samlogon_cache.c 2004-12-17 03:55:29.000000000 -0800
+@@ -34,7 +34,7 @@
+ BOOL netsamlogon_cache_init(void)
+ {
+ if (!netsamlogon_tdb) {
+- netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
++ netsamlogon_tdb = tdb_open_log(cache_path(NETSAMLOGON_TDB), 0,
+ TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
+ }
+
+@@ -67,7 +67,7 @@
+ winbindd_cache.tdb open. Open the tdb if a NULL is passed. */
+
+ if (!tdb) {
+- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000,
++ tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000,
+ TDB_DEFAULT, O_RDWR, 0600);
+ if (!tdb) {
+ DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
+diff -uNr samba-3.0.10.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0.10/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.0.10.orig/source/nmbd/nmbd_serverlistdb.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/nmbd/nmbd_serverlistdb.c 2004-12-17 03:55:29.000000000 -0800
+@@ -327,7 +327,7 @@
+
+ updatecount++;
+
+- pstrcpy(fname,lp_lockdir());
++ pstrcpy(fname,dyn_CACHEDIR());
+ trim_char(fname,'\0' ,'/');
+ pstrcat(fname,"/");
+ pstrcat(fname,SERVER_LIST);
+diff -uNr samba-3.0.10.orig/source/nmbd/nmbd_winsserver.c samba-3.0.10/source/nmbd/nmbd_winsserver.c
+--- samba-3.0.10.orig/source/nmbd/nmbd_winsserver.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/nmbd/nmbd_winsserver.c 2004-12-17 03:55:30.000000000 -0800
+@@ -234,7 +234,7 @@
+
+ add_samba_names_to_subnet(wins_server_subnet);
+
+- if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) {
++ if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) {
+ DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
+ WINS_LIST, strerror(errno) ));
+ return True;
+@@ -1810,7 +1810,7 @@
+ }
+ }
+
+- slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
++ slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST);
+ all_string_sub(fname,"//", "/", 0);
+ slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
+
+diff -uNr samba-3.0.10.orig/source/nsswitch/winbindd_cache.c samba-3.0.10/source/nsswitch/winbindd_cache.c
+--- samba-3.0.10.orig/source/nsswitch/winbindd_cache.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/nsswitch/winbindd_cache.c 2004-12-17 03:55:30.000000000 -0800
+@@ -57,7 +57,7 @@
+ if (opt_nocache)
+ return;
+
+- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000,
++ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 5000,
+ TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
+
+ if (!wcache->tdb) {
+diff -uNr samba-3.0.10.orig/source/nsswitch/winbindd_util.c samba-3.0.10/source/nsswitch/winbindd_util.c
+--- samba-3.0.10.orig/source/nsswitch/winbindd_util.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/nsswitch/winbindd_util.c 2004-12-17 03:55:30.000000000 -0800
+@@ -957,7 +957,7 @@
+ SMB_STRUCT_STAT stbuf;
+ TDB_CONTEXT *idmap_tdb;
+
+- pstrcpy(idmap_name, lock_path("winbindd_idmap.tdb"));
++ pstrcpy(idmap_name, state_path("winbindd_idmap.tdb"));
+
+ if (!file_exist(idmap_name, &stbuf)) {
+ /* nothing to convert return */
+diff -uNr samba-3.0.10.orig/source/param/loadparm.c samba-3.0.10/source/param/loadparm.c
+--- samba-3.0.10.orig/source/param/loadparm.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/param/loadparm.c 2004-12-17 03:55:30.000000000 -0800
+@@ -104,6 +104,9 @@
+ char *szAddPrinterCommand;
+ char *szDeletePrinterCommand;
+ char *szOs2DriverMap;
++#ifdef FHS_COMPATIBLE
++ char *szLockDirStub;
++#endif
+ char *szLockDir;
+ char *szPidDir;
+ char *szRootdir;
+@@ -1105,8 +1108,13 @@
+ {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
+ {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED},
+ {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED},
++#ifdef FHS_COMPATIBLE
++ {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
++ {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
++#else
+ {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED},
+ {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE},
++#endif
+ {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED},
+ #ifdef WITH_UTMP
+ {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED},
+diff -uNr samba-3.0.10.orig/source/passdb/pdb_tdb.c samba-3.0.10/source/passdb/pdb_tdb.c
+--- samba-3.0.10.orig/source/passdb/pdb_tdb.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/passdb/pdb_tdb.c 2004-12-17 03:55:30.000000000 -0800
+@@ -734,10 +734,7 @@
+ if (location) {
+ tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
+ } else {
+- pstring tdbfile;
+- get_private_directory(tdbfile);
+- pstrcat(tdbfile, "/");
+- pstrcat(tdbfile, PASSDB_FILE_NAME);
++ char *tdbfile = state_path(PASSDB_FILE_NAME);
+ tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile);
+ }
+
+diff -uNr samba-3.0.10.orig/source/passdb/secrets.c samba-3.0.10/source/passdb/secrets.c
+--- samba-3.0.10.orig/source/passdb/secrets.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/passdb/secrets.c 2004-12-17 03:55:30.000000000 -0800
+@@ -55,8 +55,7 @@
+ if (tdb)
+ return True;
+
+- pstrcpy(fname, lp_private_dir());
+- pstrcat(fname,"/secrets.tdb");
++ pstrcpy(fname, state_path("secrets.tdb"));
+
+ tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+
+diff -uNr samba-3.0.10.orig/source/printing/nt_printing.c samba-3.0.10/source/printing/nt_printing.c
+--- samba-3.0.10.orig/source/printing/nt_printing.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/printing/nt_printing.c 2004-12-17 03:55:31.000000000 -0800
+@@ -298,28 +298,28 @@
+
+ if (tdb_drivers)
+ tdb_close(tdb_drivers);
+- tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++ tdb_drivers = tdb_open_log(state_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ if (!tdb_drivers) {
+ DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n",
+- lock_path("ntdrivers.tdb"), strerror(errno) ));
++ state_path("ntdrivers.tdb"), strerror(errno) ));
+ return False;
+ }
+
+ if (tdb_printers)
+ tdb_close(tdb_printers);
+- tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++ tdb_printers = tdb_open_log(state_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ if (!tdb_printers) {
+ DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n",
+- lock_path("ntprinters.tdb"), strerror(errno) ));
++ state_path("ntprinters.tdb"), strerror(errno) ));
+ return False;
+ }
+
+ if (tdb_forms)
+ tdb_close(tdb_forms);
+- tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++ tdb_forms = tdb_open_log(state_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ if (!tdb_forms) {
+ DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n",
+- lock_path("ntforms.tdb"), strerror(errno) ));
++ state_path("ntforms.tdb"), strerror(errno) ));
+ return False;
+ }
+
+diff -uNr samba-3.0.10.orig/source/printing/printing.c samba-3.0.10/source/printing/printing.c
+--- samba-3.0.10.orig/source/printing/printing.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/printing/printing.c 2004-12-17 03:55:31.000000000 -0800
+@@ -177,8 +177,8 @@
+ int services = lp_numservices();
+ int snum;
+
+- unlink(lock_path("printing.tdb"));
+- pstrcpy(printing_path,lock_path("printing"));
++ unlink(cache_path("printing.tdb"));
++ pstrcpy(printing_path,cache_path("printing"));
+ mkdir(printing_path,0755);
+
+ /* handle a Samba upgrade */
+diff -uNr samba-3.0.10.orig/source/printing/printing_db.c samba-3.0.10/source/printing/printing_db.c
+--- samba-3.0.10.orig/source/printing/printing_db.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/printing/printing_db.c 2004-12-17 03:55:31.000000000 -0800
+@@ -89,7 +89,7 @@
+ DLIST_ADD(print_db_head, p);
+ }
+
+- pstrcpy(printdb_path, lock_path("printing/"));
++ pstrcpy(printdb_path, cache_path("printing/"));
+ pstrcat(printdb_path, printername);
+ pstrcat(printdb_path, ".tdb");
+
+diff -uNr samba-3.0.20b.orig/source/registry/reg_db.c samba-3.0.20b/source/registry/reg_db.c
+--- samba-3.0.20b.orig/source/registry/reg_db.c 2003-07-02 23:26:47.000000000 -0500
++++ samba-3.0.20b/source/registry/reg_db.c 2003-07-02 23:19:02.000000000 -0500
+@@ -198,13 +198,13 @@
+ if ( tdb_reg )
+ return True;
+
+- if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
++ if ( !(tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
+ {
+- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ if ( !tdb_reg ) {
+ DEBUG(0,("init_registry: Failed to open registry %s (%s)\n",
+- lock_path("registry.tdb"), strerror(errno) ));
++ state_path("registry.tdb"), strerror(errno) ));
+ return False;
+ }
+
+ DEBUG(10,("init_registry: Successfully created registry tdb\n"));
+diff -uNr samba-3.0.10.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.10/source/rpc_server/srv_srvsvc_nt.c
+--- samba-3.0.10.orig/source/rpc_server/srv_srvsvc_nt.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/rpc_server/srv_srvsvc_nt.c 2004-12-17 03:55:31.000000000 -0800
+@@ -133,10 +133,10 @@
+
+ if (share_tdb && local_pid == sys_getpid())
+ return True;
+- share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
++ share_tdb = tdb_open_log(state_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ if (!share_tdb) {
+ DEBUG(0,("Failed to open share info database %s (%s)\n",
+- lock_path("share_info.tdb"), strerror(errno) ));
++ state_path("share_info.tdb"), strerror(errno) ));
+ return False;
+ }
+
+diff -uNr samba-3.0.10.orig/source/sam/idmap_tdb.c samba-3.0.10/source/sam/idmap_tdb.c
+--- samba-3.0.10.orig/source/sam/idmap_tdb.c 2004-12-17 03:50:09.000000000 -0800
++++ samba-3.0.10/source/sam/idmap_tdb.c 2004-12-17 03:55:31.000000000 -0800
+@@ -487,7 +487,7 @@
+ BOOL tdb_is_new = False;
+
+ /* use the old database if present */
+- tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb"));
++ tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb"));
+ if (!tdbfile) {
+ DEBUG(0, ("idmap_init: out of memory!\n"));
+ return NT_STATUS_NO_MEMORY;
+diff -uNr samba-3.0.10.orig/source/smbd/lanman.c samba-3.0.10/source/smbd/lanman.c
+--- samba-3.0.10.orig/source/smbd/lanman.c 2004-12-17 03:50:10.000000000 -0800
++++ samba-3.0.10/source/smbd/lanman.c 2004-12-17 03:55:31.000000000 -0800
+@@ -969,9 +969,9 @@
+ BOOL local_list_only;
+ int i;
+
+- lines = file_lines_load(lock_path(SERVER_LIST), NULL);
++ lines = file_lines_load(cache_path(SERVER_LIST), NULL);
+ if (!lines) {
+- DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
++ DEBUG(4,("Can't open %s - %s\n",cache_path(SERVER_LIST),strerror(errno)));
+ return(0);
+ }
+
+diff -uNr samba-3.0.10.orig/source/utils/net_idmap.c samba-3.0.10/source/utils/net_idmap.c
+--- samba-3.0.10.orig/source/utils/net_idmap.c 2004-12-17 03:50:10.000000000 -0800
++++ samba-3.0.10/source/utils/net_idmap.c 2004-12-17 03:55:32.000000000 -0800
+@@ -126,7 +126,7 @@
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+- tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb"));
++ tdbfile = SMB_STRDUP(state_path("winbindd_idmap.tdb"));
+ if (!tdbfile) {
+ DEBUG(0, ("idmap_init: out of memory!\n"));
+ return NT_STATUS_NO_MEMORY;
+diff -uNr samba-3.0.10.orig/source/wrepld/process.c samba-3.0.10/source/wrepld/process.c
+--- samba-3.0.10.orig/source/wrepld/process.c 2004-12-17 03:50:10.000000000 -0800
++++ samba-3.0.10/source/wrepld/process.c 2004-12-17 03:55:32.000000000 -0800
+@@ -197,7 +197,7 @@
+ {
+ TDB_CONTEXT *tdb;
+
+- tdb = tdb_open_log(lock_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
++ tdb = tdb_open_log(state_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
+ if (!tdb) {
+ DEBUG(2,("get_our_last_id: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
+ return;
+@@ -489,7 +489,7 @@
+ }
+
+
+- tdb = tdb_open_log(lock_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
++ tdb = tdb_open_log(state_path(WINS_LIST), 0, TDB_DEFAULT, O_RDONLY, 0600);
+ if (!tdb) {
+ DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
+ return;
+diff -uNr samba-3.0.11.orig/source/printing/nt_printing.c samba-3.0.11/source/printing/nt_printing.c
+--- samba-3.0.11.orig/source/printing/nt_printing.c 2005-03-23 02:51:08.000000000 -0800
++++ samba-3.0.11/source/printing/nt_printing.c 2005-03-23 02:54:33.000000000 -0800
+@@ -2065,7 +2065,7 @@
+ close_all_print_db();
+
+ if (geteuid() == 0) {
+- pstrcpy(printdb_path, lock_path("printing/"));
++ pstrcpy(printdb_path, cache_path("printing/"));
+ pstrcat(printdb_path, sharename);
+ pstrcat(printdb_path, ".tdb");
+
diff --git a/packaging/Debian/debian-sarge/patches/installswat.sh.patch b/packaging/Debian/debian-sarge/patches/installswat.sh.patch
new file mode 100644
index 0000000000..81e3dcd444
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/installswat.sh.patch
@@ -0,0 +1,15 @@
+--- 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
+@@ -114,7 +114,11 @@
+
+ # Install Using Samba book (but only if it is there)
+
+-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
+
+ # Create directories
+
diff --git a/packaging/Debian/debian-sarge/patches/make-distclean.patch b/packaging/Debian/debian-sarge/patches/make-distclean.patch
new file mode 100644
index 0000000000..e859575290
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/make-distclean.patch
@@ -0,0 +1,27 @@
+diff -uNr samba-3.0.7.orig/source/Makefile.in samba-3.0.7/source/Makefile.in
+--- samba-3.0.7.orig/source/Makefile.in 2004-10-25 10:06:08.000000000 -0700
++++ samba-3.0.7/source/Makefile.in 2004-10-25 10:03:31.000000000 -0700
+@@ -1371,6 +1371,7 @@
+
+ python_clean:
+ @-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
++ @-rm -rf build/
+
+ # revert to the previously installed version
+ revert:
+@@ -1437,6 +1438,7 @@
+ @rm -f include/proto.h include/build_env.h include/wrepld_proto.h \
+ nsswitch/winbindd_proto.h web/swat_proto.h \
+ client/client_proto.h utils/net_proto.h \
++ utils/ntlm_auth_proto.h \
+ smbd/build_options.c
+
+ MKPROTO_SH = $(srcdir)/script/mkproto.sh
+@@ -1512,6 +1514,7 @@
+
+ distclean: realclean
+ -rm -f include/stamp-h
++ -rm -f script/gen-8bit-gap.sh smbadduser
+ -rm -f include/config.h Makefile
+ -rm -f config.status config.cache so_locations
+ -rm -rf .deps TAGS
diff --git a/packaging/Debian/debian-stable/patches/nmbd-signalling.patch b/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch
index ca04cce3bf..ca04cce3bf 100644
--- a/packaging/Debian/debian-stable/patches/nmbd-signalling.patch
+++ b/packaging/Debian/debian-sarge/patches/nmbd-signalling.patch
diff --git a/packaging/Debian/debian-sarge/patches/non-linux-ports.patch b/packaging/Debian/debian-sarge/patches/non-linux-ports.patch
new file mode 100644
index 0000000000..ac2ee1dcf5
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/non-linux-ports.patch
@@ -0,0 +1,62 @@
+diff -uNr samba-3.0.11.orig/source/configure.in samba-3.0.11/source/configure.in
+--- samba-3.0.11.orig/source/configure.in 2005-03-23 02:39:11.000000000 -0800
++++ samba-3.0.11/source/configure.in 2005-03-23 02:43:01.000000000 -0800
+@@ -573,6 +573,15 @@
+ fi
+ ;;
+
++# Systems with LFS support.
++#
++ gnu* | k*bsd*-gnu)
++ CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++ AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
++ AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
++ AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
++ ;;
++
+ # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
+ #
+ *linux*)
+@@ -1040,7 +1049,7 @@
+ #
+ #
+ case "$host_os" in
+- *linux*)
++ linux*-gnu* | gnu* | k*bsd*-gnu)
+ # glibc <= 2.3.2 has a broken getgrouplist
+ AC_TRY_RUN([
+ #include <unistd.h>
+@@ -1172,7 +1181,10 @@
+
+ # and these are for particular systems
+ case "$host_os" in
+- *linux*) AC_DEFINE(LINUX,1,[Whether the host os is linux])
++ linux*-gnu* | gnu* | k*bsd*-gnu)
++ case "$host_os" in linux*)
++ AC_DEFINE(LINUX,1,[Whether the host os is linux]) ;;
++ esac
+ BLDSHARED="true"
+ if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
+ LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
+@@ -4044,7 +4056,7 @@
+ AC_MSG_RESULT(yes);
+
+ case "$host_os" in
+- *linux*)
++ linux*-gnu* | gnu* | k*bsd*-gnu)
+ AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
+ AC_TRY_LINK([#include <sys/sendfile.h>],
+ [\
+@@ -4307,10 +4319,10 @@
+ WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
+
+ case "$host_os" in
+- *linux*)
++ linux*-gnu* | gnu* | k*bsd*-gnu)
+ WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
+ ;;
+- *freebsd[[5-9]]*)
++ freebsd5*|*freebsd[[6-9]]*)
+ # FreeBSD winbind client is implemented as a wrapper around
+ # the Linux version.
+ WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
diff --git a/packaging/Debian/debian-sarge/patches/samba.patch b/packaging/Debian/debian-sarge/patches/samba.patch
new file mode 100644
index 0000000000..f4c8ca8742
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/samba.patch
@@ -0,0 +1,64 @@
+diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source/client/smbmount.c
+--- samba-3.0.0beta1.orig/source/client/smbmount.c 2003-06-07 12:57:32.000000000 -0500
++++ samba-3.0.0beta1/source/client/smbmount.c 2003-06-30 20:12:22.000000000 -0500
+@@ -766,7 +766,7 @@
+ *lp = 0;
+ pstrcpy(password,lp+1);
+ got_pass = True;
+- memset(strchr_m(opteq+1,'%')+1,'X',strlen(password));
++ memset(strchr_m(opteq+1,'%')+1,'\0',strlen(password));
+ }
+ if ((lp=strchr_m(username,'/'))) {
+ *lp = 0;
+@@ -776,7 +776,7 @@
+ !strcmp(opts, "password")) {
+ pstrcpy(password,opteq+1);
+ got_pass = True;
+- memset(opteq+1,'X',strlen(password));
++ memset(opteq+1,'\0',strlen(password));
+ } else if(!strcmp(opts, "credentials")) {
+ pstrcpy(credentials,opteq+1);
+ } else if(!strcmp(opts, "netbiosname")) {
+@@ -890,7 +902,7 @@
+ *p = 0;
+ pstrcpy(password,p+1);
+ got_pass = True;
+- memset(strchr_m(getenv("USER"),'%')+1,'X',strlen(password));
++ memset(strchr_m(getenv("USER"),'%')+1,'\0',strlen(password));
+ }
+ strupper_m(username);
+ }
+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
+- 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)
++# if [ $p2 = smbmount ]; then
++# if [ ! -d $DESTDIR/sbin ]; then
++# mkdir $DESTDIR/sbin
++# fi
++# ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
++# fi
+ done
+
+
diff --git a/packaging/Debian/debian-stable/patches/smbclient-pager.patch b/packaging/Debian/debian-sarge/patches/smbclient-pager.patch
index 3ee85d4118..3ee85d4118 100644
--- a/packaging/Debian/debian-stable/patches/smbclient-pager.patch
+++ b/packaging/Debian/debian-sarge/patches/smbclient-pager.patch
diff --git a/packaging/Debian/debian-stable/patches/smbclient-tar.patch.unused b/packaging/Debian/debian-sarge/patches/smbclient-tar.patch.unused
index e2a4c3ce2c..e2a4c3ce2c 100644
--- a/packaging/Debian/debian-stable/patches/smbclient-tar.patch.unused
+++ b/packaging/Debian/debian-sarge/patches/smbclient-tar.patch.unused
diff --git a/packaging/Debian/debian-stable/patches/smbmount-mtab-flags.patch b/packaging/Debian/debian-sarge/patches/smbmount-mtab-flags.patch
index dac999dd63..dac999dd63 100644
--- a/packaging/Debian/debian-stable/patches/smbmount-mtab-flags.patch
+++ b/packaging/Debian/debian-sarge/patches/smbmount-mtab-flags.patch
diff --git a/packaging/Debian/debian-sarge/patches/smbmount-nomtab.patch b/packaging/Debian/debian-sarge/patches/smbmount-nomtab.patch
new file mode 100644
index 0000000000..f7e9ce4f69
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/smbmount-nomtab.patch
@@ -0,0 +1,160 @@
+diff -uNr samba-3.0alpha22.orig/source/client/smbmnt.c samba-3.0alpha22/source/client/smbmnt.c
+--- samba-3.0alpha22.orig/source/client/smbmnt.c 2003-03-15 12:11:39.000000000 -0600
++++ samba-3.0alpha22/source/client/smbmnt.c 2003-03-15 12:11:49.000000000 -0600
+@@ -28,6 +28,7 @@
+ static uid_t mount_uid;
+ static gid_t mount_gid;
+ static int mount_ro;
++static int no_mtab;
+ static unsigned mount_fmask;
+ static unsigned mount_dmask;
+ static int user_mount;
+@@ -40,6 +41,7 @@
+ printf("Usage: smbmnt mount-point [options]\n");
+ printf("Version %s\n\n",VERSION);
+ printf("-s share share name on server\n"
++ "-n don't update /etc/mtab\n"
+ "-r mount read-only\n"
+ "-u uid mount as uid\n"
+ "-g gid mount as gid\n"
+@@ -54,7 +56,7 @@
+ {
+ int opt;
+
+- while ((opt = getopt (argc, argv, "s:u:g:rf:d:o:")) != EOF)
++ while ((opt = getopt (argc, argv, "s:u:g:nrf:d:o:")) != EOF)
+ {
+ switch (opt)
+ {
+@@ -71,6 +73,9 @@
+ mount_gid = strtol(optarg, NULL, 0);
+ }
+ break;
++ case 'n':
++ no_mtab = 1;
++ break;
+ case 'r':
+ mount_ro = 1;
+ break;
+@@ -274,36 +279,38 @@
+ return -1;
+ }
+
+- if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
+- {
+- fprintf(stderr, "Can't get "MOUNTED"~ lock file");
+- return 1;
+- }
+- close(fd);
++ if (!no_mtab) {
++ if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
++ {
++ fprintf(stderr, "Can't get "MOUNTED"~ lock file");
++ return 1;
++ }
++ close(fd);
+
+- if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
+- {
+- fprintf(stderr, "Can't open " MOUNTED);
+- return 1;
+- }
++ if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
++ {
++ fprintf(stderr, "Can't open " MOUNTED);
++ return 1;
++ }
+
+- if (addmntent(mtab, &ment) == 1)
+- {
+- fprintf(stderr, "Can't write mount entry");
+- return 1;
+- }
+- if (fchmod(fileno(mtab), 0644) == -1)
+- {
+- fprintf(stderr, "Can't set perms on "MOUNTED);
+- return 1;
+- }
+- endmntent(mtab);
++ if (addmntent(mtab, &ment) == 1)
++ {
++ fprintf(stderr, "Can't write mount entry");
++ return 1;
++ }
++ if (fchmod(fileno(mtab), 0644) == -1)
++ {
++ fprintf(stderr, "Can't set perms on "MOUNTED);
++ return 1;
++ }
++ endmntent(mtab);
+
+- if (unlink(MOUNTED"~") == -1)
+- {
+- fprintf(stderr, "Can't remove "MOUNTED"~");
+- return 1;
+- }
++ if (unlink(MOUNTED"~") == -1)
++ {
++ fprintf(stderr, "Can't remove "MOUNTED"~");
++ return 1;
++ }
++ }
+
+ return 0;
+ }
+diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source/client/smbmount.c
+--- samba-3.0alpha22.orig/source/client/smbmount.c 2003-03-15 12:04:29.000000000 -0600
++++ samba-3.0alpha22/source/client/smbmount.c 2003-03-15 12:15:10.000000000 -0600
+@@ -48,6 +48,7 @@
+ static int mount_ro;
+ static unsigned mount_fmask;
+ static unsigned mount_dmask;
++static BOOL no_mtab = False;
+ static BOOL use_kerberos;
+ /* TODO: Add code to detect smbfs version in kernel */
+ static BOOL status32_smbfs = False;
+@@ -273,6 +274,9 @@
+ return;
+ }
+
++ if (no_mtab)
++ return;
++
+ if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
+ DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid()));
+ return;
+@@ -467,6 +471,9 @@
+ args[i++] = "-s";
+ args[i++] = svc2;
+
++ if (no_mtab) {
++ args[i++] = "-n";
++ }
+ if (mount_ro) {
+ args[i++] = "-r";
+ }
+@@ -662,7 +669,7 @@
+ ****************************************************************************/
+ static void usage(void)
+ {
+- printf("Usage: mount.smbfs service mountpoint [-o options,...]\n");
++ printf("Usage: mount.smbfs service mountpoint [-n] [-o options,...]\n");
+
+ printf("Version %s\n\n",VERSION);
+
+@@ -740,8 +747,13 @@
+ argc -= 2;
+ argv += 2;
+
+- opt = getopt(argc, argv, "o:");
+- if(opt != 'o') {
++ opt = getopt(argc, argv, "no:");
++ if (opt == 'n') {
++ DEBUG(3,("No mtab!\n"));
++ no_mtab = True;
++ opt = getopt(argc, argv, "o:");
++ }
++ if (opt != 'o') {
+ return;
+ }
+
diff --git a/packaging/Debian/debian-sarge/patches/smbstatus-locking.patch b/packaging/Debian/debian-sarge/patches/smbstatus-locking.patch
new file mode 100644
index 0000000000..db7fccc68b
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/smbstatus-locking.patch
@@ -0,0 +1,20 @@
+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
+@@ -686,6 +686,16 @@
+ if (!shares_only) {
+ int ret;
+
++ tdb = tdb_open_log(lock_path("locking.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
++
++ if (!tdb) {
++ d_printf("%s not initialised\n", lock_path("locking.tdb"));
++ d_printf("This is normal if an SMB client has never connected to your server.\n");
++ exit(0);
++ } else {
++ tdb_close(tdb);
++ }
++
+ if (!locking_init(1)) {
+ d_printf("Can't initialise locking module - exiting\n");
+ exit(1);
diff --git a/packaging/Debian/debian-sarge/patches/undefined-symbols.patch b/packaging/Debian/debian-sarge/patches/undefined-symbols.patch
new file mode 100644
index 0000000000..e9a376ea9b
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/undefined-symbols.patch
@@ -0,0 +1,22 @@
+diff -uNr samba-3.0.11.orig/source/Makefile.in samba-3.0.11/source/Makefile.in
+--- samba-3.0.11.orig/source/Makefile.in 2005-03-23 02:40:40.000000000 -0800
++++ samba-3.0.11/source/Makefile.in 2005-03-23 02:48:59.000000000 -0800
+@@ -631,7 +631,8 @@
+ $(RPC_ECHO_OBJ) $(SMBLDAP_OBJ) $(IDMAP_OBJ) libsmb/spnego.o $(PASSCHANGE_OBJ)
+
+ WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
+- $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
++ $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
++ $(SECRETS_OBJ)
+
+ WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=.@PICSUFFIX@)
+
+@@ -997,7 +998,7 @@
+
+ bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
+ @echo Linking libsmbclient shared library $@
+- @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
++ @$(SHLD) $(LDSHFLAGS) -Wl,-z,defs -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
+ $(KRB5LIBS) $(LDAP_LIBS) \
+ @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
+
diff --git a/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch b/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch
new file mode 100644
index 0000000000..0f35598297
--- /dev/null
+++ b/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch
@@ -0,0 +1,37 @@
+Author: Lars Mueller <lmuelle at SuSE dot de>
+Subject: Non integer SAMBA_VERSION_RELEASE breaks samba-vscan build
+Bugzilla: bugzilla.Samba.org #2618
+
+--- samba-3.0.20b/source/script/mkversion.sh
++++ samba-3.0.20b/source/script/mkversion.sh 2005-10-22 12:56:30
+@@ -17,6 +17,7 @@
+ SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p' $SOURCE_DIR$VERSION_FILE`
+ SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE`
+ SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
++SAMBA_VERSION_RELEASE_SUFFIX=`sed -n 's/^SAMBA_VERSION_RELEASE_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE`
+
+ SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
+
+@@ -31,9 +32,10 @@
+ echo "#define SAMBA_VERSION_MAJOR ${SAMBA_VERSION_MAJOR}" >> $OUTPUT_FILE
+ echo "#define SAMBA_VERSION_MINOR ${SAMBA_VERSION_MINOR}" >> $OUTPUT_FILE
+ echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE
++echo "#define SAMBA_VERSION_RELEASE_SUFFIX ${SAMBA_VERSION_RELEASE_SUFFIX}" >> $OUTPUT_FILE
+
+
+-SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}"
++SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}${SAMBA_VERSION_RELEASE_SUFFIX}"
+
+
+ if test -n "${SAMBA_VERSION_PRE_RELEASE}";then
+--- samba-3.0.20b/source/VERSION
++++ samba-3.0.20b/source/VERSION 2005-10-22 12:56:30
+@@ -19,7 +19,8 @@
+ ########################################################
+ SAMBA_VERSION_MAJOR=3
+ SAMBA_VERSION_MINOR=0
+ SAMBA_VERSION_RELEASE=20
++SAMBA_VERSION_RELEASE_SUFFIX=b
+
+ ########################################################
+ # For 'pre' releases the version will be #
diff --git a/packaging/Debian/debian-stable/po/POTFILES.in b/packaging/Debian/debian-sarge/po/POTFILES.in
index 95a7ea8150..95a7ea8150 100644
--- a/packaging/Debian/debian-stable/po/POTFILES.in
+++ b/packaging/Debian/debian-sarge/po/POTFILES.in
diff --git a/packaging/Debian/debian-sarge/po/ca.po b/packaging/Debian/debian-sarge/po/ca.po
new file mode 100644
index 0000000000..c3cdc11aea
--- /dev/null
+++ b/packaging/Debian/debian-sarge/po/ca.po
@@ -0,0 +1,291 @@
+# samba (debconf) translation to Catalan.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Aleix Badia i Bosch <abadia@ica.es> 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba_3.0.0beta2-1_templates\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2004-03-13 21:32-0500\n"
+"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
+"Language-Team: Debian L10n Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Joc de caràcters pel sistema de fitxers de 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 ""
+"El fitxer smb.conf actual té configurat un \"character set\". En la versió "
+"3.0 de Samba, aquesta opció es reemplaça per l'opció \"unix charset\". "
+"Especifiqueu el joc de caràcters que voleu utilitzar per a aquesta nova "
+"opció que controla el mode que el Samba interpreta els noms de fitxers del "
+"sistema de fitxers."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Si deixeu aquesta opció en blanc no es modificarà el smb.conf."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Joc de caràcters pels clients 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 ""
+"El fitxer smb.conf actual té configurat un \"client code page\". En la "
+"versió 3.0 de Samba, aquesta opció es reemplaça per l'opció \"dos charset\". "
+"L'opció per defecte és suficient en la majoria del casos. Recordeu que "
+"aquesta opció no és necessària pel suport dels clients de Windows, només és "
+"pels clients de DOS. Si deixeu aquesta opció en blanc no es canviarà el smb."
+"conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"Voleu modificar el smb.conf perquè utilitza els paràmetres de configuració "
+"del WINS del DHCP?"
+
+#. 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 ""
+"Si el vostre ordinador obté la informació referent a la IP a través d'un "
+"servidor de DHCP, aquest també li donarà informació sobre els servidors de "
+"WINS (\"servidors de nom de NetBIOS\") presents a la xarxa. Aquesta opció "
+"precisa d'una modificació del fitxer smb.conf per tal que els paràmetres de "
+"WINS obtinguts a través del DHCP s'obtinguin a través de la lectura de /etc/"
+"samba/dhcp.conf"
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Per beneficiar-vos d'aquesta característica cal que tingueu instal·lat el "
+"paquet dhcp3-client."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Voleu configurar el smb.conf a través del debconf?"
+
+#. 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 ""
+"La resta de la configuració del Samba tracta amb qüestions que afecten els "
+"paràmetres del fitxer de configuració els programes de Samba /etc/samba/smb."
+"conf. La versió actual del smb.conf conté una línia 'include' o una opció "
+"que abarca múltiples línies que podria confondre al debconf i precisa de la "
+"seva edició manual per poder-lo fer funcionar de nou."
+
+#. 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 ""
+"Si no utilitzeu el debconf per configurar el smb.conf, haureu de gestionar "
+"manualment qualsevol canvi de la configuració, i no us podreu beneficiar de "
+"les millores. La seva utilització és recomenable en cas que sigui possible."
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Grup de treball/nom del domini?"
+
+#. 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 ""
+"Aquesta opció defineix en quin grup de treball apareixerà el vostre servidor "
+"quan ho consultin els clients. Recordeu que aquest paràmetre també controla "
+"el nom de domini utilitzat pel paràmetre de configuració security=domain."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Voleu utilitzar l'encriptació de contrasenyes?"
+
+#. 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 ""
+"Els clients de Windows més recents es comuniquen amb els servidors de Samba "
+"utilitzant contrasenyes encriptades. Si voleu utilitzar contrasenyes amb "
+"text pla, haureu de modificar el vostre registre de Windows. És recomanable "
+"utilitzar contrasenyes encriptades. Si ho feu, assegureu-vos de tenir un "
+"fitxer /etc/samba/smbpasswd vàlid i que hi especifiqueu la contrasenya de "
+"cada usuari utilitzant l'ordre smbpasswd."
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr ""
+"Es crea la base de dades de contrasenyes de 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 ""
+"El Samba s'ha de configurar perquè utilitzi contrasenyes encriptades per tal "
+"que sigui compatible amb la majoria de versions de Windows per defecte. Això "
+"implica que les contrasenyes d'usuari s'emmagatzemin a un fitxer diferent "
+"del /etc/passwd. Aquest fitxer es pot crear automàticament, però les "
+"contrasenyes s'han d'afegir manualment (per vós o per l'usuari) executant "
+"l'ordre smbpasswd i cal que us organitzeu per tenir-lo actualitzat en un "
+"futur. Si no el creeu, haureu de reconfigurar el Samba (i probablement els "
+"vostres ordinadors clients) per tal que utilitzin contrasenyes de text pla. "
+"Per més informació feu una ullada a /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html del paquet samba-doc."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "S'han desplaçat els fitxers de registre de 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 ""
+"Els fitxers de registre dels dos dimonis de Samba (nmbd i smbd) es desen a /"
+"var/log/samba des de la primera versió dels paquets de Samba 2.2 per Debian. "
+"Els noms dels fitxers són, respectivament, log.nmbd i 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 ""
+"Els fitxers de registre antics que estaven a /var/log/ es desplacen a la "
+"nova ubicació."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "L'execució del nmbd a través del inetd ja no estarà suportada."
+
+#. 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 ""
+"El vostre sistema estava prèviament configurat perquè inicies el nmbd i el "
+"smbd a través del inetd. A partir de la versió 2.999+3.0alpha20-4 el nmbd no "
+"es pot iniciar a través del inetd. Si heu modificat la seqüència "
+"d'arrencada /etc/init.d/samba, l'haureu de modificar manualment per tal que "
+"s'iniciï com a dimoni."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "dimonis, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Com voleu executar el 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 ""
+"El dimoni de Samba pot executar-se com un dimoni normal o des del inetd. És "
+"recomanable executar-lo com un dimoni."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Es desplaça etc/samba/smbpasswd a /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 ""
+"El Samba 3.0 introdueix una interfície de base de dades de SAM més nova i "
+"completa que reemplaça el fitxer /etc/samba/smbpassd. Voleu que es migri el "
+"fitxer smbpasswd a /var/lib/samba/passdb.tdb? Si la vostra intenció és "
+"utilitzar un altre pdb (ex, LDAP), haurieu de respondre 'no' aquí."
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "El vostre smb.conf es reescriurà"
+
+#. 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 ""
+"El SWAT reescriurà el vostre fitxer smb.conf. Reorganitzarà les entrades i "
+"suprimirà els comentaris i les opcions include= i copy=. Si teniu un smb."
+"conf molt elaborat feu una còpia de seguretat o no utilitzeu el SWAT."
diff --git a/packaging/Debian/debian-sarge/po/cs.po b/packaging/Debian/debian-sarge/po/cs.po
new file mode 100644
index 0000000000..88e87c4418
--- /dev/null
+++ b/packaging/Debian/debian-sarge/po/cs.po
@@ -0,0 +1,289 @@
+#
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2004-03-05 12:04+0100\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <provoz@debian.cz>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Znaková sada pro unixový souborový systém"
+
+#. 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 ""
+"Momentálnì máte ve svém smb.conf nastavenou volbu \"character set\". V Sambì "
+"3.0 je tato volba nahrazena volbou \"unix charset\". Zadejte, prosím, "
+"znakovou sadu, kterou chcete pou¾ít pro novou volbu. Tímto nastavíte, jak má "
+"Samba interpretovat názvy souborù v souborovém systému."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Pokud nezadáte nic, vá¹ smb.conf se nezmìní."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Znaková sada pro DOSové klienty."
+
+#. 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 ""
+"Momentálnì máte ve svém smb.conf nastavenou volbu \"client code page\". V "
+"Sambì 3.0 je tato volba nahrazena volbou \"dos charset\". Zadejte, prosím, "
+"znakovou sadu, kterou chcete pou¾ít pro novou volbu. Ve vìt¹inì pøípadù "
+"postaèuje implicitní hodnota. Tato volba není potøebná pro Windowsové "
+"klienty, pouze pro DOSové klienty. Pokud nezadáte nic, vá¹ smb.conf se "
+"nezmìní."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Upravit smb.conf, aby pou¾íval WINS nastavení z DHCP?"
+
+#. 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 ""
+"Pokud vá¹ poèítaè získává IP adresu z DHCP serveru, mù¾ete vám tento server "
+"nabízet také informace o WINS serverech (jmenných serverech NetBIOSu), které "
+"jsou dostupné ve va¹í síti. To vy¾aduje zásah do souboru smb.conf, kde se "
+"nastaví, aby se informace o WINS serverech naèítaly ze souboru /etc/samba/"
+"dhcp.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Pro vyu¾ití této vlastnosti musíte mít nainstalovaný balík dhcp3-client."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Konfigurovat smb.conf pøes debconf?"
+
+#. 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 ""
+"Zbytek konfigurace Samby se zabývá otázkami, které mìní parametry v /etc/"
+"samba/smb.conf, co¾ je soubor pou¾ívaný pro nastavení programù nmbd a smbd "
+"(dohromady tvoøí Sambu). Vá¹ stávající smb.conf obsahuje øádek 'include' "
+"nebo volbu, která se táhne pøes více øádkù, co¾ mù¾e zmást debconf a mù¾e "
+"zpùsobit, ¾e pro znovuzprovoznìní Samby budete muset upravit smb.conf ruènì."
+
+#. 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 ""
+"Pokud pro konfiguraci smb.conf nepou¾íváte debconf, budete muset zvládnout "
+"v¹echna nastavení sami a nebudete moci vyu¾ívat výhod pravidelných vylep¹ení "
+"tohoto souboru. Z tohoto pohledu je pou¾ití debconf doporuèená volba."
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Skupina/Doménové jméno?"
+
+#. 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 ""
+"Zde mù¾ete zadat jméno skupiny, do které má server patøit. Tímto parametrem "
+"také nastavíte doménové jméno pou¾ívané s nastavením security=domain."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Pou¾ít ¹ifrování hesel?"
+
+#. 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 ""
+"Souèasní windowsoví klienti pou¾ívají pøi komunikaci se SMB servery "
+"za¹ifrovaná hesla. Pokud chcete pou¾ít hesla neza¹ifrovaná, musíte zmìnit "
+"jeden parametr v registrech systému Windows. Doporuèujeme pou¾ívat "
+"za¹ifrovaná hesla. Hesla mù¾ete jednotlivým u¾ivatelùm pøidat pøíkazem "
+"smbpasswd."
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Vytvoøit databázi hesel /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 ""
+"Pro dosa¾ení co nejvìt¹í kompatibility s vìt¹inou verzí systému Windows musí "
+"být Samba nastavena, aby pou¾ívala ¹ifrovaná hesla. To vy¾aduje, aby byla "
+"hesla uchována mimo souboru /etc/passwd. Po¾adovaný soubor mù¾ete nechat "
+"vytvoøit automaticky, ale hesla do nìj musí být pøidána ruènì programem "
+"smbpasswd (buï vámi, nebo u¾ivatelem) a také jej musíte udr¾ovat "
+"aktualizovaný. Pokud jej nevytvoøíte, budete muset nastavit Sambu (a "
+"pravdìpodobnì také klienty), aby pou¾ívala ne¹ifrovaná hesla. Podrobnosti "
+"naleznete v /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html z balíku samba-"
+"doc."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Logovací soubory Samby se pøesunuly."
+
+#. 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 ""
+"Od prvních debianích balíèkù Samby verze 2.2 jsou logovací soubory obou "
+"serverù (nmbd a smbd) umístìny ve /var/log/samba/. Názvy pøíslu¹ných souborù "
+"jsou log.nmbd a 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 ""
+"Staré soubory z adresáøe /var/log/ budou pøesunuty na nové místo automaticky."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Spou¹tìní nmbd z inetd ji¾ není podporováno"
+
+#. 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 ""
+"Vá¹ systém byl pùvodnì nastaven, aby spou¹tìl nmbd a smbd z inetd. Od verze "
+"2.999+3.0.alpha20-4 ji¾ nelze nmbd spou¹tìt z inetd. Pokud jste si upravili "
+"startovací skript /etc/init.d/samba, mo¾ná jej nyní budete muset upravit pro "
+"korektní start nmbd."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "démoni, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Jak chcete spou¹tìt Sambu?"
+
+#. 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 ""
+"Server Samby smbd mù¾e bì¾et jako obyèejný démon (doporuèeno), nebo se mù¾e "
+"spou¹tìt z inetd."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Pøesunout /etc/samba/smbpasswd do /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 zavedla nové, kompletnìj¹í rozhraní k SAM databázi, je¾ pøekonává "
+"pùvodní soubor /etc/samba/smbpasswd. Chcete pøevést stávající soubor "
+"smbpasswd na /var/lib/samba/passwd.tdb? Pokud plánujete pou¾ít jinou pdb "
+"databázi (tøeba LDAP), mìli byste odponìdìt 'ne'."
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Vá¹ smb.conf bude pøepsán!"
+
+#. 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 pøepí¹e vá¹ soubor smb.conf. Mj. pøeskládá polo¾ky a sma¾e v¹echny "
+"komentáøe a volby include= a copy=. Pokud máte pracnì odladìný smb.conf, tak "
+"si jej zazálohujte, nebo nepou¾ívejte SWAT!"
diff --git a/packaging/Debian/debian-sarge/po/da.po b/packaging/Debian/debian-sarge/po/da.po
new file mode 100644
index 0000000000..5d0aa55114
--- /dev/null
+++ b/packaging/Debian/debian-sarge/po/da.po
@@ -0,0 +1,290 @@
+# translation of da.po to Danish
+# translation of samba Debian debconf template to Danish
+# Claus Hindsgaul <claus_h@image.dk>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: da\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2004-02-15 17:23+0100\n"
+"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Tegnsæt til Unix-filsystemet"
+
+#. 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 ""
+"Du har en \"character set\"-indstilling i din smb.conf. I Samba 3.0 "
+"erstattes denne af en ny indstilling, \"unix charset\". Angiv det "
+"tegnsæt, du ønsker at bruge i denne nye indstilling, som styrer "
+"hvordan Samba tolker filnavne på systemet."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Hvis du ikke skriver noget her, vil din smb.conf ikke blive ændret."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Tegnsæt til DOS-klienter"
+
+#. 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 ""
+"Du har en \"client code page\"-indstilling i din smb.conf. I Samba "
+"3.0 erstattes denne af en ny indstilling, \"dos charset\". Angiv det "
+"tegnsæt, du ønsker at bruge i denne nye indstilling. I de fleste tilfælde "
+"vil det forvalgte være nok. Bemærk at denne indstilling ikke kræves "
+"for at understøtte Windows-klienter; den gælder kun DOS-klienter. Hvis "
+"du ikke skriver noget her, vil smb.conf ikke blive ændret."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Ret smb.conf, så den benytter WINS-indstillinger fra DHCP?"
+
+#. 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 ""
+"Hvis din computer får IP-adresseoplysninger fra en DHCP-server på "
+"netværket, kan DHCP-serveren også give oplysninger om WINS-servere "
+"(\"NetBIOS navneservere\") på netværket. Dette kræver en ændring i din "
+"smb.conf-fil, så WINS-indstillingerne fra DHCP-serveren automatisk "
+"indlæses fra /etc/samba/dhcp.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Ud skal have pakken dhcp3-client installeret for at kunne udnytte denne "
+"funktion."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Sæt smb.conf op med debconf?"
+
+#. 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 ""
+"Resten af Samba-opsætningen drejer sig om spørgsmål om indstillingerne "
+"i filen /etc/samba/smb.conf, som benyttes til at sætte Samba-programmerne "
+"(nmbd og smbd) op. Din nuværende smb.conf indeholder en 'include'-linje "
+"eller en indstilling, der fylder flere linjer, hvilket kan forvirre "
+"debconf og kræve at du redigerer din smb.conf selv for at få Samba til "
+"at fungere igen."
+
+#. 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 ""
+"Hvis du ikke bruger debconf til at sætte smb.conf op, må du selv håndtere "
+"ændringer i opsætningen, og vil ikke kunne drage nytte af de løbende "
+"forbedringer i opsætningen. Derfor anbefales brugen af debconf, hvis "
+"det er muligt."
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Navn på arbejdsgruppe/domæne?"
+
+#. 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 ""
+"Dette styrer hvilken arbejdsgruppe din server til tilhøre, når den bliver "
+"spurgt af klienter. Bemærk at dette også styrer det domænenavn, der bruges "
+"med indstillingen \"security=domain\"."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Kryptér adgangskoder?"
+
+#. 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 ""
+"Nyere Windows-klienter kommunikerer med SMB-servere med krypterede "
+"adgangskoder. Hvis du vil bruge adgangkoder i klar tekst, bliver du "
+"nødt til at ændre en indstilling i Windows' registreringsdatabase. Det "
+"anbefales at du bruger krypterede adgangskoder. Hvis du gør, så sørg for "
+"at du har en gyldig /etc/samba/smbpasswd-fil og at du her angiver "
+"adgangskoder for hver bruger med kommandoen smbpasswd."
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Opret samba-adgangskodedatabasen /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 ""
+"For at være kompatibel med standardindstillingerne i de fleste udgaver af "
+"Windows, skal Samba være sat op til at benytte krypterede adgangskoder. "
+"Det kræver at brugernes adgangskoder gemmes i en anden fil end /etc/passwd. "
+"Denne fil kan oprettes automatisk, men adgangskoderne er nødt til at blive "
+"tilføjet manuelt (af dig eller af brugeren) ved at køre smbpasswd, og du "
+"skal holde den opdateret i fremtiden. Hvis du ikke opretter den, er du nødt "
+"til at sætte samba (og sikkert også dine klientmaskiner) op til at benytte "
+"adgangskoder i klar tekst. Se /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
+"i pakken samba-doc for flere detaljer."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Sambas logfiler er flyttet."
+
+#. 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 ""
+"Fra og med de første Samba 2.2-Debianpakker, bliver begge Samba-dæmonernes "
+"(nmbd og smbd) logfiler gemt i /var/log/samba/. Filernes navne er log.nmbd "
+"og 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 ""
+"De gamle logfiler, der var i /var/log vil blive flyttet til den nye placering "
+"for dig."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Kørsel af nmbd fra inetd understøttes ikke længere."
+
+#. 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 ""
+"Dit system var tidligere sat op til at starte nmbd og smbd fra inetd. "
+"Fra og med version 2.999+3.0.alpha20-4 kan nmbd ikke længere startes med inetd. "
+"Hvis du har rettet din opstartsskript /etc/init.d/samba, kan du være nødt "
+"til at justere det manuelt nu, så nmbd bliver startet."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "dæmoner, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Hvordan skal Samba køres?"
+
+#. 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-dæmonen smbd kan køre som en almindelig dæmon eller fra inetd. Det "
+"anbefales at køre den som dæmon."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Flyt /etc/samba/smbpasswd til /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 har en nyere og mere komplet SAM-databasegrænseflade, som "
+"erstatter filen /etc/samba/smbpasswd. Vil du have din eksisterende "
+"smbpasswd-fil overført til /var/lib/samba/passdb.tdb?`Hvis du i stedet "
+"planlægger at bruge en anden pdb-håndtering (f.eks. LDAP), bør du afvise "
+"dette."
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Din smb.conf vil blive omskrevet!"
+
+#. 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 vil overskrive din smb.conf-fil. Den vil flytte rundt på linjerne "
+"og slette alle kommentarer, og linjer med \"include=\" og \"copy=\". "
+"Hvis du har brugt tid på at lave din egen smb.conf, så tag en "
+"sikkerhedskopi eller undlad at benytte SWAT!"
+
diff --git a/packaging/Debian/debian-stable/po/es.po b/packaging/Debian/debian-sarge/po/es.po
index 0d1d1a770d..0d1d1a770d 100644
--- a/packaging/Debian/debian-stable/po/es.po
+++ b/packaging/Debian/debian-sarge/po/es.po
diff --git a/packaging/Debian/debian-stable/po/fr.po b/packaging/Debian/debian-sarge/po/fr.po
index 6be14c19b4..6be14c19b4 100644
--- a/packaging/Debian/debian-stable/po/fr.po
+++ b/packaging/Debian/debian-sarge/po/fr.po
diff --git a/packaging/Debian/debian-sarge/po/it.po b/packaging/Debian/debian-sarge/po/it.po
new file mode 100644
index 0000000000..07f505604e
--- /dev/null
+++ b/packaging/Debian/debian-sarge/po/it.po
@@ -0,0 +1,287 @@
+# samba po-debconf translation to italian
+# Copyright (C) 2004 Software in the Public Interest
+# This file is distributed under the same license as the samba package.
+# Luca Monducci, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba 3.0.7 debconf templates\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2004-12-03 21:10+0100\n"
+"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Set di caratteri per il filesystem 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 ""
+"Attualmente in smb.conf è configurato il «character set», in Samba 3.0, "
+"questa opzione è sostituita da una nuova opzione «unix character». "
+"Specificare il set di caratteri che si desidera usare per questa opzione "
+"che controlla come Samba interpreta i nomi dei file sul file system."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Lasciando vuoto questo valore smb.conf non verrà modificato."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Set di caratteri per i client 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 ""
+"Attualmente in smb.conf è configurato il «client code page», in Samba 3.0, "
+"questa opzione è sostituita dall'opzione «dos character». Specificare il "
+"set di caratteri che si desidera usare per questa opzione. In molti casi "
+"il valore predefinito è sufficiente. Notare che questa opzione non è "
+"necessaria per i client Windows, invece è specifica per i client DOS. "
+"Lasciando vuoto questo valore smb.conf non verrà modificato."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Modificare smb.conf per usare le impostazioni WINS da DHCP?"
+
+#. 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 ""
+"Se il computer prende le informazioni sull'indirizzo IP da un server DHCP "
+"allora il server DHCP può fornire anche informazioni sui server WINS (i "
+"name server per NetBIOS) presenti nella rete. Questo necessita una modifica "
+"al file smb.conf in modo le impostazioni di WINS fornite dal DHCP siano "
+"lette automaticamente da /etc/samba/dhcp.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Deve essere installato il pacchetto dhcp3-client per usare questa "
+"funzionalità."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Configurare smb.conf usando debconf?"
+
+#. 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 ""
+"Il resto della configurazione di Samba fa delle domande sui parametri di "
+"/etc/samba/smb.conf, il file usato per configurare i programmi di Samba "
+"(nmbd e smbd). L'attuale file smb.conf contiene una riga «include» o una "
+"opzione che si estende su più righe: questo potrebbe confondere debconf "
+"e richiedere una modifica manuale a smb.conf per renderlo nuovamente "
+"funzionante."
+
+#. 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 ""
+"Se non si vuole usare usare debconf per configurare smb.conf si dovranno "
+"gestire tutti i cambiamenti della configurazione da soli e non sarà "
+"possibile beneficiare dei miglioramenti periodici della configurazione; "
+"se possibile, si consiglia l'uso di debconf."
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Nome del Workgroup/Dominio"
+
+#. 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 ""
+"Questo imposta in quale workgroup apparirà il server quando i client "
+"tenteranno l'accesso. Notare che questo parametro controlla anche il nome "
+"del Dominio usato del parametro «security=domain»."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Usare password cifrate?"
+
+#. 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 ""
+"I client Windows recenti comunicano con i server SMB usando password "
+"cifrate. Per usare password in chiaro è necessario cambiare un parametro "
+"nel registro di Windows. Si raccomanda l'uso di password cifrate. In caso "
+"contrario assicurarsi che il file /etc/samba/smbpasswd sia valido e usare "
+"il comando smbpasswd per inserirci le password di ciascun utente."
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Creare il database delle password 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 ""
+"Per essere compatibile con le impostazioni predefinite di molte versioni "
+"di Windows, Samba deve essere configurato per usare password cifrate. "
+"Questo richiede che le password degli utenti siano memorizzate in un file "
+"diverso da /etc/passwd. Questo file può essere creato automaticamente ma "
+"qualcuno (l'amministratore o l'utente) dovrà inserire manualmente e poi "
+"tenere aggiornate le password usando smbpasswd. Se non si crea questo file "
+"sarà necessario riconfigurare samba (e probabilmente anche le macchine "
+"client) per usare password in chiaro. Vedere /usr/share/doc/samba-doc/"
+"htmldocs/ENCRYPTION.html contenuto nel pacchetto samba-doc per ulteriori "
+"dettagli."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "I file di log di Samba sono stati spostati."
+
+#. 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 ""
+"A partire dai primi pacchetti Samba 2.2 per Debian i file di log per "
+"entrambi i demoni Samba (nmbd e smbd) sono memorizzati in /var/log/samba/. "
+"I nomi dei file di log sono log.nmbd e log.smbd rispettivamente per nmbd e "
+"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 ""
+"I vecchi file di log in /var/log/ verranno spostati nella nuova directory."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "L'avvio di nmbd da inetd non è più supportato"
+
+#. 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 ""
+"Il sistema è configurato per avviare nmbd e smbd da inetd. Dalla versione "
+"2.999+3.0.alpha20-4 non è più possibile avviare nmbd da inetd. Se si è "
+"modificato lo script di avvio /etc/init.d/samba potrebbe essere necessario "
+"correggerlo a mano in modo da permettere l'avvio di nmbd."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "demoni, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Come avviare 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 ""
+"Il demone Samba smbd può essere avviato come un normale demone oppure da "
+"inetd. Si raccomanda l'avvio come demone."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Spostare /etc/samba/smbpasswd in /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 introduce una nuova e più completa interfaccia al database SAM che "
+"sostituisce il file /etc/samba/smbpasswd. Si vuole che il file smbpasswd sia "
+"migrato a /var/lib/samba/passdb.tdb? Se si pensa di usare un backend pdb "
+"diverso (p.e. LDAP), si dovrebbe rispondere «no»."
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Sovrascrittura di 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 sovrascriverà il file smb.conf, verranno riordinate le impostazioni e "
+"verranno cancellati tutti i commenti, le opzioni include= e copy=. Se si è "
+"personalizzato smb.conf tornare indietro e non usare SWAT."
diff --git a/packaging/Debian/debian-sarge/po/ja.po b/packaging/Debian/debian-sarge/po/ja.po
new file mode 100644
index 0000000000..ce59c6171f
--- /dev/null
+++ b/packaging/Debian/debian-sarge/po/ja.po
@@ -0,0 +1,292 @@
+#
+# 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-stable/po/nl.po b/packaging/Debian/debian-sarge/po/nl.po
index 61e8742dbb..61e8742dbb 100644
--- a/packaging/Debian/debian-stable/po/nl.po
+++ b/packaging/Debian/debian-sarge/po/nl.po
diff --git a/packaging/Debian/debian-sarge/po/pt.po b/packaging/Debian/debian-sarge/po/pt.po
new file mode 100644
index 0000000000..fa9f058ca2
--- /dev/null
+++ b/packaging/Debian/debian-sarge/po/pt.po
@@ -0,0 +1,295 @@
+# translation of pt.po to Portuguese
+# translation of samba Debian debconf template to Portuguese
+# Miguel Figueiredo <elmig@debianpt.org>, 2004.
+#
+
+msgid ""
+msgstr ""
+"Project-Id-Version: samba 3.0.9-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2005-01-05 19:25+0000\n"
+"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Conjunto de caracteres para sistema de ficheiros 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 ""
+"Actualmente tem um \"character set\" configurado no seu smb.conf. No "
+"Samba 3.0, esta opção é substituída por uma nova opção, \"unix charset\". "
+"Por favor especifique o conjunto de caracteres para utilizar com esta nova "
+"opção, que controla como o Samba interpreta os nomes dos ficheiros no "
+"sistema de ficheiros."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Se deixar esta opção vazia, o seu smb.conf não será alterado."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Conjunto de caracteres para clientes 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 ""
+"Actualmente tem um \"client code page\" definido no seu smb.conf. No Samba "
+"3.0, esta opção é substituída pela opção \"dos charset\". Por favor "
+"especifique o conjunto de caracteres que quer utilizar para esta nova opção. "
+"Na maioria dos casos, o valor por omissão escolhido para si será suficiente. "
+"Note que esta opção não é necessária para suportar clientes em Windows, é "
+"apenas para clientes em DOS. Se deixar esta opção vazia, o seu smb.conf "
+"não será alterado."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Modificar o smb.conf para utilizar definições de WINS a partir de DHCP?"
+
+#. 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 ""
+"Se o seu computador obtém a informação do endereço IP a partir de um "
+"servidor de DHCP na rede, o servidor de DHCP pode também fornecer informação "
+"acerca de servidores de WINS (\"servidor de nomes NetBIOS\") presentes na "
+"rede. Isto requer uma alteração no seu ficheiro smb.conf de modo que as "
+"definições de WINS fornecidas por DHCP sejam automaticamente lidas a partir "
+"de /etc/samba/dhcp.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Tem de ter o pacote dhcp3-client instalado para tirar vantagem desta "
+"característica."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Configurar o smb.conf através de debconf?"
+
+#. 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 ""
+"O resto da configuração de Samba trata de questões que afectam parâmetros "
+"em /etc/samba/smb.conf, que é o ficheiro utilizado para configurar os "
+"programas de Samba (nmbd e smbd). O seu smb.conf actual contém uma linha "
+"'include' ou uma opção que se espalha em multiplas linhas, a qual pode "
+"confundir o debconf e necessitar que você edite à mão o smb.conf par o ter "
+"novamente operacional."
+
+#. 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 ""
+"Se não utilizar o debconf para configurar o smb.conf, terá de lidar você "
+"mesmo com quaisquer alterações da configuração, e não poderá tirar partido "
+"de melhorias de configuração periódicas. Assim sendo, a utilização do "
+"debconf é remomendada se possível."
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Nome do Grupo de trabalho/Domínio ?"
+
+#. 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 ""
+"Isto controla qual o grupo de trabalho em que o seu servidor vai aparecer "
+"quando questionado pelos clientes. Note que este parâmetro também controla "
+"o nome de Domínio quando utilizado com a definição security=domain."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Utilizar encriptação de passwords?"
+
+#. 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 ""
+"Os clientes de Windows recentes comunicam com servidores de SMB utilizando "
+"passwords encriptadas. Se deseja utilizar passwords de texto puro você vai "
+"necessitar alterar um parâmetro no seu registo do Windows. É recomendado que "
+"utilize passwords encriptadas. Se o fizer, assegure-se que tem um ficheiro "
+"/etc/samba/smbpasswd válido e que defina lá passwords para cada um dos "
+"utilizadores utilizando o comando smbpasswd."
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Criar base de dados de passwords 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 ""
+"Para ser compatível com valores por omissão na maioria das versões do "
+"Windows, o Samba tem de ser configurado para utilizar passwords encriptadas. "
+"Isto requer que as passwords de utilizador sejam guardadas num ficheiro "
+"separado de /etc/passwd. Este ficheiro pode ser criado automaticamente, mas "
+"as passwords têm de ser adicionadas manualmente (por si ou pelo utilizador) "
+"executando o comando smbpasswd, e você tem de mantê-las actualizadas no "
+"futuro. Se não o criar, você terá de reconfigurar o samba (e provavelmente "
+"as máquinas clientes) para utilizar passwords de texto puro. Veja "
+"/usr/share/doc/samba-doc/htmldocs/ENCRIPTION.html do pacote samba-doc para "
+"mais detalhes."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Os ficheiros de log de Samba foram movidos."
+
+#. 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 ""
+"Desde os primeiros pacotes para Debian de Samba 2.2 que os ficheiros de log "
+"para ambos os daemons de Samba (nmbd e smbd) são agora guardados em "
+"/var/log/samba/. Os nomes dos ficheiros são respectivamente log.nmbd e "
+"log.smbd, para o nmbd e 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 ""
+"Os ficheiros de log antigos que estavam em /var/log/ vão ser movidos, para "
+"si, para a nova localização."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Executar o nmbd a partir de inetd já não é suportado"
+
+#. 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 ""
+"O seu sistema foi previamente configurado para iniciar o nmbd e smbd a "
+"partir de inetd. A partir da versão 2.999+3.0.alpha20-4, o nmbd já não "
+"inicia a partir do inetd. Se você modificou o seu script de inicialização "
+"/etc/init.d/samba, pode ter de o ajustar agora à mão de modo a que o nmbd "
+"inicie."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "daemons, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Como deseja correr o 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 ""
+"O daemon de Samba smbd pode correr como um daemon normal ou a partir de "
+"inetd. Executá-lo como um daemon é a aproximação recomendada."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Mover /etc/samba/smbpasswd para /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 ""
+""
+"O Samba 3.0 introduz um novo e mais completo interface com a base de dados "
+"SAM, que suplanta o ficheiro /etc/samba/smbpasswd. Deseja que o seu "
+"ficheiro existente smbpasswd seja migrado para /var/lib/samba/passdb.tdb "
+"para si? Se planeia utilizar em vez disso outro backend pdb (e.g., LDAP), "
+"deve responder aqui 'no'."
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "A sua configuração smb.conf será re-escrita!"
+
+#. 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 ""
+"O SWAT irá reescrever o seu ficheiro smb.conf. Irá reordenar as entradas e "
+"apagar todos os comentários, e opções include= e copy=. Se tem um smb.conf "
+"cuidadosamente trabalhado faça uma cópia de segurança dele ou não utilize "
+"o SWAT!"
diff --git a/packaging/Debian/debian-sarge/po/pt_BR.po b/packaging/Debian/debian-sarge/po/pt_BR.po
new file mode 100644
index 0000000000..1318c3f4e6
--- /dev/null
+++ b/packaging/Debian/debian-sarge/po/pt_BR.po
@@ -0,0 +1,309 @@
+#
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba\n"
+"Report-Msgid-Bugs-To: debian-l10n-portuguese@lists.debian.org\n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2005-05-10 14:07-0300\n"
+"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Conjunto de caracteres para sistema de arquivos 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 ""
+"Atualmente existe um \"conjunto de caracteres\" (\"character set\") "
+"configurado em seu arquivo smb.conf. No Samba 3.0, esta opção foi "
+"substituída por uma nova opção, a opção \"unix charset\". Por favor, "
+"especifique o conjunto de caracteres a ser usado para essa nova opção, "
+"a qual controla como o Samba interpreta nomes de arquivos no sistema de "
+"arquivos."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr ""
+"Caso você deixe esta opção em branco, seu arquivo smb.conf não será "
+"modificado."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Conjunto de caracteres para clientes 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 ""
+"Atualmente existe um \"código de página do cliente\" (\"client code page\") "
+"definido em seu arquivo smb.conf. No Samba 3.0, essa opção foi substituída "
+"pela opção \"dos charset\". Por favor, especifique o conjunto de caracteres "
+"que você deseja usar para essa nova opção. Note que essa opção não é "
+"necessária para suportar clientes Windows, mas sim válida somente para "
+"clientes DOS. Caso você deixe essa opção em branco, seu arquivo smb.conf não "
+"será modificado."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Modificar smb.conf para usar configurações WINS fornecidas via DHCP ?"
+
+#. 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 ""
+"Caso seu computador obtenha as informações de endereçamento IP de um "
+"servidor DHCP na rede, o servidor DHCP poderá também fornecer informações "
+"sobre servidor WINS (\"Servidor de Nomes NetBIOS\") presentes na rede. Para "
+"que o Samba leia as configurações WINS fornecidas pelo servidor DHCP "
+"automaticamente do arquivo /etc/samba/dhcp.conf, é preciso modificar seu "
+"arquivo smb.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Você deve possuir o pacote dhcp3-client instalado para poder usar esse "
+"recurso."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Configurar o arquivo smb.conf através do debconf ?"
+
+#. 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 ""
+"O restante da configuração do Samba lida com questões que afetam parâmetros "
+"no arquivo /etc/samba/smb.conf, que é o arquivo usado para configurar os "
+"programas Samba (nmbd e smbd). Seu arquivo smb.conf atual contém uma linha "
+"'include' ou uma opção que ocupa diversas linhas, o que pode confundir o "
+"debconf e requerer que você edite seu arquivo smb.conf manualmente para "
+"torná-lo funcional novamente."
+
+#. 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 ""
+"Caso você opte por não usar o debconf para configurar o arquivo smb.conf, "
+"será necessário que você lide com quaisquer mudanças de configurações "
+"manualmente e você não poderá aproveitar os melhoramentos periódicos de "
+"configuração. Por esse motivo, é recomendado usar o debconf, caso seja "
+"possível."
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Nome de Domínio/Grupo de Trabalho ?"
+
+#. 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 ""
+"Este parâmetro controla em qual grupo de trabalho (workgroup) seu servidor "
+"parecerá estar quando uma pesquisa pelo mesmo for feita por clientes. Note "
+"que este parâmetro também controla o nome de Domínio usado com a "
+"configuração security=domain."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Usar senhas criptografadas ?"
+
+#. 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 ""
+"Clientes Windows atuais comunicam-se com servidores SMB usando senhas "
+"criptografadas. Caso você queira usar senhas em texto puro você precisará "
+"modificar um parâmetro no registro de seu Windows. É recomendado que você "
+"use senhas criptografadas. Caso as utilize, certifique-se de possuir um "
+"arquivo /etc/samba/smbpasswd válido e que você tenha definido senhas no "
+"mesmo para cada usuário, utilizando o comando smbpasswd."
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Gerar a base de dados para senhas /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 ""
+"Para compatibilidade com os padrões adotados em todas as versões atuais do "
+"Windows, o Samba deve ser configurado para usar senhas criptografadas. Isso "
+"requer que as senhas dos usuários sejam armazenadas em um arquivo diferente "
+"do arquivo /etc/passwd. Esse arquivo pode ser criado automaticamente, mas "
+"as senhas devem ser definidas manualmente (por você ou pelo usuário) "
+"executando o utilitário smbpasswd. Você deve certificar-se de manter esse "
+"arquivo atualizado futuramente. Caso você não crie esse arquivo, você "
+"terá que reconfigurar o Samba (e provavelmente suas máquinas clientes) "
+"para utilização de senhas em texto puro. Consulte a documentação do pacote "
+"samba-doc em /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html para "
+"maiores detalhes."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Arquivos de log do Samba foram movidos."
+
+#. 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 ""
+"Desde os primeiros pacotes Debian do Samba 2.2, os arquivos de log para "
+"ambos os daemons Samba (nmbd e smbd) são armazenados no diretório "
+"/var/log/samba/. Os nomes desses arquivos são log.nmbd e log.smbd, para "
+"o nmbd e para o smbd, respectivamente."
+
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"Os antigos arquivos de log que estavam no diretório /var/log/ serão "
+"movidos para o novo local para você."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "A execução do nmbd a partir do inetd não é mais suportada"
+
+#. 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 ""
+"Seu sistema foi previamente configurado para iniciar os daemons nmbd e smbd "
+"a partir do inetd. Desde a versão 2.999+3.0.alpha20-4, o nmbd não mais será "
+"iniciado a partir do inetd. Caso você tenha modificado seu script de "
+"inicialização /etc/init.d/samba, você precisará ajustá-lo manualmente "
+"agora para que o nmbd seja iniciado."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "daemons, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Como você deseja que o Samba seja executado ?"
+
+#. 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 ""
+"O serviço Samba smbd pode ser executado como daemon normal ou a partir do "
+"inetd. Executá-lo como daemon é o método recomendado."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Mover /etc/samba/smbpasswd para /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 ""
+"O Samba 3.0 introduziu uma nova e mais completa interface de base de "
+"dados SAM que substituiu o arquivo /etc/samba/smbpasswd. Você gostaria "
+"que o arquivo smbpasswd existente fosse migrado para "
+"/var/lib/samba/passdb.tdb para você ? Caso você planeje usar um outro "
+"backend (como LDAP, por exemplo), não aceite mover o arquivo smbpasswd."
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Seu arquivo smb.conf será reescrito !"
+
+#. 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 ""
+"O SWAT irá reescrever seu arquivo smb.conf. Ele irá rearrumar as entradas e "
+"apagar todos os comentários, opções include= e copy=. Caso você possua um "
+"arquivo smb.conf cuidadosamente criado e comentado, faça uma cópia de "
+"segurança (backup) do mesmo ou não use o SWAT !"
diff --git a/packaging/Debian/debian-sarge/po/ru.po b/packaging/Debian/debian-sarge/po/ru.po
new file mode 100644
index 0000000000..c40c1879c5
--- /dev/null
+++ b/packaging/Debian/debian-sarge/po/ru.po
@@ -0,0 +1,223 @@
+# translation of samba_3.0.14a-2_ru.po to Russian
+# Yuriy Talakan' <yt@amur.elektra.ru>, 2005.
+msgid ""
+msgstr ""
+"Project-Id-Version: samba_3.0.14a-2_ru\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2005-05-21 21:43+1000\n"
+"Last-Translator: Yuriy Talakan' <yt@amur.elektra.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\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 "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ñƒ Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Ð¾Ð¿Ñ†Ð¸Ñ \"character set\" в smb.conf. Ð’ 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 "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ñƒ Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Ð¾Ð¿Ñ†Ð¸Ñ \"client code page\" в smb.conf. Ð’ 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 "Изменить smb.conf Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°Ñтроек WINS из DHCP?"
+
+#. 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 "ЕÑли ваш компьютер получает информацию о Ñвоем IP-адреÑе от Ñервера DHCP через Ñеть, то DHCP-Ñервер также может предоÑтавлÑÑ‚ÑŒ информацию о Ñерверах WINS(\"Ñерверы имен NetBIOS\"), приÑутÑтвующих в Ñети. Это требует внеÑÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ в ваш файл smb.conf, чтобы предоÑтавленные через DHCP наÑтройки WINS автоматичеÑки читалиÑÑŒ из /etc/samba/dhcp.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 "ÐаÑтроить smb.conf через debconf?"
+
+#. 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 ÑоÑтоит из вопроÑов, которые затрагивают параметры в /etc/samba/smb.conf. Этот файл иÑпользуетÑÑ Ð´Ð»Ñ Ð½Ð°Ñтройки программ Samba (nmbd и smbd.) Ваш текущий smb.conf Ñодержит Ñтроку 'include' или опцию, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑоÑтоит из неÑкольких Ñтрок. Это может Ñмутить 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 "ЕÑли вы не иÑпользуете debconf Ð´Ð»Ñ Ð½Ð°Ñтройки smb.conf, то должны ÑамоÑтоÑтельно позаботитьÑÑ Ð¾Ð±Ð¾ вÑех изменениÑÑ… наÑтроек и не Ñможете воÑпользоватьÑÑ Ð¿Ñ€ÐµÐ¸Ð¼ÑƒÑ‰ÐµÑтвами периодичеÑкого ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð½Ð°Ñтроек. Таким образом, рекомендуетÑÑ Ð¿Ð¾ возможноÑти иÑпользовать 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 (и вероÑтно ваши клиентÑкие машины) на иÑпользование открытых паролей. Более подробно Ñмотрите в /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html из пакета samba-doc."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "log-файлы 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 "ÐÐ°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ð¿ÐµÑ€Ð²Ñ‹Ñ… пакетов Samba 2.2 Ð´Ð»Ñ Debian, log-файлы Ð´Ð»Ñ Ð´ÐµÐ¼Ð¾Ð½Ð¾Ð² Samba (nmbd и smbd) хранÑÑ‚ÑÑ Ñ‚ÐµÐ¿ÐµÑ€ÑŒ в /var/log/samba/. Файлы называютÑÑ log.nmbd и log.smbd Ð´Ð»Ñ nmbd и 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 "Старые log-файлы, которые были в /var/log/, будут перемещены в новое Ð´Ð»Ñ Ð²Ð°Ñ Ð¼ÐµÑто."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "ЗапуÑк nmbd из inetd больше не поддерживаетÑÑ"
+
+#. 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 "Ваша ÑиÑтема была ранее наÑтроена на запуÑк nmbd и smbd из inetd. nmbd Ñ Ð²ÐµÑ€Ñии 2.999+3.0.alpha20-4 больше не запуÑкаетÑÑ Ð¸Ð· inetd. ЕÑли вы изменили ваш Ñтартовый Ñкрипт /etc/init.d/samba, вам необходимо откорректировать его вручную, чтобы nmbd запуÑкалÑÑ."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "daemons, 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 приноÑит новый, более полный Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð±Ð°Ð·Ñ‹ данных SAM, который заменÑет Ñобой файл /etc/samba/smbpasswd. Желаете, чтобы ваш ÑущеÑтвующий файл 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. Он перегруппирует вÑе запиÑи и удалит вÑе комментарии, опции include= и copy=. ЕÑли у Ð²Ð°Ñ Ñ‚Ñ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñозданный smb.conf, то Ñохраните его в безопаÑном меÑте или не иÑпользуйте SWAT!"
+
diff --git a/packaging/Debian/debian-stable/po/templates.pot b/packaging/Debian/debian-sarge/po/templates.pot
index 465f4719b0..465f4719b0 100644
--- a/packaging/Debian/debian-stable/po/templates.pot
+++ b/packaging/Debian/debian-sarge/po/templates.pot
diff --git a/packaging/Debian/debian-sarge/po/tr.po b/packaging/Debian/debian-sarge/po/tr.po
new file mode 100644
index 0000000000..b18f325681
--- /dev/null
+++ b/packaging/Debian/debian-sarge/po/tr.po
@@ -0,0 +1,283 @@
+# Turkish translation of samba.
+# This file is distributed under the same license as the samba package.
+# Mehmet Türker <mturker@innova.com.tr>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2004-06-01 09:42+0300\n"
+"Last-Translator: Mehmet Türker <mturker@innova.com.tr>\n"
+"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Unix dosya sistemi için karakter seti"
+
+#. 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 ""
+"Halihazırda smb.conf yapılandırma dosyanızda \"character set\" ayarı mevcut. "
+"Samba 3.0'da bu seçenek yenisiyle: \"unix charset\" ile değiştirildi. Lütfen "
+"Samba'nın sistemdeki dosya isimlerini çevirirken dikkate aldığı bu yeni "
+"seçenekle kullanılmasını istediğiniz karakter setini girin."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Bu seçeneği boş bırakırsanız, smb.conf dosyanız değiştirilmeyecektir."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "DOS istemcileri için karakter seti"
+
+#. 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 ""
+"Halihazırda smb.conf yapılandırma dosyanızda \"client code page\" ayarı mevcut. "
+"Samba 3.0'da bu seçenek \"dos charset\" seçeneğiyle değiştirildi. Lütfen bu yeni "
+"seçenekle beraber kullanmak için bir karakter seti seçin. Çoğu durumda öntanımlı "
+"olarak seçilmiş bulunan seçenek uygundur. Aklınızda bulunsun bu seçenek Windows "
+"istemcilerini desteklemek için gerekli değildir, sadece DOS istemcileri içindir. "
+"Eğer bu seçeneği boş bırakırsanız smb.conf dosyanız değiştirilmeyecektir."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"WINS ayarlarını DHCP'den kullanmak için smb.conf dosyasında değişiklik yapılsın mı?"
+
+#. 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 ""
+"Eğer bilgisayarınız IP adresini ağınızdaki bir DHCP sunucusundan alıyorsa, "
+"DHCP sunucusu ayrıca ağınızda bulunan WINS sunucuları (\"NetBIOS alanadı "
+"sunucuları\") hakkında da bilgi verebilir. Bu, smb.conf dosyanızda DHCP "
+"tarafından sunulan WINS ayarlarının otomatik olarak /etc/samba/dhcp.conf "
+"dosyasından okunmasını sağlayan bir değişikliği gerektirir."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Bu özellikten yararlanabilmek için dhcp3-client paketinin kurulmuş olması gerekir."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "\"smb.conf\" dosyası debconf ile yapılandırılsın mı?"
+
+#. 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 ""
+"Geri kalan Samba yapılandırması Samba uygulamalarını (nmbd ve smbd) yapılandırmak "
+"için kullanılan /etc/samba/smb.conf dosyasındaki parametreleri etkileyen sorularla "
+"devam edecektir. Mevcut smb.conf dosyası, debconf'u şaşırtabilecek ve smb.conf "
+"dosyanızı elle değiştirilmesi zorunda kılacak bir 'include' satırı veya birden "
+"fazla satır boyunca devam eden bir seçenek içeriyor."
+
+#. 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 ""
+"Eğer smb.conf'u yapılandırmak için debconf'u kullanmıyorsanız bütün yapılandırma "
+"değişikliklerini kendiniz elle yapmanız gerekir. Bu durumda periyodik olarak "
+"sunulan yapılandırma iyileştirmelerinden de yararlanamayacaksınız. Bu nedenlerle "
+"eğer mümkünse debconf kullanımı tavsiye edilir."
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Çalışma Grubu/Etki Alanı İsmi?"
+
+#. 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 ""
+"Bu ayar, sunucunuzun istemciler tarafından sorgulandığında hangi Çalışma Grubu "
+"içerisinde gözükeceğini kontrol eder. Aklınızda bulunsun, bu parametre ayrıca "
+"security=domain ayarı ile beraber kullanılacak Etki Alanını da kontrol eder."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Parola şifrelenmesi kullanılsın mı?"
+
+#. 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 ""
+"Yeni Windows istemcileri SBM sunucularıyla şifrelenmiş parolalar kullanarak "
+"iletişim kurarlar. Eğer düz metin parolaları kullanmak istiyorsanız Windows "
+"registry içinde bir parametreyi değiştirmelisiniz. Eğer bu işlemi yapmışsanız, "
+"geçerli bir /etc/samba/smbpasswd dosyanız olduğundan ve buraya smbpasswd "
+"komutu kullanarak bütün kullanıcılar için parola kaydı eklendiğinden emin olun."
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Samba parola veritabanı /var/lib/samba/passwd.tdb yaratılsın mı?"
+
+#. 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'un çoğu sürümüyle uyumlu olması için, Samba'nın şifreli parolaları "
+"kullanmak üzere yapılandırılması gerekir. Bu işlem kullanıcı parolalarının "
+"/etc/passwd dosyasından farklı bir yerde saklanmasını gerektirir. Bu dosya "
+"otomatik olarak yaratılabilir, fakat parolaların (siz veya kullanıcı tarafından) "
+"smbpasswd çalıştırılarak elle girilmesi ve gelecekte de güncel tutulması gerekir. "
+"Eğer bunu yaratmazsanız, düz metin parolalar kullanabilmek için samba'yı (ve "
+"muhtemelen istemci makineleri) yeniden yapılandırmanız gerekir. Daha ayrıntılı "
+"bilgi için samba-doc paketinden çıkan /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html'ye baÅŸvurun."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Samba'nın günce dosyaları taşındı."
+
+#. 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 ""
+"Samba 2.2'nin ilk paketlerinden itibaren, Samba artalan süreçlerine (nmbd ve "
+"smbd) ait Debian günce dosyaları artık /var/log/samba altında saklanıyor. Bu "
+"dosyaların isimleri nmbd ve smbd için sırasıyla log.nmbd ve log.smbd'dir."
+
+#. 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/ içinde bulunan eski günce dosyaları yeni bir konuma taşınacak."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Nmbd'nin inetd'den çalıştırılması artık desteklenmiyor"
+
+#. 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 ""
+"Sisteminiz, nmbd ve smbd'yi inetd üzerinden çalıştıracak şekilde ayarlanmış. "
+"Sürüm 2.999+3.0.alpha20-4'ten sonra artık nmbd inetd'den çalıştırılmıyor. "
+"Eğer /etc/init.d/samba başlangıç betiğini kendiniz düzenlediyseniz, nmbd'nin "
+"çalışabilmesi için bu dosyayı elle ayarlamak zorunda kalabilirsiniz."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "artalan süreçleri, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Samba'nın nasıl çalışmasını istersiniz?"
+
+#. 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 artalan süreci smbd, normal bir artalan süreci olarak veya inetd'den "
+"çalışabilir. Tavsiye edilen yaklaşım artalan süreci olarak çalıştırmaktır."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "/etc/samba/smbpasswd /var/lib/samba/passwd.tdb'ye taşınsın mı?"
+
+#. 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'nin yerini alan yeni ve daha eksiksiz bir SAM "
+"veritabanı arayüzü ile birlikte geliyor. Mevcut smbpasswd dosyasının /var/lib/"
+"samba/passdb.tbd dosyasına dönüştürülmesini ister misiniz? Eğer başka bir pdb "
+"arkayüzü (ör. LDAP) kullanmayı planlıyorsanız, burada 'hayır' cevabını vermelisiniz."
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Smb.conf dosyanız tekrar yazılacak!"
+
+#. 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 dosyanızın üzerine yazacak. Bu işlem kayıtları tekrar düzenleyecek, "
+"bütün yorumları, include= ve copy= seçeneklerini silecek. Eğer özel olarak "
+"tasarladığınız bir smb.conf dosyanız varsa, bunu yedekleyin veya SWAT kullanmayın!"
diff --git a/packaging/Debian/debian-sarge/python2.3-samba.files b/packaging/Debian/debian-sarge/python2.3-samba.files
new file mode 100644
index 0000000000..82759d81b8
--- /dev/null
+++ b/packaging/Debian/debian-sarge/python2.3-samba.files
@@ -0,0 +1 @@
+usr/lib/python2.3/site-packages/
diff --git a/packaging/Debian/debian-sarge/rules b/packaging/Debian/debian-sarge/rules
new file mode 100755
index 0000000000..25e598d185
--- /dev/null
+++ b/packaging/Debian/debian-sarge/rules
@@ -0,0 +1,362 @@
+#!/usr/bin/make -f
+#
+# Important modifications (introduction of a saved config.cache to
+# solve build problems) introduced in Samba 2.2.1a-5. These
+# modification were made by Steve Langasek <vorlon@netexpress.net>.
+#
+# config.cache *DISABLED* to solve problems caused incorrect settings
+# --SSS
+#
+#
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=4
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# Set the host and build architectures for use with config.cache loading,
+# cross-building, etc.
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+
+export DEB_HOST_GNU_TYPE
+export DEB_BUILD_GNU_TYPE
+export DEB_HOST_GNU_SYSTEM
+export DEB_BUILD_GNU_SYSTEM
+
+# Support the DEB_BUILD_OPTIONS variable
+CFLAGS = -gstabs -Wall
+INSTALL = install
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL += -s
+endif
+
+
+DESTDIR=`pwd`/debian/tmp
+
+conf_args = \
+ --with-fhs \
+ --enable-shared \
+ --enable-static \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libdir=/etc/samba \
+ --with-privatedir=/etc/samba \
+ --with-piddir=/var/run/samba \
+ --localstatedir=/var \
+ --with-netatalk \
+ --with-pam \
+ --with-syslog \
+ --with-utmp \
+ --with-readline \
+ --with-pam_smbpass \
+ --with-libsmbclient \
+ --with-winbind \
+ --with-msdfs \
+ --with-automount \
+ --with-tdbsam \
+ --with-ldap \
+ --with-python=python2.3
+
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+ conf_args += \
+ --with-smbmount \
+ --with-acl-support \
+ --with-quotas
+ mount_cifs = yes
+ smbfs = yes
+else
+ conf_args += --without-quotas
+ mount_cifs = no
+ smbfs = no
+endif
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ conf_args += --build $(DEB_HOST_GNU_TYPE)
+else
+ conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+patch: patch-stamp
+patch-stamp:
+ dh_testdir
+ if [ ! -f patch-stamp ]; then /bin/sh debian/scripts/patch-source; fi
+ touch patch-stamp
+
+unpatch:
+ dh_testdir
+ if [ -f patch-stamp ]; then /bin/sh debian/scripts/unpatch-source; fi
+ rm -f patch-stamp
+
+configure: patch-stamp configure-stamp
+configure-stamp:
+ dh_testdir
+
+# if [ -f debian/config.cache ]; then \
+# cp -f debian/config.cache source/config.cache; \
+# fi
+
+ [ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure $(conf_args))
+
+ touch configure-stamp
+
+build: patch-stamp configure-stamp build-stamp
+build-stamp:
+ dh_testdir
+
+ $(MAKE) -C source headers
+ $(MAKE) -C source all nsswitch/libnss_wins.so python_ext
+ifeq ($(mount_cifs),yes)
+ $(MAKE) -C source client/mount.cifs
+endif
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ # Clean first the Samba package
+# -$(MAKE) -C source realclean
+# -$(MAKE) -C source clean
+ -$(MAKE) -C source python_clean distclean
+
+ # Delete stuff left after a build that is not deleted by 'make clean'
+ rm -f source/bin/wbinfo source/bin/winbindd source/bin/debug2html \
+ source/bin/libsmbclient.a source/client/mount.cifs \
+ source/include/stamp-h
+
+ sed -e "s/@libacl@/`type-handling any linux-gnu`/g" \
+ < debian/control.in > debian/control
+
+ dh_clean
+
+install: DH_OPTIONS=
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ mkdir -p $(DESTDIR)/usr/share/man $(DESTDIR)/usr/lib/samba \
+ $(DESTDIR)/lib/security $(DESTDIR)/sbin \
+ $(DESTDIR)/usr/lib/cups/backend $(DESTDIR)/usr/share/samba \
+ $(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d \
+ $(DESTDIR)/usr/lib/python2.3/site-packages/samba
+
+ # Add here commands to install the package into debian/tmp.
+ $(MAKE) -C source install DESTDIR=$(DESTDIR)
+
+ # libsmbclient files are not installed by the standard
+ # 'make install' - do it manually.
+ $(MAKE) -C source installclientlib DESTDIR=$(DESTDIR)
+ mv $(DESTDIR)/usr/lib/samba/libsmbclient.so $(DESTDIR)/usr/lib/samba/libsmbclient.so.0.1
+ ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/samba/libsmbclient.so.0
+ ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/samba/libsmbclient.so
+
+ # Starting with Samba 3.0.6 libsmbclient.so is installed in
+ # /usr/lib/samba. We don't want it there since it is not in the
+ # default library path. Here we move it to /usr/lib/.
+ mv $(DESTDIR)/usr/lib/samba/libsmbclient* \
+ $(DESTDIR)/usr/lib/
+
+ # Install other stuff not installed by "make install"
+ install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
+
+ # Install winbind stuff not installed by 'make install'
+ install -m 0644 source/nsswitch/libnss_winbind.so \
+ $(DESTDIR)/lib/libnss_winbind.so.2
+ install -m 0644 source/nsswitch/pam_winbind.so \
+ $(DESTDIR)/lib/security/
+
+ # Install libnss_wins.so, which is not installed by 'make install' either.
+ install -m 0644 source/nsswitch/libnss_wins.so \
+ $(DESTDIR)/lib/libnss_wins.so.2
+
+ # pam_smbpass.so isn't being installed by 'make install'.
+ # We'll move it here to $(DESTDIR)/lib/security/ and then
+ # libpam-smbpass.files will make dh_movefiles move it to the
+ # right location in the libpam-smbpass package.
+ install -m 0644 source/bin/pam_smbpass.so $(DESTDIR)/lib/security/
+
+ifeq ($(smbfs),yes)
+ # 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
+ ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smbfs.8
+endif
+
+ifeq ($(mount_cifs),yes)
+ # Install mount.cifs and its man page
+ install -m 04755 source/client/mount.cifs $(DESTDIR)/sbin/
+ install -m 0644 docs/manpages/mount.cifs.8 $(DESTDIR)/usr/share/man/man8/
+endif
+
+ # For CUPS to support printing to samba printers, it's necessary
+ # to make the following symlink (according to
+ # Erich Schubert <debian@vitavonni.de> in #109509):
+ ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb
+
+ # 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
+ # delete the related man pages.
+ rm $(DESTDIR)/usr/share/man/man1/smbsh.1
+
+ # We're not providing findsmb (should we?) so let's remove the man
+ # pages.
+ find debian/ -name 'findsmb*' -exec rm -f {} \;
+
+ # Install samba-common's conffiles - they'll get moved later to their
+ # correct place by dh_movefiles.
+ cp debian/smb.conf $(DESTDIR)/usr/share/samba/
+ install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/
+ cp debian/gdbcommands $(DESTDIR)/etc/samba/
+ cp debian/samba.pamd $(DESTDIR)/etc/pam.d/samba
+ install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
+
+ # Install the Python modules
+ #
+ # Hmmm... need to figure this out. We have lib.linux-i686-2.2
+ # and lib.linux-i686-2.3 directories. Using only the stuff from
+ # the 2.3 directory for now. peloy.-
+ #cp source/build/lib.*/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/
+ cp source/build/lib.*-*-2.3/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/samba/
+ cp source/python/samba/* $(DESTDIR)/usr/lib/python2.3/site-packages/samba/
+
+ dh_movefiles
+
+# Build architecture-independent files here.
+# Pass -i to all debhelper commands in this target to reduce clutter.
+binary-indep: DH_OPTIONS=-i
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdebconf
+ dh_installdocs -A debian/README.build
+ # dh_installexamples is not available in Debian Potato...
+ [ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -psamba-doc examples/*
+# dh_installmenu
+# dh_installemacsen
+# dh_installpam
+# dh_installinit
+# dh_installcron
+# dh_installmanpages
+# dh_installinfo
+# dh_undocumented
+ dh_installchangelogs
+ dh_link
+ dh_compress
+ dh_fixperms
+
+ # Get rid of those pesky .cvsignore files to make lintian happy
+ find debian/ -name .cvsignore -exec rm -f {} \;
+
+ dh_installdeb
+# dh_perl
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture-dependent files here.
+# Pass -a to all debhelper commands in this target to reduce clutter.
+ifeq ($(smbfs),no)
+ DH_EXTRAS=-Nsmbfs
+endif
+
+binary-arch: DH_OPTIONS=-a $(DH_EXTRAS)
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdebconf
+ dh_installdocs -A debian/README.build
+ # dh_installexamples is not available in Debian Potato...
+ [ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -ppython2.3-samba source/python/examples/*
+# dh_installmenu
+ # dh_installlogrotate is not available in Debian Potato...
+ if [ -x /usr/bin/dh_installlogrotate ]; then \
+ dh_installlogrotate; \
+ else \
+ mkdir -p debian/samba/etc/logrotate.d; \
+ cp debian/samba.logrotate debian/samba/etc/logrotate.d/samba; \
+ mkdir -p debian/winbind/etc/logrotate.d; \
+ cp debian/winbind.logrotate debian/winbind/etc/logrotate.d/winbind; \
+ fi
+# dh_installemacsen
+# dh_installpam
+ DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19"
+ DH_OPTIONS= dh_installinit -pwinbind
+ dh_installcron
+# dh_installmanpages
+# dh_installinfo
+ cp debian/winbind.lintian debian/winbind/usr/share/lintian/overrides/winbind
+# dh_undocumented
+ dh_installchangelogs -Nlibpam-smbpass
+ DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source/pam_smbpass/CHANGELOG
+ dh_strip --dbg-package=samba --dbg-package=smbclient
+ cp -a debian/smbclient-dbg/* debian/samba-dbg
+ rm -rf debian/smbclient-dbg
+ dh_link
+ dh_compress
+ dh_fixperms
+
+ # Why this is executable, I have NO idea...
+ chmod a-x debian/libsmbclient-dev/usr/include/libsmbclient.h
+
+ifeq ($(smbfs),yes)
+ # You may want to make some executables suid here.
+ # The smbmnt and smbumount binaries should be setuid-root. This
+ # has security implications because these programs haven't had
+ # a thorough security audit. smbmount _does not_ have to have
+ # the setuid bit set. In fact, it is a security hole.
+ chmod u+s debian/smbfs/usr/bin/smbmnt
+ chmod u+s debian/smbfs/usr/bin/smbumount
+endif
+
+ # Set some reasonable default perms for the samba logdir.
+ chmod 0750 debian/samba/var/log/samba/
+ chown root.adm debian/samba/var/log/samba/
+
+ # Get rid of those pesky .cvsignore files to make lintian happy
+ # (maybe we only need the "find ... -exec rm -f {} ;" we have
+ # in the binary-indep target?) peloy.-
+ find debian/ -name .cvsignore -exec rm -f {} \;
+
+ dh_installdeb
+# dh_makeshlibs
+# dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/packaging/Debian/debian-sarge/samba-common.config b/packaging/Debian/debian-sarge/samba-common.config
new file mode 100644
index 0000000000..766f0ddb7e
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba-common.config
@@ -0,0 +1,154 @@
+#/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+# Function for grabbing a parameter from an smb.conf file
+smbconf_retr() {
+ if [ -z "$1" ]; then
+ return
+ fi
+
+ if [ -n "$2" ]; then
+ local FILE="$2"
+ fi
+
+ if [ -z "$FILE" ]; then
+ return
+ fi
+
+ sed -n -e"
+ s/^[[:space:]]*\[global\]/\[global\]/i
+ /^\[global\]/,/^[[:space:]]*\[/ {
+ s/^[[:space:]]*$1[[:space:]]*=[[:space:]]*//pi
+ }" $FILE \
+ | tail -n 1
+}
+
+FILE=/etc/samba/smb.conf
+
+db_title "Samba Server"
+
+# We ask the question IFF the config contains complex options that could
+# cause us to break the config.
+if [ -f "$FILE" ] && grep -v dhcp.conf $FILE \
+ | grep -qEi '\\$|^[[:space:]]*include[[:space:]]*='
+then
+ db_input high samba-common/do_debconf || true
+ db_go
+else
+ db_set samba-common/do_debconf true
+fi
+
+# If user doesn't want to use debconf to configure Samba the leave...
+db_get samba-common/do_debconf || true
+if [ "${RET}" = "false" ]; then
+ exit 0
+fi
+
+# User wants to use debconf, let's continue...
+
+# Adjust priority of the question about the workgroup name depending
+# on whether a workgroup name has already being specified.
+db_get samba-common/workgroup || true
+if [ "${RET}" ]; then
+ WGPRIORITY=medium
+else
+ WGPRIORITY=high
+fi
+
+# Preload any values from the existing smb.conf file
+if [ -f $FILE ]; then
+ WORKGROUP=`smbconf_retr workgroup`
+ if [ "$WORKGROUP" ]; then
+ db_set samba-common/workgroup "$WORKGROUP"
+ fi
+
+ ENCRYPT=`smbconf_retr "encrypt passwords"`
+ if [ "$ENCRYPT" ]; then
+ ENCRYPT=`echo $ENCRYPT | tr '[A-Z]' '[a-z]'`
+ if [ "$ENCRYPT" = "yes" ]; then
+ ENCRYPT=true
+ elif [ "$ENCRYPT" = "no" ]; then
+ ENCRYPT=false
+ fi
+
+ db_set samba-common/encrypt_passwords "$ENCRYPT"
+ fi
+
+ CHARSET=`smbconf_retr "character set"`
+ CODEPAGE=`smbconf_retr "client code page"`
+ UNIXCHARSET=`smbconf_retr "unix charset"`
+ DOSCHARSET=`smbconf_retr "dos charset"`
+
+ # If we're upgrading from an old version and there's no
+ # 'passdb backend' setting, add one.
+ if [ "$1" = "configure" -a -n "$2" ] \
+ && dpkg --compare-versions "$2" lt 2.99.cvs.20020713-2 \
+ && ! grep -q -i '^[[:space:]]*passdb backend[[:space:]]*=' $FILE
+ then
+ TMPFILE=/etc/samba/smb.conf.dpkg-tmp
+ sed -e'
+ s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ s/^\([[:space:]]*\)encrypt passwords/\1encrypt passwords/i
+ /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ {
+ /^[[:space:]]*encrypt passwords[[:space:]]*=/a \
+ passdb backend = smbpasswd guest
+ }' < $FILE > ${TMPFILE}
+ chmod a+r ${TMPFILE}
+ mv -f ${TMPFILE} /etc/samba/smb.conf
+ fi
+fi
+
+# Get workgroup name
+db_input $WGPRIORITY samba-common/workgroup || true
+db_go
+
+# Use encrypted passwords?
+db_input medium samba-common/encrypt_passwords || true
+db_go
+
+# Handle migrating character sets
+if [ -n "$CHARSET" -a -z "$UNIXCHARSET" ]
+then
+ UNIXCHARSET=`echo $CHARSET | sed -e's/iso-/ISO/i'`
+ db_set samba-common/character_set "$UNIXCHARSET"
+ # FIXME: should eventually be low.
+ db_input medium samba-common/character_set || true
+ db_go
+fi
+
+if [ -n "$CODEPAGE" -a -z "$DOSCHARSET" ]
+then
+ DOSCHARSET=CP`echo $CODEPAGE | sed -e's/[[:alpha:]]*//g'`
+ db_set samba-common/codepage "$DOSCHARSET"
+ # FIXME: should eventually be low.
+ db_input medium samba-common/codepage || true
+ db_go
+fi
+
+DHCPPRIORITY=medium
+#if [ "$DEBCONF_RECONFIGURE" = 1 ] && [ -f /sbin/dhclient3 ]
+if [ -f /sbin/dhclient3 ]
+then
+ DHCPPRIORITY=high
+# TODO: see if we can detect that dhcp3-client is *going* to be installed,
+# even if it isn't yet.
+#elif dpkg-query -W --showformat='${Status}\n' dhcp3-client | grep ???
+# unknown ok not-installed ?
+# DHCPPRIORITY=high
+fi
+
+if [ ! -f $FILE ] || grep -q -i 'wins server' $FILE
+then
+ # check the values before and after; unset the 'applied' flag
+ # if they don't match.
+ db_get samba-common/dhcp || true
+ OLDDHCP="$RET"
+ db_input $DHCPPRIORITY samba-common/dhcp || true
+ db_go
+ db_get samba-common/dhcp || true
+ if [ "$OLDDHCP" != "$RET" ]; then
+ db_fset samba-common/dhcp applied false
+ fi
+fi
diff --git a/packaging/Debian/debian-sarge/samba-common.dhcp b/packaging/Debian/debian-sarge/samba-common.dhcp
new file mode 100644
index 0000000000..3b5a05ff57
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba-common.dhcp
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+SAMBA_DHCP_CONF=/etc/samba/dhcp.conf
+
+netbios_setup() {
+ # No need to continue if we're called with an unsupported option
+
+ if [ "$reason" != BOUND ] && [ "$reason" != RENEW ] \
+ && [ "$reason" != REBIND ] && [ "$reason" != REBOOT ] \
+ && [ "$reason" != EXPIRE ] && [ "$reason" != FAIL ]
+ then
+ 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
+
+ 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
+ echo " wins server =$serverlist" >> $SAMBA_DHCP_CONF
+ fi
+ if [ -n "$new_netbios_scope" ]
+ then
+ echo " netbios scope = $new_netbios_scope" >> $SAMBA_DHCP_CONF
+ fi
+}
+
+netbios_setup
diff --git a/packaging/Debian/debian-stable/samba-common.dirs b/packaging/Debian/debian-sarge/samba-common.dirs
index c089ad7357..c089ad7357 100644
--- a/packaging/Debian/debian-stable/samba-common.dirs
+++ b/packaging/Debian/debian-sarge/samba-common.dirs
diff --git a/packaging/Debian/debian-sarge/samba-common.files b/packaging/Debian/debian-sarge/samba-common.files
new file mode 100644
index 0000000000..f5779fa827
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba-common.files
@@ -0,0 +1,19 @@
+etc/samba/
+etc/dhcp3/
+etc/pam.d/
+usr/bin/net
+usr/bin/nmblookup
+usr/bin/smbpasswd
+usr/bin/testparm
+usr/share/man/man1/nmblookup.1
+usr/share/man/man1/testparm.1
+usr/share/man/man5/lmhosts.5
+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/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-stable/samba-common.postinst b/packaging/Debian/debian-sarge/samba-common.postinst
index 6c6eb9bf53..6c6eb9bf53 100644
--- a/packaging/Debian/debian-stable/samba-common.postinst
+++ b/packaging/Debian/debian-sarge/samba-common.postinst
diff --git a/packaging/Debian/debian-stable/samba-common.postrm b/packaging/Debian/debian-sarge/samba-common.postrm
index 8a4b6d3d55..8a4b6d3d55 100644
--- a/packaging/Debian/debian-stable/samba-common.postrm
+++ b/packaging/Debian/debian-sarge/samba-common.postrm
diff --git a/packaging/Debian/debian-sarge/samba-common.templates b/packaging/Debian/debian-sarge/samba-common.templates
new file mode 100644
index 0000000000..e5f7b1ae0c
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba-common.templates
@@ -0,0 +1,66 @@
+Template: samba-common/character_set
+Type: string
+_Description: Character Set for Unix filesystem
+ 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.
+ .
+ If you leave this option blank, your smb.conf will not be changed.
+
+Template: samba-common/codepage
+Type: string
+_Description: Character Set for DOS clients
+ 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.
+
+Template: samba-common/dhcp
+Type: boolean
+Default: false
+_Description: Modify smb.conf to use WINS settings from DHCP?
+ 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.
+ .
+ You must have the dhcp3-client package installed to take advantage of this
+ feature.
+
+Template: samba-common/do_debconf
+Type: boolean
+Default: true
+_Description: Configure smb.conf through debconf?
+ 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.
+ .
+ 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.
+
+Template: samba-common/workgroup
+Type: string
+_Description: Workgroup/Domain Name?
+ 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.
+
+Template: samba-common/encrypt_passwords
+Type: boolean
+Default: true
+_Description: Use password encryption?
+ 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.
diff --git a/packaging/Debian/debian-sarge/samba-doc.docs b/packaging/Debian/debian-sarge/samba-doc.docs
new file mode 100644
index 0000000000..d9f0aa1d0a
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba-doc.docs
@@ -0,0 +1,8 @@
+docs/Samba3-HOWTO.pdf
+docs/Samba3-ByExample.pdf
+docs/Samba3-Developers-Guide.pdf
+docs/REVISION
+docs/THANKS
+docs/history
+docs/htmldocs/
+docs/registry/
diff --git a/packaging/Debian/debian-stable/samba-doc.examples b/packaging/Debian/debian-sarge/samba-doc.examples
index e71180364c..e71180364c 100644
--- a/packaging/Debian/debian-stable/samba-doc.examples
+++ b/packaging/Debian/debian-sarge/samba-doc.examples
diff --git a/packaging/Debian/debian-sarge/samba.config b/packaging/Debian/debian-sarge/samba.config
new file mode 100644
index 0000000000..300b19a2e8
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba.config
@@ -0,0 +1,92 @@
+#/bin/sh -e
+#
+#
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+# Function for grabbing a parameter from an smb.conf file
+smbconf_retr() {
+ if [ -z "$1" ]; then
+ return
+ fi
+
+ if [ -n "$2" ]; then
+ local FILE="$2"
+ fi
+
+ if [ -z "$FILE" ]; then
+ return
+ fi
+
+ sed -n -e"
+ s/^[[:space:]]*\[global\]/\[global\]/i
+ /^\[global\]/,/^[[:space:]]*\[/ {
+ s/^[[:space:]]*$1[[:space:]]*=[[:space:]]*//pi
+ }" $FILE \
+ | tail -n 1
+}
+
+FILE=/etc/samba/smb.conf
+
+db_title "Samba Server"
+
+# Babysit users who don't read README.Debian
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt "2.2"
+then
+ db_input medium samba/log_files_moved || true
+ db_go
+fi
+
+db_input medium samba/run_mode || true
+db_go
+
+
+# Offer to move the password database for existing users
+if [ "$1" = "configure" -a -n "$2" -a -e /etc/samba/smbpasswd \
+ -a ! -e /var/lib/samba/passdb.tdb ] \
+ && dpkg --compare-versions "$2" lt 2.99.cvs.20020713-2
+then
+ FILE=/etc/samba/smb.conf
+ PASSDB=""
+ if [ -f "$FILE" ]; then
+ PASSDB=`smbconf_retr "passdb backend"`
+ fi
+ TDBPRIORITY=medium
+ if echo "$PASSDB" | grep -q ldapsam; then
+ TDBPRIORITY=low
+ fi
+ db_get samba-common/do_debconf || true
+ if [ "${RET}" = "false" ]; then
+ TDBPRIORITY=low
+ fi
+
+ db_input "$TDBPRIORITY" samba/tdbsam || true
+fi
+
+# We vary the priority of the next question depending on whether
+# the password database already exists...
+if [ -e /etc/samba/smbpasswd -o -e /var/lib/samba/passdb.tdb ]; then
+ PRIORITY="low"
+else
+ # If 'encrypt passwords' is true in smb.conf, and smbpasswd
+ # does not exist, default to yes here.
+ FILE=/etc/samba/smb.conf
+ if [ -f "$FILE" ]; then
+ ENCRYPT=`smbconf_retr "encrypt passwords"`
+ if [ "$ENCRYPT" ]; then
+ ENCRYPT=`echo $ENCRYPT | tr '[A-Z]' '[a-z]'`
+ if [ "$ENCRYPT" = "yes" ]; then
+ ENCRYPT=true
+ fi
+ if [ "$ENCRYPT" = "no" ]; then
+ ENCRYPT=false
+ fi
+ fi
+ db_set samba/generate_smbpasswd "$ENCRYPT"
+ fi
+ PRIORITY="medium"
+fi
+
+db_input $PRIORITY samba/generate_smbpasswd || true
+db_go
diff --git a/packaging/Debian/debian-stable/samba.cron.daily b/packaging/Debian/debian-sarge/samba.cron.daily
index 42fc98d8f6..42fc98d8f6 100644
--- a/packaging/Debian/debian-stable/samba.cron.daily
+++ b/packaging/Debian/debian-sarge/samba.cron.daily
diff --git a/packaging/Debian/debian-sarge/samba.dirs b/packaging/Debian/debian-sarge/samba.dirs
new file mode 100644
index 0000000000..a58e4e9892
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba.dirs
@@ -0,0 +1,7 @@
+usr/bin
+usr/sbin
+var/log/samba
+var/lib/samba/printers/W32X86
+var/lib/samba/printers/WIN40
+var/run/samba
+var/cache/samba
diff --git a/packaging/Debian/debian-sarge/samba.docs b/packaging/Debian/debian-sarge/samba.docs
new file mode 100644
index 0000000000..7949c615b0
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba.docs
@@ -0,0 +1,4 @@
+README
+Roadmap
+WHATSNEW.txt
+docs/htmldocs/Samba3-HOWTO/diagnosis.html
diff --git a/packaging/Debian/debian-sarge/samba.files b/packaging/Debian/debian-sarge/samba.files
new file mode 100644
index 0000000000..163a25b173
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba.files
@@ -0,0 +1,17 @@
+usr/bin/smbstatus
+usr/bin/smbcontrol
+usr/bin/tdbbackup
+usr/bin/pdbedit
+usr/sbin/smbd
+usr/sbin/nmbd
+usr/sbin/mksmbpasswd
+usr/lib/samba/vfs
+usr/share/man/man1/smbcontrol.1
+usr/share/man/man1/smbstatus.1
+usr/share/man/man5/smbpasswd.5
+usr/share/man/man8/nmbd.8
+usr/share/man/man8/pdbedit.8
+usr/share/man/man8/smbd.8
+usr/share/man/man8/mksmbpasswd.8
+usr/share/man/man8/tdbbackup.8
+
diff --git a/packaging/Debian/debian-stable/samba.init b/packaging/Debian/debian-sarge/samba.init
index 5d0f4671a0..5d0f4671a0 100644
--- a/packaging/Debian/debian-stable/samba.init
+++ b/packaging/Debian/debian-sarge/samba.init
diff --git a/packaging/Debian/debian-sarge/samba.logrotate b/packaging/Debian/debian-sarge/samba.logrotate
new file mode 100644
index 0000000000..57f4228a7c
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba.logrotate
@@ -0,0 +1,21 @@
+/var/log/samba/log.smbd {
+ weekly
+ missingok
+ rotate 7
+ postrotate
+ invoke-rc.d --quiet samba reload > /dev/null
+ endscript
+ compress
+ notifempty
+}
+
+/var/log/samba/log.nmbd {
+ weekly
+ missingok
+ rotate 7
+ postrotate
+ [ ! -f /var/run/samba/nmbd.pid ] || kill -HUP `cat /var/run/samba/nmbd.pid`
+ endscript
+ compress
+ notifempty
+}
diff --git a/packaging/Debian/debian-sarge/samba.pamd b/packaging/Debian/debian-sarge/samba.pamd
new file mode 100644
index 0000000000..e2c7a99356
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba.pamd
@@ -0,0 +1,3 @@
+@include common-auth
+@include common-account
+@include common-session
diff --git a/packaging/Debian/debian-sarge/samba.postinst b/packaging/Debian/debian-sarge/samba.postinst
new file mode 100644
index 0000000000..0fb03f8768
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba.postinst
@@ -0,0 +1,230 @@
+#!/bin/sh -e
+#
+# Post-installation script for the Samba package for Debian GNU/Linux
+#
+#
+
+case "$1" in
+ configure)
+ # continue below
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ exit 0
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+# Handle debconf
+. /usr/share/debconf/confmodule
+
+INITCONFFILE=/etc/default/samba
+
+# We generate several files during the postinst, and we don't want
+# them to be readable only by root.
+umask 022
+
+
+# Generate configuration file if it does not exist, using default values.
+[ -r "${INITCONFFILE}" ] || {
+ echo Generating ${INITCONFFILE}... >&2
+ cat >${INITCONFFILE} <<'EOFMAGICNUMBER1234'
+# Defaults for samba initscript
+# sourced by /etc/init.d/samba
+# installed at /etc/default/samba by the maintainer scripts
+#
+
+#
+# This is a POSIX shell fragment
+#
+
+# How should Samba (smbd) run? Possible values are "daemons"
+# or "inetd".
+RUN_MODE=""
+EOFMAGICNUMBER1234
+}
+
+# --- Begin of FHS migration code ---
+
+# Starting with Samba 2.2.3-4 the WINS database, the browse
+# database and other important run-time files are stored in
+# FHS-compliant directories. The following code takes care of
+# moving the files in the old directories (/var/samba/ and
+# /var/state/samba) to the new FHS-compliant directories.
+
+if [ -d /var/samba/ ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.0.7-4
+then
+ mv /var/samba/* /var/lib/samba/ 2>/dev/null || true
+ rmdir /var/samba/
+fi
+
+# Default for anything we don't know about (see next two 'for' loops)
+# is /var/lib/samba -- guaranteed not to accidentally tromp on any
+# files the admin thought were safe.
+if [ -d /var/state/samba ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.3-4
+then
+ mv /var/state/samba/* /var/lib/samba/ 2>/dev/null || true
+ rmdir /var/state/samba/
+
+ # It's not FHS, and it's probably our fault this is here,
+ # so delete it if we can.
+ rmdir /var/state/ 2> /dev/null || true
+fi
+
+# All these files are now placed in their respective FHS-compliant
+# directories. Separate out the individual files accordingly.
+for F in browse.dat printing.tdb winbindd_cache.tdb
+do
+ if [ -e /var/lib/samba/"$F" ]; then
+ mv /var/lib/samba/"$F" /var/cache/samba/
+ fi
+done
+
+for F in brlock.tdb connections.tdb locking.tdb messages.tdb nmbd.pid \
+ sessionid.tdb smbd.pid unexpected.tdb
+do
+ if [ -e /var/lib/samba/"$F" ]; then
+ mv /var/lib/samba/"$F" /var/run/samba/
+ fi
+done
+
+# Beginning with Samba 2.2.5-1, we also move the domain secrets file
+# to a more suitable location, since no one really edits this by hand.
+if [ -e /etc/samba/secrets.tdb -a ! -e /var/lib/samba/secrets.tdb ]
+then
+ mv /etc/samba/secrets.tdb /var/lib/samba/
+fi
+
+# If upgrading from a previous 2.999 snapshot, move the passdb.tdb
+# database into /var/lib.
+
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.999+3.0.alpha23-5 \
+ && [ -e /etc/samba/passdb.tdb -a ! -e /var/lib/samba/passdb.tdb ]
+then
+ mv /etc/samba/passdb.tdb /var/lib/samba/
+fi
+
+# --- End of FHS migration code ---
+
+# If upgrading from a previous 2.999 snapshot, clear the broken
+# registry.tdb file.
+if [ -n "$2" ] && dpkg --compare-versions "$2" gt 2.99.cvs.20020713-1 \
+ && dpkg --compare-versions "$2" lt 2.999+3.0cvs20020805-1
+then
+ rm -f /var/lib/samba/registry.tdb
+fi
+
+# ------------------------- Debconf questions start ---------------------
+
+# Run Samba as daemons or from inetd?
+db_get samba/run_mode || true
+RUN_MODE="${RET}"
+
+TMPFILE=/etc/default/samba.dpkg-tmp
+sed -e "s/^[[:space:]]*RUN_MODE[[:space:]]*=.*/RUN_MODE=\"${RUN_MODE}\"/" \
+ < ${INITCONFFILE} >${TMPFILE}
+chmod a+r ${TMPFILE}
+mv -f ${TMPFILE} ${INITCONFFILE}
+
+# Generate a smbpasswd file?
+db_get samba/generate_smbpasswd || true
+GENERATE_SMBPASSWD="${RET}"
+
+db_get samba/tdbsam || true
+PDB_MIGRATE="${RET}"
+
+# Done with debconf now.
+db_stop
+
+umask 066
+
+# FIXME: disable if ldapsam support is enabled?
+# FIXME: we don't want to pass these through the smbpasswd backend,
+# some of the faking can cause us problems!
+if [ "${GENERATE_SMBPASSWD}" = "true" -a ! -e /var/lib/samba/passdb.tdb -a ! -e /etc/samba/smbpasswd ]; then
+ getent passwd | /usr/sbin/mksmbpasswd > /etc/samba/smbpasswd
+ pdbedit -i smbpasswd -e tdbsam
+ rm /etc/samba/smbpasswd
+fi
+
+umask 022
+
+if [ -n "$2" -a -e /etc/samba/smbpasswd \
+ -a ! -e /var/lib/samba/passdb.tdb -a "$PDB_MIGRATE" = "true" ] \
+ && dpkg --compare-versions "$2" lt 2.99.cvs.20020713-2
+then
+ umask 066
+ pdbedit -i smbpasswd -e tdbsam
+ rm /etc/samba/smbpasswd
+ umask 022
+
+ # The database has been moved, now make sure we can still find it.
+ PASSDB=`sed -n -e"s/^[[:space:]]*\[global\]/\[global\]/i
+ /^\[global\]/,/^[[:space:]]*\[/ \
+ s/^[[:space:]]*passdb backend[[:space:]]*=[[:space:]]*//pi" \
+ < /etc/samba/smb.conf \
+ | 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/'`
+ fi
+ fi
+ if ! echo "$PASSDB" | egrep -q "(^|[[:space:]])tdbsam"; then
+ PASSDB="tdbsam $PASSDB"
+ fi
+ TMPFILE=/etc/samba/smb.conf.dpkg-tmp
+ sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \
+ s/^\([[:space:]]*\)passdb backend[[:space:]]*=.*/\1passdb backend = ${PASSDB}/i" \
+ < /etc/samba/smb.conf >${TMPFILE}
+ chmod a+r ${TMPFILE}
+ mv -f ${TMPFILE} /etc/samba/smb.conf
+fi
+
+# ------------------------- Debconf questions end ---------------------
+
+# Handle removal of nmbd from inetd.conf, which is no longer a supported
+# configuration.
+if dpkg --compare-versions "$2" lt 2.999+3.0.alpha20-4; then
+ update-inetd --remove netbios-ns
+fi
+
+# We want to add these entries to inetd.conf commented out. Otherwise
+# UDP traffic could make inetd to start nmbd or smbd right during
+# the configuration stage.
+if [ -z "$2" ]; then
+ update-inetd --add "#<off># netbios-ssn stream tcp nowait root /usr/sbin/tcpd /usr/sbin/smbd"
+fi
+
+if [ "$RUN_MODE" = "daemons" ]; then
+ update-inetd --disable netbios-ssn
+else
+ update-inetd --enable netbios-ssn
+fi
+
+# This check is a safety net: the /etc/samba/smbpasswd file must have
+# permissions 600.
+if [ -f /etc/samba/smbpasswd ]; then
+ chmod 600 /etc/samba/smbpasswd
+fi
+
+# Do the same check for /var/backup/smbpasswd.bak, just in case.
+if [ -f /var/backups/smbpasswd.bak ]; then
+ chmod 600 /var/backups/smbpasswd.bak
+fi
+
+# Delete old /etc/samba/debian_config file, which is not used anymore
+# now that we are using debconf.
+rm -f /etc/samba/debian_config
+
+# Move old log files to the new location of Samba's log files
+mv -f /var/log/nmb* /var/log/samba/ 2> /dev/null || true
+mv -f /var/log/smb* /var/log/samba/ 2> /dev/null || true
+
+#DEBHELPER#
+
+exit 0
diff --git a/packaging/Debian/debian-stable/samba.postrm b/packaging/Debian/debian-sarge/samba.postrm
index b79fe1d009..b79fe1d009 100644
--- a/packaging/Debian/debian-stable/samba.postrm
+++ b/packaging/Debian/debian-sarge/samba.postrm
diff --git a/packaging/Debian/debian-stable/samba.prerm b/packaging/Debian/debian-sarge/samba.prerm
index ab62c706d8..ab62c706d8 100644
--- a/packaging/Debian/debian-stable/samba.prerm
+++ b/packaging/Debian/debian-sarge/samba.prerm
diff --git a/packaging/Debian/debian-sarge/samba.templates b/packaging/Debian/debian-sarge/samba.templates
new file mode 100644
index 0000000000..ce503aea5c
--- /dev/null
+++ b/packaging/Debian/debian-sarge/samba.templates
@@ -0,0 +1,50 @@
+Template: samba/generate_smbpasswd
+Type: boolean
+Default: false
+_Description: Create samba password database, /var/lib/samba/passdb.tdb?
+ 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.
+
+Template: samba/log_files_moved
+Type: note
+_Description: Samba's log files have moved.
+ 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.
+ .
+ The old log files that were in /var/log/ will be moved to the new location
+ for you.
+
+Template: samba/nmbd_from_inetd
+Type: note
+_Description: Running nmbd from inetd is no longer supported
+ 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.
+
+Template: samba/run_mode
+Type: select
+_Choices: daemons, inetd
+Default: daemons
+_Description: How do you want to run Samba?
+ The Samba daemon smbd can run as a normal daemon or from inetd. Running as
+ a daemon is the recommended approach.
+
+Template: samba/tdbsam
+Type: boolean
+Default: false
+_Description: Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?
+ 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.
diff --git a/packaging/Debian/debian-stable/scripts/patch-source b/packaging/Debian/debian-sarge/scripts/patch-source
index a8559b4167..a8559b4167 100755..100644
--- a/packaging/Debian/debian-stable/scripts/patch-source
+++ b/packaging/Debian/debian-sarge/scripts/patch-source
diff --git a/packaging/Debian/debian-sarge/scripts/unpatch-source b/packaging/Debian/debian-sarge/scripts/unpatch-source
new file mode 100644
index 0000000000..3ded1150ba
--- /dev/null
+++ b/packaging/Debian/debian-sarge/scripts/unpatch-source
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
+#
+
+# We want to reverse the patches in the opposite order we applied
+# them, hence the 'ls|sort -r'.
+for patch in `ls debian/patches/*.patch | sort -r`; do
+ patch -p1 -R --ignore-whitespace < $patch
+done
+
+# Unused code. See comment in the patch-source script.
+
+#TMPFILE=source/VERSION.debian
+#sed -e "s/^\(SAMBA_VERSION_VENDOR_SUFFIX=\).*$/\1/" source/VERSION > ${TMPFILE}
+#mv -f ${TMPFILE} source/VERSION
+
+# Regenerate configure only if it is older than configure.in
+[ source/configure -ot source/configure.in ] && (cd source && sh ./autogen.sh)
+
+exit 0
diff --git a/packaging/Debian/debian-stable/smb.conf b/packaging/Debian/debian-sarge/smb.conf
index 8a75979945..8a75979945 100644
--- a/packaging/Debian/debian-stable/smb.conf
+++ b/packaging/Debian/debian-sarge/smb.conf
diff --git a/packaging/Debian/debian-stable/smbclient.files b/packaging/Debian/debian-sarge/smbclient.files
index 96e8945bf3..96e8945bf3 100644
--- a/packaging/Debian/debian-stable/smbclient.files
+++ b/packaging/Debian/debian-sarge/smbclient.files
diff --git a/packaging/Debian/debian-sarge/smbfs.files b/packaging/Debian/debian-sarge/smbfs.files
new file mode 100644
index 0000000000..359754ebf9
--- /dev/null
+++ b/packaging/Debian/debian-sarge/smbfs.files
@@ -0,0 +1,12 @@
+sbin/mount.smbfs
+sbin/mount.smb
+sbin/mount.cifs
+usr/bin/smbmount
+usr/bin/smbumount
+usr/bin/smbmnt
+usr/share/man/man8/smbmount.8
+usr/share/man/man8/smbumount.8
+usr/share/man/man8/smbmnt.8
+usr/share/man/man8/mount.smb.8
+usr/share/man/man8/mount.smbfs.8
+usr/share/man/man8/mount.cifs.8
diff --git a/packaging/Debian/debian-stable/smbwrapper.dirs b/packaging/Debian/debian-sarge/smbwrapper.dirs
index fd727bddf0..fd727bddf0 100644
--- a/packaging/Debian/debian-stable/smbwrapper.dirs
+++ b/packaging/Debian/debian-sarge/smbwrapper.dirs
diff --git a/packaging/Debian/debian-stable/smbwrapper.docs b/packaging/Debian/debian-sarge/smbwrapper.docs
index 2924e78734..2924e78734 100644
--- a/packaging/Debian/debian-stable/smbwrapper.docs
+++ b/packaging/Debian/debian-sarge/smbwrapper.docs
diff --git a/packaging/Debian/debian-stable/smbwrapper.files b/packaging/Debian/debian-sarge/smbwrapper.files
index 08edbead6e..08edbead6e 100644
--- a/packaging/Debian/debian-stable/smbwrapper.files
+++ b/packaging/Debian/debian-sarge/smbwrapper.files
diff --git a/packaging/Debian/debian-stable/swat.config b/packaging/Debian/debian-sarge/swat.config
index e210fae55e..e210fae55e 100644
--- a/packaging/Debian/debian-stable/swat.config
+++ b/packaging/Debian/debian-sarge/swat.config
diff --git a/packaging/Debian/debian-stable/swat.dirs b/packaging/Debian/debian-sarge/swat.dirs
index d5df7df4b8..d5df7df4b8 100644
--- a/packaging/Debian/debian-stable/swat.dirs
+++ b/packaging/Debian/debian-sarge/swat.dirs
diff --git a/packaging/Debian/debian-stable/swat.files b/packaging/Debian/debian-sarge/swat.files
index 82fdf104d3..82fdf104d3 100644
--- a/packaging/Debian/debian-stable/swat.files
+++ b/packaging/Debian/debian-sarge/swat.files
diff --git a/packaging/Debian/debian-stable/swat.postinst b/packaging/Debian/debian-sarge/swat.postinst
index 338f8a07c2..338f8a07c2 100644
--- a/packaging/Debian/debian-stable/swat.postinst
+++ b/packaging/Debian/debian-sarge/swat.postinst
diff --git a/packaging/Debian/debian-stable/swat.postrm b/packaging/Debian/debian-sarge/swat.postrm
index 6bc5873096..6bc5873096 100644
--- a/packaging/Debian/debian-stable/swat.postrm
+++ b/packaging/Debian/debian-sarge/swat.postrm
diff --git a/packaging/Debian/debian-sarge/swat.templates b/packaging/Debian/debian-sarge/swat.templates
new file mode 100644
index 0000000000..3407f7efbc
--- /dev/null
+++ b/packaging/Debian/debian-sarge/swat.templates
@@ -0,0 +1,6 @@
+Template: swat/smb_conf_warn
+Type: note
+_Description: Your smb.conf will be re-written!
+ 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!
diff --git a/packaging/Debian/debian-stable/winbind.dirs b/packaging/Debian/debian-sarge/winbind.dirs
index 1da8fba83a..1da8fba83a 100644
--- a/packaging/Debian/debian-stable/winbind.dirs
+++ b/packaging/Debian/debian-sarge/winbind.dirs
diff --git a/packaging/Debian/debian-stable/winbind.files b/packaging/Debian/debian-sarge/winbind.files
index fbb76774d4..fbb76774d4 100644
--- a/packaging/Debian/debian-stable/winbind.files
+++ b/packaging/Debian/debian-sarge/winbind.files
diff --git a/packaging/Debian/debian-stable/winbind.init b/packaging/Debian/debian-sarge/winbind.init
index 2dfdf3b835..2dfdf3b835 100644
--- a/packaging/Debian/debian-stable/winbind.init
+++ b/packaging/Debian/debian-sarge/winbind.init
diff --git a/packaging/Debian/debian-stable/winbind.lintian b/packaging/Debian/debian-sarge/winbind.lintian
index fca17d3cca..fca17d3cca 100644
--- a/packaging/Debian/debian-stable/winbind.lintian
+++ b/packaging/Debian/debian-sarge/winbind.lintian
diff --git a/packaging/Debian/debian-stable/winbind.logrotate b/packaging/Debian/debian-sarge/winbind.logrotate
index e36cd1281c..e36cd1281c 100644
--- a/packaging/Debian/debian-stable/winbind.logrotate
+++ b/packaging/Debian/debian-sarge/winbind.logrotate
diff --git a/packaging/Debian/debian-stable/wins2dns.awk b/packaging/Debian/debian-sarge/wins2dns.awk
index 176868a115..176868a115 100644
--- a/packaging/Debian/debian-stable/wins2dns.awk
+++ b/packaging/Debian/debian-sarge/wins2dns.awk
diff --git a/packaging/Debian/debian-stable/samba-doc.docs b/packaging/Debian/debian-stable/samba-doc.docs
deleted file mode 100644
index 28be037320..0000000000
--- a/packaging/Debian/debian-stable/samba-doc.docs
+++ /dev/null
@@ -1,6 +0,0 @@
-README
-docs/Samba-HOWTO-Collection.pdf
-docs/THANKS
-docs/history
-docs/htmldocs/
-docs/registry/
diff --git a/packaging/Debian/debian-woody/README.build b/packaging/Debian/debian-woody/README.build
new file mode 100644
index 0000000000..0a11a1f6ea
--- /dev/null
+++ b/packaging/Debian/debian-woody/README.build
@@ -0,0 +1,397 @@
+From: Steve Langasek <vorlon@netexpress.net>
+To: "Eloy A. Paris" <eloy.paris@usa.net>
+Date: Thu, 23 Aug 2001 21:20:05 -0500 (CDT)
+Subject: Re: autobuilder failure on arm for samba-2.2.1a-3
+In-Reply-To: <20010823100906.A1092@antenas>
+Message-ID: <Pine.LNX.4.30.0108231744090.11071-100000@tennyson.netexpress.net>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+On Thu, 23 Aug 2001, Eloy A. Paris wrote:
+
+> On Wed, Aug 22, 2001 at 03:01:01PM -0500, Steve Langasek wrote:
+
+> > Hmm. Maybe the thing to do is to focus on getting config.cache (not log,
+> > cache) support into the package. Issues like this are frequent enough with
+> > Samba, and the configure tests add enough time to the build process, that I
+> > think there'd be much benefit in being able to step past a lot of these.
+
+> Uhhmmm... I don't know, I guess I don't like much the idea of
+> maintaining a config.cache. It looks like extra work plus a
+> compilation process that is "synthetic" or atificial. What happens if
+> the Samba Team adds a new test, or modifies the configure script, will
+> the config.cache pick those up?
+
+> In any case, you are the expert, so if you think that's the way to go,
+> and the burden far exceeds the problems we have right now I say let's
+> go for it. I am not well versed on autoconf and the configure process,
+> that's all...
+
+Well, I'll attach my work to the bottom of this message and let you judge it
+for yourself.
+
+The config.cache I'm trying to generate here is not equivalent to what
+a configure script outputs. The only values I'm including are those which 1)
+are no-brainers on any glibc-based platform, 2) are questions we need to force
+a particular value for regardless of the kernel being built against, or 3) are
+questions about specific bizarre features of proprietary Unices that we'll
+always get an answer of 'no' to.
+
+I've removed all of the config.cache variables related to headers, or to
+checks for particular libraries; I think it's pretty safe to assert that glibc
+provides basic C functions like select(), setenv(), and waitpid() on all our
+build targets, but I think it's less safe to assert that they'll always be
+provided by particular header files.
+
+So the config.cache won't automatically be updated with answers to new
+configure tests, but it also doesn't need to in order to be useful. There's
+really only a handful of variables in there that we /need/ in order to
+guarantee correctly-built packages, and if you want to leave out everything
+else, that's perfectly ok too. Everything from the fifth stanza on down is
+just a build-time speed-up for some of the slower architectures. Well, it
+also has the fringe benefit that the packages will FAIL to build if someone
+tries rebuilding for a really bizarre (non-Linux, non-glibc) architecture. I
+see that as a plus :), you may disagree, but in any case my next trick would
+be to add a global variable developers can set to bypass the provided
+config.cache.
+
+
+It is a little artificial, but the whole point of .debs is to be able to build
+binaries in a controlled environment. Right now, we don't really have control
+over what happens in the autobuilders. We have even /less/ control over what
+happens in a stable release: it's been two weeks now since I built binaries
+for bug #94380, and they haven't been uploaded to security.d.o yet. I'm
+guessing they won't be uploaded until Wichert is back from vacation, either --
+which is fine, but it would be nice if we didn't have to worry about
+mis-builds by the security team, or about putting the security team to extra
+trouble after the fact to get packages fixed.
+
+With a pre-loaded config.cache, we can ensure that bugs of this kind don't
+happen in woody. We can take the arm autobuilder problem into our own hands,
+and not have to worry about quirkiness in the build environment. We can even
+close bug #109773, since we no longer have to worry about detecting the
+setuid() routines.
+
+
+So to me, it definitely seems worth it. But you're the maintainer, and I
+won't ask you to put anything in the package that you're not comfortable with.
+
+
+> By the way, I think I remember someone was able to build 2.2.x succesfully on
+> the ARM. If this is the case, could it be that there's something weird
+> with Phillip's setup?
+
+It could be. There are arm packages for 2.2.1a-1, so at /some/ point the
+autobuilder was able to pass the locking test.
+
+
+> P.S. How did you know about the ARM build problems? I don't see any
+> bugs about this...
+
+<http://ftp-master.debian.org/testing/>, follow the links for samba... The
+exact reference for the arm autobuilder is at
+<http://buildd.armlinux.org/~buildd/build.php?pkg=samba&ver=2.2.1a-4&arch=arm>.
+
+Regards,
+Steve Langasek
+postmodern programmer
+
+
+diff -uNrw samba-2.2.1a-bak/debian/changelog samba-2.2.1a/debian/changelog
+--- samba-2.2.1a-bak/debian/changelog Thu Aug 23 10:27:54 2001
++++ samba-2.2.1a/debian/changelog Thu Aug 23 10:28:08 2001
+@@ -1,3 +1,12 @@
++samba (2.2.1a-4.1) unstable; urgency=low
++
++ * Fix up the build system to avoid needing to run configure as root to
++ answer questions we already know the answers to.
++ * In the process, make surprising progress towards being able to
++ cross-compile the samba packages.
++
++ -- Steve Langasek <vorlon@debian.org> Wed, 22 Aug 2001 23:35:00 -0500
++
+ samba (2.2.1a-4) unstable; urgency=low
+
+ * Fixed typo in smbmount's mount page.
+diff -uNrw samba-2.2.1a-bak/debian/config.cache samba-2.2.1a/debian/config.cache
+--- samba-2.2.1a-bak/debian/config.cache Wed Dec 31 18:00:00 1969
++++ samba-2.2.1a/debian/config.cache Thu Aug 23 10:28:08 2001
+@@ -0,0 +1,231 @@
++#
++# 22 August 2001 Steve Langasek <vorlon@debian.org>
++#
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs. It is not useful on other systems.
++# If it contains results you don't want to keep, you may remove or edit it.
++#
++# By default, configure uses ./config.cache as the cache file,
++# creating it if it does not exist already. You can give configure
++# the --cache-file=FILE option to use a different cache file; that is
++# what configure does when it calls configure scripts in
++# subdirectories, so they share the cache.
++# Giving --cache-file=/dev/null disables caching, for debugging configure.
++# config.status only pays attention to the cache file if you give it the
++# --recheck option to rerun configure.
++#
++#
++# This config.cache file contains a list of acceptable autoconf
++# values which can be used in compiling Samba for Debian woody/sid.
++#
++# Autoconf sorts options alphabetically in its output. This file
++# groups options logically.
++
++
++# Load any architecture-specific settings
++if [ -n "$DEB_HOST_GNU_TYPE" \
++ -a -f ../debian/config.cache.${DEB_HOST_GNU_TYPE} ]; then
++ . ../debian/config.cache.${DEB_HOST_GNU_TYPE}
++fi
++
++
++# This is at the top because it's most in need of regular tweaking.
++# These are options which are supported on 2.4 kernels, but not on 2.2
++# kernels.
++
++samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=no}
++samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=no}
++samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=no}
++
++
++# These are present in 2.2 kernels, but not in 2.0...
++
++samba_cv_have_setresuid=${samba_cv_have_setresuid=yes}
++samba_cv_have_setresgid=${samba_cv_have_setresgid=yes}
++samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
++
++
++# POSIX ACL support not present in Linux 2.2; not allowed in the
++# Debian packages, even if present on the build machine.
++
++ac_cv_header_sys_acl_h=${ac_cv_header_sys_acl_h=no}
++
++
++# Various basic libc/compiler stuff that it's blindingly obvious that
++# Linux supports (now watch me get bitten for saying that)
++
++ac_cv_c_const=${ac_cv_c_const=yes}
++ac_cv_c_inline=${ac_cv_c_inline=inline}
++samba_cv_volatile=${samba_cv_volatile=yes}
++ac_cv_dirent_d_off=${ac_cv_dirent_d_off=yes}
++ac_cv_func_bzero=${ac_cv_func_bzero=yes}
++ac_cv_func_chmod=${ac_cv_func_chmod=yes}
++ac_cv_func_chown=${ac_cv_func_chown=yes}
++ac_cv_func_chroot=${ac_cv_func_chroot=yes}
++ac_cv_func_connect=${ac_cv_func_connect=yes}
++ac_cv_func_dup2=${ac_cv_func_dup2=yes}
++ac_cv_func_execl=${ac_cv_func_execl=yes}
++ac_cv_func_fchmod=${ac_cv_func_fchmod=yes}
++ac_cv_func_fchown=${ac_cv_func_fchown=yes}
++ac_cv_func_fstat=${ac_cv_func_fstat=yes}
++ac_cv_func_fsync=${ac_cv_func_fsync=yes}
++ac_cv_func_ftruncate=${ac_cv_func_ftruncate=yes}
++ac_cv_func_getcwd=${ac_cv_func_getcwd=yes}
++ac_cv_func_getgrent=${ac_cv_func_getgrent=yes}
++ac_cv_func_getgrnam=${ac_cv_func_getgrnam=yes}
++ac_cv_func_getspnam=${ac_cv_func_getspnam=yes}
++ac_cv_func_glob=${ac_cv_func_glob=yes}
++ac_cv_func_grantpt=${ac_cv_func_grantpt=yes}
++ac_cv_func_initgroups=${ac_cv_func_initgroups=yes}
++ac_cv_func_llseek=${ac_cv_func_llseek=yes}
++ac_cv_func_memcmp_clean=${ac_cv_func_memcmp_clean=yes}
++ac_cv_func_memmove=${ac_cv_func_memmove=yes}
++ac_cv_func_memset=${ac_cv_func_memset=yes}
++ac_cv_func_mktime=${ac_cv_func_mktime=yes}
++ac_cv_func_pipe=${ac_cv_func_pipe=yes}
++ac_cv_func_poll=${ac_cv_func_poll=yes}
++ac_cv_func_pread=${ac_cv_func_pread=yes}
++ac_cv_func_pwrite=${ac_cv_func_pwrite=yes}
++ac_cv_func_rand=${ac_cv_func_rand=yes}
++ac_cv_func_random=${ac_cv_func_random=yes}
++ac_cv_func_readlink=${ac_cv_func_readlink=yes}
++ac_cv_func_rename=${ac_cv_func_rename=yes}
++ac_cv_func_select=${ac_cv_func_select=yes}
++ac_cv_func_setenv=${ac_cv_func_setenv=yes}
++ac_cv_func_setgroups=${ac_cv_func_setgroups=yes}
++ac_cv_func_setsid=${ac_cv_func_setsid=yes}
++ac_cv_func_sigaction=${ac_cv_func_sigaction=yes}
++ac_cv_func_sigblock=${ac_cv_func_sigblock=yes}
++ac_cv_func_sigprocmask=${ac_cv_func_sigprocmask=yes}
++ac_cv_func_snprintf=${ac_cv_func_snprintf=yes}
++ac_cv_func_srand=${ac_cv_func_srand=yes}
++ac_cv_func_srandom=${ac_cv_func_srandom=yes}
++ac_cv_func_strcasecmp=${ac_cv_func_strcasecmp=yes}
++ac_cv_func_strchr=${ac_cv_func_strchr=yes}
++ac_cv_func_strdup=${ac_cv_func_strdup=yes}
++ac_cv_func_strerror=${ac_cv_func_strerror=yes}
++ac_cv_func_strftime=${ac_cv_func_strftime=yes}
++ac_cv_func_strpbrk=${ac_cv_func_strpbrk=yes}
++ac_cv_func_strtoul=${ac_cv_func_strtoul=yes}
++ac_cv_func_symlink=${ac_cv_func_symlink=yes}
++ac_cv_func_usleep=${ac_cv_func_usleep=yes}
++ac_cv_func_utime=${ac_cv_func_utime=yes}
++ac_cv_func_utimes=${ac_cv_func_utimes=yes}
++ac_cv_func_vsnprintf=${ac_cv_func_vsnprintf=yes}
++ac_cv_func_waitpid=${ac_cv_func_waitpid=yes}
++ac_cv_type_ino_t=${ac_cv_type_ino_t=yes}
++ac_cv_type_mode_t=${ac_cv_type_mode_t=yes}
++ac_cv_type_pid_t=${ac_cv_type_pid_t=yes}
++ac_cv_type_size_t=${ac_cv_type_size_t=yes}
++ac_cv_type_uid_t=${ac_cv_type_uid_t=yes}
++samba_cv_socklen_t=${samba_cv_socklen_t=yes}
++
++# Yes, we know Linux supports fcntl locking. Just ignore
++# any errors caused by building on an NFS mount.
++samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
++
++
++# smbwrapper doesn't work because the glibc maintainers don't want
++# to support transparent userland VFS. We might as well preempt
++# any checks for shadowed symbols that are only useful for smbwrapper.
++
++ac_cv_func___acl=${ac_cv_func___acl=no}
++ac_cv_func__acl=${ac_cv_func__acl=no}
++ac_cv_func___chdir=${ac_cv_func___chdir=no}
++ac_cv_func__chdir=${ac_cv_func__chdir=no}
++ac_cv_func___close=${ac_cv_func___close=no}
++ac_cv_func__close=${ac_cv_func__close=no}
++ac_cv_func___closedir=${ac_cv_func___closedir=no}
++ac_cv_func__closedir=${ac_cv_func__closedir=no}
++ac_cv_func___dup=${ac_cv_func___dup=no}
++ac_cv_func__dup=${ac_cv_func__dup=no}
++ac_cv_func___dup2=${ac_cv_func___dup2=no}
++ac_cv_func__dup2=${ac_cv_func__dup2=no}
++ac_cv_func___facl=${ac_cv_func___facl=no}
++ac_cv_func__facl=${ac_cv_func__facl=no}
++ac_cv_func___fchdir=${ac_cv_func___fchdir=no}
++ac_cv_func__fchdir=${ac_cv_func__fchdir=no}
++ac_cv_func___fcntl=${ac_cv_func___fcntl=no}
++ac_cv_func__fcntl=${ac_cv_func__fcntl=no}
++ac_cv_func___fork=${ac_cv_func___fork=no}
++ac_cv_func__fork=${ac_cv_func__fork=no}
++ac_cv_func___fstat=${ac_cv_func___fstat=no}
++ac_cv_func__fstat=${ac_cv_func__fstat=no}
++ac_cv_func___fstat64=${ac_cv_func___fstat64=no}
++ac_cv_func__fstat64=${ac_cv_func__fstat64=no}
++ac_cv_func___fxstat=${ac_cv_func___fxstat=no}
++ac_cv_func___getcwd=${ac_cv_func___getcwd=no}
++ac_cv_func__getcwd=${ac_cv_func__getcwd=no}
++ac_cv_func___getdents=${ac_cv_func___getdents=no}
++ac_cv_func__getdents=${ac_cv_func__getdents=no}
++ac_cv_func___llseek=${ac_cv_func___llseek=no}
++ac_cv_func___sys_llseek=${ac_cv_func___sys_llseek=no}
++ac_cv_func__llseek=${ac_cv_func__llseek=no}
++ac_cv_func___lseek=${ac_cv_func___lseek=no}
++ac_cv_func__lseek=${ac_cv_func__lseek=no}
++ac_cv_func___lstat=${ac_cv_func___lstat=no}
++ac_cv_func__lstat=${ac_cv_func__lstat=no}
++ac_cv_func___lstat64=${ac_cv_func___lstat64=no}
++ac_cv_func__lstat64=${ac_cv_func__lstat64=no}
++ac_cv_func___lxstat=${ac_cv_func___lxstat=no}
++ac_cv_func___open=${ac_cv_func___open=no}
++ac_cv_func__open=${ac_cv_func__open=no}
++ac_cv_func___open64=${ac_cv_func___open64=no}
++ac_cv_func__open64=${ac_cv_func__open64=no}
++ac_cv_func___opendir=${ac_cv_func___opendir=no}
++ac_cv_func__opendir=${ac_cv_func__opendir=no}
++ac_cv_func___pread=${ac_cv_func___pread=no}
++ac_cv_func__pread=${ac_cv_func__pread=no}
++ac_cv_func___pread64=${ac_cv_func___pread64=no}
++ac_cv_func__pread64=${ac_cv_func__pread64=no}
++ac_cv_func___pwrite=${ac_cv_func___pwrite=no}
++ac_cv_func__pwrite=${ac_cv_func__pwrite=no}
++ac_cv_func___pwrite64=${ac_cv_func___pwrite64=no}
++ac_cv_func__pwrite64=${ac_cv_func__pwrite64=no}
++ac_cv_func___read=${ac_cv_func___read=no}
++ac_cv_func__read=${ac_cv_func__read=no}
++ac_cv_func___readdir=${ac_cv_func___readdir=no}
++ac_cv_func__readdir=${ac_cv_func__readdir=no}
++ac_cv_func___readdir64=${ac_cv_func___readdir64=no}
++ac_cv_func__readdir64=${ac_cv_func__readdir64=no}
++ac_cv_func___seekdir=${ac_cv_func___seekdir=no}
++ac_cv_func__seekdir=${ac_cv_func__seekdir=no}
++ac_cv_func___stat=${ac_cv_func___stat=no}
++ac_cv_func__stat=${ac_cv_func__stat=no}
++ac_cv_func___stat64=${ac_cv_func___stat64=no}
++ac_cv_func__stat64=${ac_cv_func__stat64=no}
++ac_cv_func___telldir=${ac_cv_func___telldir=no}
++ac_cv_func__telldir=${ac_cv_func__telldir=no}
++ac_cv_func___write=${ac_cv_func___write=no}
++ac_cv_func__write=${ac_cv_func__write=no}
++ac_cv_func___xstat=${ac_cv_func___xstat=no}
++
++
++
++# Miscellaneous stuff that isn't, and shouldn't be, available
++# in Debian. Those interested in building debs for other systems may
++# need to remove some of these defines.
++
++ac_cv_func_bigcrypt=${ac_cv_func_bigcrypt=no}
++ac_cv_func_crypt16=${ac_cv_func_crypt16=no}
++ac_cv_func_getauthuid=${ac_cv_func_getauthuid=no}
++ac_cv_func_getprpwnam=${ac_cv_func_getprpwnam=no}
++ac_cv_func_getpwanam=${ac_cv_func_getpwanam=no}
++ac_cv_func_putprpwnam=${ac_cv_func_putprpwnam=no}
++ac_cv_func_rdchk=${ac_cv_func_rdchk=no}
++ac_cv_func_set_auth_parameters=${ac_cv_func_set_auth_parameters=no}
++ac_cv_func_setgidx=${ac_cv_func_setgidx=no}
++ac_cv_func_setluid=${ac_cv_func_setluid=no}
++ac_cv_func_setpriv=${ac_cv_func_setpriv=no}
++ac_cv_func_setuidx=${ac_cv_func_setuidx=no}
++ac_cv_lib_sec_bigcrypt=${ac_cv_lib_sec_bigcrypt=no}
++ac_cv_lib_sec_getprpwnam=${ac_cv_lib_sec_getprpwnam=no}
++ac_cv_lib_sec_getspnam=${ac_cv_lib_sec_getspnam=no}
++ac_cv_lib_sec_putprpwnam=${ac_cv_lib_sec_putprpwnam=no}
++ac_cv_lib_sec_set_auth_parameters=${ac_cv_lib_sec_set_auth_parameters=no}
++ac_cv_lib_security_bigcrypt=${ac_cv_lib_security_bigcrypt=no}
++ac_cv_lib_security_getprpwnam=${ac_cv_lib_security_getprpwnam=no}
++ac_cv_lib_security_getspnam=${ac_cv_lib_security_getspnam=no}
++ac_cv_lib_security_putprpwnam=${ac_cv_lib_security_putprpwnam=no}
++ac_cv_lib_security_set_auth_parameters=${ac_cv_lib_security_set_auth_parameters=no}
+diff -uNrw samba-2.2.1a-bak/debian/config.cache.alpha-linux samba-2.2.1a/debian/config.cache.alpha-linux
+--- samba-2.2.1a-bak/debian/config.cache.alpha-linux Wed Dec 31 18:00:00 1969
++++ samba-2.2.1a/debian/config.cache.alpha-linux Thu Aug 23 10:28:08 2001
+@@ -0,0 +1,12 @@
++# 22 Aug 2001 Steve Langasek <vorlon@debian.org>
++
++# This file contains autoconf settings specific to the alpha-linux
++# platform that should be preloaded when building for this architecture.
++
++
++# Linux 2.2 on Alpha doesn't have a functional setresgid() call, but
++# Linux 2.4 does. Ensure that packages compiled for woody remain
++# compatible with 2.2 kernels, even if the build machine is running 2.4.
++samba_cv_have_setresgid=${samba_cv_have_setresgid=no}
++samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=no}
++samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
+diff -uNrw samba-2.2.1a-bak/debian/rules samba-2.2.1a/debian/rules
+--- samba-2.2.1a-bak/debian/rules Thu Aug 23 10:27:54 2001
++++ samba-2.2.1a/debian/rules Thu Aug 23 10:28:08 2001
+@@ -15,6 +15,14 @@
+ # This has to be exported to make some magic below work.
+ export DH_OPTIONS
+
++# Set the host and build architectures for use with config.cache loading,
++# cross-building, etc.
++DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
++DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++
++export DEB_HOST_GNU_TYPE
++export DEB_BUILD_GNU_TYPE
++
+ BVARS = SMBLOGFILE=/var/log/smb NMBLOGFILE=/var/log/nmb
+
+ DESTDIR=`pwd`/debian/samba
+@@ -48,8 +56,11 @@
+ # ./configure --with-fhs --prefix=/usr --sysconfdir=/etc \
+ # --localstatedir=/var
+
++ if [ -f debian/config.cache ]; then \
++ cp -f debian/config.cache source/config.cache; \
++ fi
+ # [ -f source/Makefile ] || (cd source && ./configure --with-fhs --prefix=/usr --exec-prefix=/usr --with-netatalk --with-smbmount --with-pam --with-syslog --with-sambabook --with-utmp)
+- [ -f source/Makefile ] || (cd source && ./configure --with-fhs --prefix=/usr --sysconfdir=/etc --with-privatedir=/etc/samba --with-lockdir=/var/state/samba --localstatedir=/var --with-netatalk --with-smbmount --with-pam --with-syslog --with-sambabook --with-utmp --with-readline --with-pam_smbpass)
++ [ -f source/Makefile ] || (cd source && ./configure --host=$(DEB_HOST_GNU_TYPE)-gnu --build=$(DEB_BUILD_GNU_TYPE)-gnu --with-fhs --prefix=/usr --sysconfdir=/etc --with-privatedir=/etc/samba --with-lockdir=/var/state/samba --localstatedir=/var --with-netatalk --with-smbmount --with-pam --with-syslog --with-sambabook --with-utmp --with-readline --with-pam_smbpass)
+
+ touch configure-stamp
+
diff --git a/packaging/Debian/debian-stable/README.build-upstream b/packaging/Debian/debian-woody/README.build-upstream
index 24d2c1c93c..24d2c1c93c 100644
--- a/packaging/Debian/debian-stable/README.build-upstream
+++ b/packaging/Debian/debian-woody/README.build-upstream
diff --git a/packaging/Debian/debian-stable/README.debian b/packaging/Debian/debian-woody/README.debian
index 5ea80e32ae..4afe04f6df 100644
--- a/packaging/Debian/debian-stable/README.debian
+++ b/packaging/Debian/debian-woody/README.debian
@@ -1,6 +1,6 @@
0. Samba Team Notes:
-This package is targeted at the current stable release of debian distribution
-(woody) running on a 2.4.x kernel.
+This package is targeted at the woody release of debian distribution
+running on a 2.4.x kernel.
This package has been made by Simo Sorce on behalf of the Samba Team.
Do not use Debian BTS to report bugs, it's not a debian project package.
Thanks to Eloy Paris and Steve "Vorlon" Langasek for the work they've done
diff --git a/packaging/Debian/debian-woody/TODO b/packaging/Debian/debian-woody/TODO
new file mode 100644
index 0000000000..5883f72a92
--- /dev/null
+++ b/packaging/Debian/debian-woody/TODO
@@ -0,0 +1,4 @@
+Nothing in our list right now.
+
+Debian Samba Maintainers.-
+Sun Apr 6 01:34:21 EST 2003
diff --git a/packaging/Debian/debian-stable/changelog b/packaging/Debian/debian-woody/changelog
index 4a5d7201ec..d05fabac05 100644
--- a/packaging/Debian/debian-stable/changelog
+++ b/packaging/Debian/debian-woody/changelog
@@ -1,3 +1,15 @@
+samba (3.0.20b-1woody1) stable; urgency=low
+
+ * samba 3.0.20b release
+
+ -- Simo Sorce <idra@samba.org> Sun, 23 October 2005 19:26:00 +0200
+
+samba (3.0.14a-1) stable; urgency=high
+
+ * samba 3.0.14a release
+
+ -- Simo Sorce <idra@samba.org> Thu, 21 April 2005 12:30:00 +0200
+
samba (3.0.13-1) stable; urgency=high
* samba 3.0.13 release
diff --git a/packaging/Debian/debian-woody/config.cache b/packaging/Debian/debian-woody/config.cache
new file mode 100644
index 0000000000..8872a27b76
--- /dev/null
+++ b/packaging/Debian/debian-woody/config.cache
@@ -0,0 +1,221 @@
+#
+# 22 August 2001 Steve Langasek <vorlon@debian.org>
+#
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs. It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already. You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+#
+# This config.cache file contains a list of acceptable autoconf
+# values which can be used in compiling Samba for Debian woody/sid.
+#
+# Autoconf sorts options alphabetically in its output. This file
+# groups options logically.
+
+
+# Load any architecture-specific settings
+if [ -n "$DEB_HOST_GNU_TYPE" \
+ -a -f ../debian/config.cache.${DEB_HOST_GNU_TYPE} ]; then
+ . ../debian/config.cache.${DEB_HOST_GNU_TYPE}
+fi
+
+
+# This is at the top because it's most in need of regular tweaking.
+# These are options which are supported on 2.4 kernels, but not on 2.2
+# kernels.
+
+samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=no}
+samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=no}
+samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=no}
+
+
+# These are present in 2.2 kernels, but not in 2.0...
+
+samba_cv_have_setresuid=${samba_cv_have_setresuid=yes}
+samba_cv_have_setresgid=${samba_cv_have_setresgid=yes}
+samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
+
+
+# Various basic libc/compiler stuff that it's blindingly obvious that
+# Linux supports (now watch me get bitten for saying that)
+
+ac_cv_c_const=${ac_cv_c_const=yes}
+ac_cv_c_inline=${ac_cv_c_inline=inline}
+samba_cv_volatile=${samba_cv_volatile=yes}
+ac_cv_dirent_d_off=${ac_cv_dirent_d_off=yes}
+ac_cv_func_bzero=${ac_cv_func_bzero=yes}
+ac_cv_func_chmod=${ac_cv_func_chmod=yes}
+ac_cv_func_chown=${ac_cv_func_chown=yes}
+ac_cv_func_chroot=${ac_cv_func_chroot=yes}
+ac_cv_func_connect=${ac_cv_func_connect=yes}
+ac_cv_func_dup2=${ac_cv_func_dup2=yes}
+ac_cv_func_execl=${ac_cv_func_execl=yes}
+ac_cv_func_fchmod=${ac_cv_func_fchmod=yes}
+ac_cv_func_fchown=${ac_cv_func_fchown=yes}
+ac_cv_func_fstat=${ac_cv_func_fstat=yes}
+ac_cv_func_fsync=${ac_cv_func_fsync=yes}
+ac_cv_func_ftruncate=${ac_cv_func_ftruncate=yes}
+ac_cv_func_getcwd=${ac_cv_func_getcwd=yes}
+ac_cv_func_getgrent=${ac_cv_func_getgrent=yes}
+ac_cv_func_getgrnam=${ac_cv_func_getgrnam=yes}
+ac_cv_func_getspnam=${ac_cv_func_getspnam=yes}
+ac_cv_func_glob=${ac_cv_func_glob=yes}
+ac_cv_func_grantpt=${ac_cv_func_grantpt=yes}
+ac_cv_func_initgroups=${ac_cv_func_initgroups=yes}
+ac_cv_func_llseek=${ac_cv_func_llseek=yes}
+ac_cv_func_memcmp_clean=${ac_cv_func_memcmp_clean=yes}
+ac_cv_func_memmove=${ac_cv_func_memmove=yes}
+ac_cv_func_memset=${ac_cv_func_memset=yes}
+ac_cv_func_mktime=${ac_cv_func_mktime=yes}
+ac_cv_func_pipe=${ac_cv_func_pipe=yes}
+ac_cv_func_poll=${ac_cv_func_poll=yes}
+ac_cv_func_pread=${ac_cv_func_pread=yes}
+ac_cv_func_pwrite=${ac_cv_func_pwrite=yes}
+ac_cv_func_rand=${ac_cv_func_rand=yes}
+ac_cv_func_random=${ac_cv_func_random=yes}
+ac_cv_func_readlink=${ac_cv_func_readlink=yes}
+ac_cv_func_rename=${ac_cv_func_rename=yes}
+ac_cv_func_select=${ac_cv_func_select=yes}
+ac_cv_func_setenv=${ac_cv_func_setenv=yes}
+ac_cv_func_setgroups=${ac_cv_func_setgroups=yes}
+ac_cv_func_setsid=${ac_cv_func_setsid=yes}
+ac_cv_func_sigaction=${ac_cv_func_sigaction=yes}
+ac_cv_func_sigblock=${ac_cv_func_sigblock=yes}
+ac_cv_func_sigprocmask=${ac_cv_func_sigprocmask=yes}
+ac_cv_func_snprintf=${ac_cv_func_snprintf=yes}
+ac_cv_func_srand=${ac_cv_func_srand=yes}
+ac_cv_func_srandom=${ac_cv_func_srandom=yes}
+ac_cv_func_strcasecmp=${ac_cv_func_strcasecmp=yes}
+ac_cv_func_strchr=${ac_cv_func_strchr=yes}
+ac_cv_func_strdup=${ac_cv_func_strdup=yes}
+ac_cv_func_strerror=${ac_cv_func_strerror=yes}
+ac_cv_func_strftime=${ac_cv_func_strftime=yes}
+ac_cv_func_strpbrk=${ac_cv_func_strpbrk=yes}
+ac_cv_func_strtoul=${ac_cv_func_strtoul=yes}
+ac_cv_func_symlink=${ac_cv_func_symlink=yes}
+ac_cv_func_usleep=${ac_cv_func_usleep=yes}
+ac_cv_func_utime=${ac_cv_func_utime=yes}
+ac_cv_func_utimes=${ac_cv_func_utimes=yes}
+ac_cv_func_vsnprintf=${ac_cv_func_vsnprintf=yes}
+ac_cv_func_waitpid=${ac_cv_func_waitpid=yes}
+ac_cv_type_ino_t=${ac_cv_type_ino_t=yes}
+ac_cv_type_mode_t=${ac_cv_type_mode_t=yes}
+ac_cv_type_pid_t=${ac_cv_type_pid_t=yes}
+ac_cv_type_size_t=${ac_cv_type_size_t=yes}
+ac_cv_type_uid_t=${ac_cv_type_uid_t=yes}
+samba_cv_socklen_t=${samba_cv_socklen_t=yes}
+
+# Yes, we know Linux supports fcntl locking. Just ignore
+# any errors caused by building on an NFS mount.
+samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
+
+
+# smbwrapper doesn't work because the glibc maintainers don't want
+# to support transparent userland VFS. We might as well preempt
+# any checks for shadowed symbols that are only useful for smbwrapper.
+
+ac_cv_func___chdir=${ac_cv_func___chdir=no}
+ac_cv_func__chdir=${ac_cv_func__chdir=no}
+ac_cv_func___close=${ac_cv_func___close=no}
+ac_cv_func__close=${ac_cv_func__close=no}
+ac_cv_func___closedir=${ac_cv_func___closedir=no}
+ac_cv_func__closedir=${ac_cv_func__closedir=no}
+ac_cv_func___dup=${ac_cv_func___dup=no}
+ac_cv_func__dup=${ac_cv_func__dup=no}
+ac_cv_func___dup2=${ac_cv_func___dup2=no}
+ac_cv_func__dup2=${ac_cv_func__dup2=no}
+ac_cv_func___fchdir=${ac_cv_func___fchdir=no}
+ac_cv_func__fchdir=${ac_cv_func__fchdir=no}
+ac_cv_func___fcntl=${ac_cv_func___fcntl=no}
+ac_cv_func__fcntl=${ac_cv_func__fcntl=no}
+ac_cv_func___fork=${ac_cv_func___fork=no}
+ac_cv_func__fork=${ac_cv_func__fork=no}
+ac_cv_func___fstat=${ac_cv_func___fstat=no}
+ac_cv_func__fstat=${ac_cv_func__fstat=no}
+ac_cv_func___fstat64=${ac_cv_func___fstat64=no}
+ac_cv_func__fstat64=${ac_cv_func__fstat64=no}
+ac_cv_func___fxstat=${ac_cv_func___fxstat=no}
+ac_cv_func___getcwd=${ac_cv_func___getcwd=no}
+ac_cv_func__getcwd=${ac_cv_func__getcwd=no}
+ac_cv_func___getdents=${ac_cv_func___getdents=no}
+ac_cv_func__getdents=${ac_cv_func__getdents=no}
+ac_cv_func___llseek=${ac_cv_func___llseek=no}
+ac_cv_func___sys_llseek=${ac_cv_func___sys_llseek=no}
+ac_cv_func__llseek=${ac_cv_func__llseek=no}
+ac_cv_func___lseek=${ac_cv_func___lseek=no}
+ac_cv_func__lseek=${ac_cv_func__lseek=no}
+ac_cv_func___lstat=${ac_cv_func___lstat=no}
+ac_cv_func__lstat=${ac_cv_func__lstat=no}
+ac_cv_func___lstat64=${ac_cv_func___lstat64=no}
+ac_cv_func__lstat64=${ac_cv_func__lstat64=no}
+ac_cv_func___lxstat=${ac_cv_func___lxstat=no}
+ac_cv_func___open=${ac_cv_func___open=no}
+ac_cv_func__open=${ac_cv_func__open=no}
+ac_cv_func___open64=${ac_cv_func___open64=no}
+ac_cv_func__open64=${ac_cv_func__open64=no}
+ac_cv_func___opendir=${ac_cv_func___opendir=no}
+ac_cv_func__opendir=${ac_cv_func__opendir=no}
+ac_cv_func___pread=${ac_cv_func___pread=no}
+ac_cv_func__pread=${ac_cv_func__pread=no}
+ac_cv_func___pread64=${ac_cv_func___pread64=no}
+ac_cv_func__pread64=${ac_cv_func__pread64=no}
+ac_cv_func___pwrite=${ac_cv_func___pwrite=no}
+ac_cv_func__pwrite=${ac_cv_func__pwrite=no}
+ac_cv_func___pwrite64=${ac_cv_func___pwrite64=no}
+ac_cv_func__pwrite64=${ac_cv_func__pwrite64=no}
+ac_cv_func___read=${ac_cv_func___read=no}
+ac_cv_func__read=${ac_cv_func__read=no}
+ac_cv_func___readdir=${ac_cv_func___readdir=no}
+ac_cv_func__readdir=${ac_cv_func__readdir=no}
+ac_cv_func___readdir64=${ac_cv_func___readdir64=no}
+ac_cv_func__readdir64=${ac_cv_func__readdir64=no}
+ac_cv_func___seekdir=${ac_cv_func___seekdir=no}
+ac_cv_func__seekdir=${ac_cv_func__seekdir=no}
+ac_cv_func___stat=${ac_cv_func___stat=no}
+ac_cv_func__stat=${ac_cv_func__stat=no}
+ac_cv_func___stat64=${ac_cv_func___stat64=no}
+ac_cv_func__stat64=${ac_cv_func__stat64=no}
+ac_cv_func___telldir=${ac_cv_func___telldir=no}
+ac_cv_func__telldir=${ac_cv_func__telldir=no}
+ac_cv_func___write=${ac_cv_func___write=no}
+ac_cv_func__write=${ac_cv_func__write=no}
+ac_cv_func___xstat=${ac_cv_func___xstat=no}
+
+
+
+# Miscellaneous stuff that isn't, and shouldn't be, available
+# in Debian. Those interested in building debs for other systems may
+# need to remove some of these defines.
+
+ac_cv_func_bigcrypt=${ac_cv_func_bigcrypt=no}
+ac_cv_func_crypt16=${ac_cv_func_crypt16=no}
+ac_cv_func_getauthuid=${ac_cv_func_getauthuid=no}
+ac_cv_func_getprpwnam=${ac_cv_func_getprpwnam=no}
+ac_cv_func_getpwanam=${ac_cv_func_getpwanam=no}
+ac_cv_func_putprpwnam=${ac_cv_func_putprpwnam=no}
+ac_cv_func_rdchk=${ac_cv_func_rdchk=no}
+ac_cv_func_set_auth_parameters=${ac_cv_func_set_auth_parameters=no}
+ac_cv_func_setgidx=${ac_cv_func_setgidx=no}
+ac_cv_func_setluid=${ac_cv_func_setluid=no}
+ac_cv_func_setpriv=${ac_cv_func_setpriv=no}
+ac_cv_func_setuidx=${ac_cv_func_setuidx=no}
+ac_cv_lib_sec_bigcrypt=${ac_cv_lib_sec_bigcrypt=no}
+ac_cv_lib_sec_getprpwnam=${ac_cv_lib_sec_getprpwnam=no}
+ac_cv_lib_sec_getspnam=${ac_cv_lib_sec_getspnam=no}
+ac_cv_lib_sec_putprpwnam=${ac_cv_lib_sec_putprpwnam=no}
+ac_cv_lib_sec_set_auth_parameters=${ac_cv_lib_sec_set_auth_parameters=no}
+ac_cv_lib_security_bigcrypt=${ac_cv_lib_security_bigcrypt=no}
+ac_cv_lib_security_getprpwnam=${ac_cv_lib_security_getprpwnam=no}
+ac_cv_lib_security_getspnam=${ac_cv_lib_security_getspnam=no}
+ac_cv_lib_security_putprpwnam=${ac_cv_lib_security_putprpwnam=no}
+ac_cv_lib_security_set_auth_parameters=${ac_cv_lib_security_set_auth_parameters=no}
diff --git a/packaging/Debian/debian-woody/config.cache.alpha-linux b/packaging/Debian/debian-woody/config.cache.alpha-linux
new file mode 100644
index 0000000000..6d17192026
--- /dev/null
+++ b/packaging/Debian/debian-woody/config.cache.alpha-linux
@@ -0,0 +1,12 @@
+# 22 Aug 2001 Steve Langasek <vorlon@debian.org>
+
+# This file contains autoconf settings specific to the alpha-linux
+# platform that should be preloaded when building for this architecture.
+
+
+# Linux 2.2 on Alpha doesn't have a functional setresgid() call, but
+# Linux 2.4 does. Ensure that packages compiled for woody remain
+# compatible with 2.2 kernels, even if the build machine is running 2.4.
+samba_cv_have_setresgid=${samba_cv_have_setresgid=no}
+samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=no}
+samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
diff --git a/packaging/Debian/debian-woody/config.cache.sparc-linux b/packaging/Debian/debian-woody/config.cache.sparc-linux
new file mode 100644
index 0000000000..a2a21b1d3a
--- /dev/null
+++ b/packaging/Debian/debian-woody/config.cache.sparc-linux
@@ -0,0 +1,13 @@
+# 24 Spe 2001 Steve Langasek <vorlon@debian.org>
+
+# This file contains autoconf settings specific to the sparc-linux
+# platform that should be preloaded when building for this architecture.
+
+
+# Linux 2.2 on Sparc doesn't have setresgid() or setresuid(), but
+# Linux 2.4 does. Ensure that packages compiled for woody remain
+# compatible with 2.2 kernels, even if the build machine is running 2.4.
+samba_cv_have_setresuid=${samba_cv_have_setresuid=no}
+samba_cv_have_setresgid=${samba_cv_have_setresgid=no}
+samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=no}
+samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
diff --git a/packaging/Debian/debian-stable/control b/packaging/Debian/debian-woody/control
index 4ef4445695..4ef4445695 100644
--- a/packaging/Debian/debian-stable/control
+++ b/packaging/Debian/debian-woody/control
diff --git a/packaging/Debian/debian-stable/copyright b/packaging/Debian/debian-woody/copyright
index e74a64fa5b..e74a64fa5b 100644
--- a/packaging/Debian/debian-stable/copyright
+++ b/packaging/Debian/debian-woody/copyright
diff --git a/packaging/Debian/debian-woody/gdbcommands b/packaging/Debian/debian-woody/gdbcommands
new file mode 100644
index 0000000000..5774b9ae31
--- /dev/null
+++ b/packaging/Debian/debian-woody/gdbcommands
@@ -0,0 +1,2 @@
+bt
+quit
diff --git a/packaging/Debian/debian-woody/libpam-smbpass.docs b/packaging/Debian/debian-woody/libpam-smbpass.docs
new file mode 100644
index 0000000000..89fbbf9042
--- /dev/null
+++ b/packaging/Debian/debian-woody/libpam-smbpass.docs
@@ -0,0 +1,2 @@
+source/pam_smbpass/README
+source/pam_smbpass/TODO
diff --git a/packaging/Debian/debian-woody/libpam-smbpass.examples b/packaging/Debian/debian-woody/libpam-smbpass.examples
new file mode 100644
index 0000000000..48d841b2c1
--- /dev/null
+++ b/packaging/Debian/debian-woody/libpam-smbpass.examples
@@ -0,0 +1,5 @@
+source/pam_smbpass/samples/README
+source/pam_smbpass/samples/kdc-pdc
+source/pam_smbpass/samples/password-mature
+source/pam_smbpass/samples/password-migration
+source/pam_smbpass/samples/password-sync
diff --git a/packaging/Debian/debian-woody/libpam-smbpass.files b/packaging/Debian/debian-woody/libpam-smbpass.files
new file mode 100644
index 0000000000..4263df5c0f
--- /dev/null
+++ b/packaging/Debian/debian-woody/libpam-smbpass.files
@@ -0,0 +1 @@
+lib/security/pam_smbpass.so
diff --git a/packaging/Debian/debian-woody/libsmbclient-dev.examples b/packaging/Debian/debian-woody/libsmbclient-dev.examples
new file mode 100644
index 0000000000..2094c40b55
--- /dev/null
+++ b/packaging/Debian/debian-woody/libsmbclient-dev.examples
@@ -0,0 +1 @@
+examples/libsmbclient/
diff --git a/packaging/Debian/debian-woody/libsmbclient-dev.files b/packaging/Debian/debian-woody/libsmbclient-dev.files
new file mode 100644
index 0000000000..a52c17cfc5
--- /dev/null
+++ b/packaging/Debian/debian-woody/libsmbclient-dev.files
@@ -0,0 +1,3 @@
+usr/lib/libsmbclient.a
+usr/lib/libsmbclient.so
+usr/include/libsmbclient.h
diff --git a/packaging/Debian/debian-woody/libsmbclient.files b/packaging/Debian/debian-woody/libsmbclient.files
new file mode 100644
index 0000000000..18b7f3b165
--- /dev/null
+++ b/packaging/Debian/debian-woody/libsmbclient.files
@@ -0,0 +1,2 @@
+usr/lib/libsmbclient.so.0.1
+usr/lib/libsmbclient.so.0
diff --git a/packaging/Debian/debian-stable/libsmbclient.shlibs b/packaging/Debian/debian-woody/libsmbclient.shlibs
index 9c6eea200a..9c6eea200a 100644
--- a/packaging/Debian/debian-stable/libsmbclient.shlibs
+++ b/packaging/Debian/debian-woody/libsmbclient.shlibs
diff --git a/packaging/Debian/debian-woody/mksmbpasswd.8 b/packaging/Debian/debian-woody/mksmbpasswd.8
new file mode 100644
index 0000000000..0a500102e8
--- /dev/null
+++ b/packaging/Debian/debian-woody/mksmbpasswd.8
@@ -0,0 +1,28 @@
+.TH MKSMBPASSWD 8 12-Apr-1998
+.SH NAME
+mksmbpasswd \- formats a /etc/passwd entry for a smbpasswd file
+.SH SYNOPSIS
+mksmbpasswd cat /etc/passwd | /usr/sbin/mksmbpasswd > /etc/samba/smbpasswd
+.SH DESCRIPTION
+.B mksmbpasswd
+should be used only once, the first time Samba is installed. The idea
+is to ease accounts creation by transferring all user accounts from
+/etc/passwd to /etc/samba/smbpasswd.
+.PP
+Please note that passwords are not transferred automatically from
+/etc/passwd to the new /etc/samba/smbpasswd file. After running
+.B mksmbpasswd
+all accounts are disabled so the system administrator must run
+smbpasswd for each account that needs to be enable.
+.SH FILES
+.TP
+/etc/passwd
+System wide accounts file
+.TP
+/etc/samba/smbpasswd
+Encrypted passwords file for the Samba daemons
+.SH SEE ALSO
+samba(7), nmbd(8), smbd(8)
+.SH AUTHOR
+Eloy A. Paris <peloy@debian.org> (man page based on sendmailconfig's man page
+by Robert Leslie <rob@mars.org>)
diff --git a/packaging/Debian/debian-woody/mksmbpasswd.awk b/packaging/Debian/debian-woody/mksmbpasswd.awk
new file mode 100644
index 0000000000..a7b41a725d
--- /dev/null
+++ b/packaging/Debian/debian-woody/mksmbpasswd.awk
@@ -0,0 +1,5 @@
+#!/usr/bin/awk -f
+BEGIN {FS=":"
+ printf("#\n# SMB password file.\n#\n")
+ }
+{ printf( "%s:%s:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:[U ]:LCT-00000000:%s\n", $1, $3, $5) }
diff --git a/packaging/Debian/debian-stable/mount.cifs.files b/packaging/Debian/debian-woody/mount.cifs.files
index d5bb66ede4..d5bb66ede4 100644
--- a/packaging/Debian/debian-stable/mount.cifs.files
+++ b/packaging/Debian/debian-woody/mount.cifs.files
diff --git a/packaging/Debian/debian-woody/panic-action b/packaging/Debian/debian-woody/panic-action
new file mode 100644
index 0000000000..13f773c1ef
--- /dev/null
+++ b/packaging/Debian/debian-woody/panic-action
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# Redirect all output to our mail command
+(
+ # We must be given a pid to look at
+ if [ -z "$1" ]; then
+ echo "$0 called with no arguments."
+ exit 1
+ fi
+
+ if [ ! -d "/proc/$1" ]; then
+ echo "$0: No such process: $1"
+ exit 1
+ fi
+
+ # Find out what binary we're debugging
+ BINARYNAME=`readlink "/proc/$1/exe"`
+
+ # Generic header for our email
+ echo "The Samba 'panic action' script, $0,"
+ echo "was called for pid $1 ($BINARYNAME)."
+ echo
+
+ if [ -z "$BINARYNAME" ]; then
+ echo "This means there was a problem with the program, such as a segfault."
+ echo "However, the executable could not be found for process $1."
+ echo "It may have died unexpectedly, or you may not have permission to"
+ echo "debug the process."
+ exit 1
+ fi
+
+ # No debugger
+ if [ ! -x /usr/bin/gdb ]; then
+ echo "This means there was a problem with the program, such as a segfault."
+ echo "However, gdb was not found on your system, so the error could not be"
+ echo "debugged. Please install the gdb package so that debugging information is"
+ echo "available the next time such a problem occurs."
+ exit 1
+ fi
+
+ echo "Below is a backtrace for this process generated with gdb, which shows"
+ echo "the state of the program at the time the error occured. You are"
+ echo "encouraged to submit this information as a bug report to Debian. For"
+ echo "information about the procedure for submitting bug reports , please see"
+ echo "http://www.debian.org/Bugs/Reporting or the reportbug(1) manpage."
+ echo
+ gdb -x /etc/samba/gdbcommands -batch "$BINARYNAME" "$1"
+) | mail -s "Segfault in Samba" root
diff --git a/packaging/Debian/debian-stable/patches/documentation.patch b/packaging/Debian/debian-woody/patches/documentation.patch
index ab64790fc9..ab64790fc9 100644
--- a/packaging/Debian/debian-stable/patches/documentation.patch
+++ b/packaging/Debian/debian-woody/patches/documentation.patch
diff --git a/packaging/Debian/debian-stable/patches/fhs.patch b/packaging/Debian/debian-woody/patches/fhs.patch
index 760306a3c3..3fce15de78 100644
--- a/packaging/Debian/debian-stable/patches/fhs.patch
+++ b/packaging/Debian/debian-woody/patches/fhs.patch
@@ -457,26 +457,26 @@ diff -uNr samba-3.0.0beta2.orig/source/printing/printing_db.c samba-3.0.0beta2/s
pstrcat(printdb_path, printername);
pstrcat(printdb_path, ".tdb");
-diff -uNr samba-3.0.0beta2.orig/source/registry/reg_db.c samba-3.0.0beta2/source/registry/reg_db.c
---- samba-3.0.0beta2.orig/source/registry/reg_db.c 2003-07-02 23:26:47.000000000 -0500
-+++ samba-3.0.0beta2/source/registry/reg_db.c 2003-07-02 23:19:02.000000000 -0500
-@@ -131,13 +131,13 @@
- * if we need to init the data in the registry
- */
-
-- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
-+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
- if ( !tdb_reg )
- {
+diff -uNr samba-3.0.20b.orig/source/registry/reg_db.c samba-3.0.20b/source/registry/reg_db.c
+--- samba-3.0.20b.orig/source/registry/reg_db.c 2003-07-02 23:26:47.000000000 -0500
++++ samba-3.0.20b/source/registry/reg_db.c 2003-07-02 23:19:02.000000000 -0500
+@@ -198,13 +198,13 @@
+ if ( tdb_reg )
+ return True;
+
+- if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
++ if ( !(tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
+ {
- tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+ tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
- if ( !tdb_reg ) {
- DEBUG(0,("init_registry: Failed to open registry %s (%s)\n",
+ if ( !tdb_reg ) {
+ DEBUG(0,("init_registry: Failed to open registry %s (%s)\n",
- lock_path("registry.tdb"), strerror(errno) ));
+ state_path("registry.tdb"), strerror(errno) ));
- return False;
- }
-
+ return False;
+ }
+
+ DEBUG(10,("init_registry: Successfully created registry tdb\n"));
diff -uNr samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0beta2/source/rpc_server/srv_srvsvc_nt.c
--- samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c 2003-07-02 23:26:47.000000000 -0500
+++ samba-3.0.0beta2/source/rpc_server/srv_srvsvc_nt.c 2003-07-02 23:19:02.000000000 -0500
diff --git a/packaging/Debian/debian-stable/patches/installswat.sh.patch b/packaging/Debian/debian-woody/patches/installswat.sh.patch
index 8bd120257e..8bd120257e 100644
--- a/packaging/Debian/debian-stable/patches/installswat.sh.patch
+++ b/packaging/Debian/debian-woody/patches/installswat.sh.patch
diff --git a/packaging/Debian/debian-woody/patches/nmbd-signalling.patch b/packaging/Debian/debian-woody/patches/nmbd-signalling.patch
new file mode 100644
index 0000000000..ca04cce3bf
--- /dev/null
+++ b/packaging/Debian/debian-woody/patches/nmbd-signalling.patch
@@ -0,0 +1,20 @@
+diff -uNr samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c
+--- samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c 2002-11-26 20:54:19.000000000 -0600
++++ samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c 2002-12-16 23:34:13.000000000 -0600
+@@ -214,12 +214,16 @@
+ extern struct in_addr loopback_ip;
+
+ if(num_interfaces == 0) {
++ void (*old_handler)(int);
++
+ DEBUG(0,("create_subnets: No local interfaces !\n"));
+ DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
++ old_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+ while (iface_count() == 0) {
+ sleep(5);
+ load_interfaces();
+ }
++ CatchSignal( SIGTERM, SIGNAL_CAST old_handler );
+ }
+
+ num_interfaces = iface_count();
diff --git a/packaging/Debian/debian-stable/patches/samba.patch b/packaging/Debian/debian-woody/patches/samba.patch
index dd1303ad90..dd1303ad90 100644
--- a/packaging/Debian/debian-stable/patches/samba.patch
+++ b/packaging/Debian/debian-woody/patches/samba.patch
diff --git a/packaging/Debian/debian-woody/patches/smbclient-pager.patch b/packaging/Debian/debian-woody/patches/smbclient-pager.patch
new file mode 100644
index 0000000000..3ee85d4118
--- /dev/null
+++ b/packaging/Debian/debian-woody/patches/smbclient-pager.patch
@@ -0,0 +1,12 @@
+diff -uNr samba-2.999+3.0cvs20020906.orig/source/include/local.h samba-2.999+3.0cvs20020906/source/include/local.h
+--- samba-2.999+3.0cvs20020906.orig/source/include/local.h 2002-09-04 14:13:06.000000000 -0500
++++ samba-2.999+3.0cvs20020906/source/include/local.h 2002-09-08 14:19:24.000000000 -0500
+@@ -109,7 +109,7 @@
+ /* the default pager to use for the client "more" command. Users can
+ override this with the PAGER environment variable */
+ #ifndef PAGER
+-#define PAGER "more"
++#define PAGER "/usr/bin/pager"
+ #endif
+
+ /* the size of the uid cache used to reduce valid user checks */
diff --git a/packaging/Debian/debian-woody/patches/smbclient-tar.patch.unused b/packaging/Debian/debian-woody/patches/smbclient-tar.patch.unused
new file mode 100644
index 0000000000..e2a4c3ce2c
--- /dev/null
+++ b/packaging/Debian/debian-woody/patches/smbclient-tar.patch.unused
@@ -0,0 +1,43 @@
+diff -uNr samba-3.0.0beta2.orig/source/client/client.c samba-3.0.0beta2/source/client/client.c
+--- samba-3.0.0beta2.orig/source/client/client.c 2003-07-01 22:36:24.000000000 -0500
++++ samba-3.0.0beta2/source/client/client.c 2003-07-06 15:17:36.000000000 -0500
+@@ -2773,6 +2773,7 @@
+ int opt;
+ pstring query_host;
+ BOOL message = False;
++ char* tar_args = NULL;
+ extern char tar_type;
+ pstring term_code;
+ static const char *new_name_resolve_order = NULL;
+@@ -2816,7 +2817,7 @@
+ max_protocol = interpret_protocol(poptGetOptArg(pc), max_protocol);
+ break;
+ case 'T':
+- if (!tar_parseargs(argc, argv, poptGetOptArg(pc), optind)) {
++ if (!(tar_args = poptGetOptArg(pc))) {
+ poptPrintUsage(pc, stderr, 0);
+ exit(1);
+ }
+@@ -2917,6 +2917,22 @@
+ pstrcpy(cmdline_auth_info.password,poptGetArg(pc));
+ }
+
++ /* The tar command may take a number of string options; pass
++ everything we have left to tar_parseargs(). */
++ if (tar_args) {
++ const char **argv2 = poptGetArgs(pc);
++ int argc2 = 0;
++
++ if (argv2) {
++ while (argv2[argc2]) argc2++;
++ }
++
++ if (!tar_parseargs(argc2, argv2, tar_args, 0)) {
++ poptPrintUsage(pc, stderr, 0);
++ exit(1);
++ }
++ }
++
+ init_names();
+
+ if(new_name_resolve_order)
diff --git a/packaging/Debian/debian-woody/patches/smbmount-mtab-flags.patch b/packaging/Debian/debian-woody/patches/smbmount-mtab-flags.patch
new file mode 100644
index 0000000000..dac999dd63
--- /dev/null
+++ b/packaging/Debian/debian-woody/patches/smbmount-mtab-flags.patch
@@ -0,0 +1,15 @@
+diff -ur samba-2.2.4.orig/source/client/smbmnt.c samba-2.2.4/source/client/smbmnt.c
+--- samba-2.2.4.orig/source/client/smbmnt.c Sun Apr 8 15:22:51 2001
++++ samba-2.2.4/source/client/smbmnt.c Sun May 5 16:42:29 2002
+@@ -259,7 +259,10 @@
+ ment.mnt_fsname = share_name ? share_name : "none";
+ ment.mnt_dir = mount_point;
+ ment.mnt_type = "smbfs";
+- ment.mnt_opts = "";
++ if (mount_ro)
++ ment.mnt_opts = "ro";
++ else
++ ment.mnt_opts = "rw";
+ ment.mnt_freq = 0;
+ ment.mnt_passno= 0;
+
diff --git a/packaging/Debian/debian-stable/patches/smbmount-nomtab.patch b/packaging/Debian/debian-woody/patches/smbmount-nomtab.patch
index 8807148170..8807148170 100644
--- a/packaging/Debian/debian-stable/patches/smbmount-nomtab.patch
+++ b/packaging/Debian/debian-woody/patches/smbmount-nomtab.patch
diff --git a/packaging/Debian/debian-stable/patches/smbstatus-locking.patch b/packaging/Debian/debian-woody/patches/smbstatus-locking.patch
index d37896a369..d37896a369 100644
--- a/packaging/Debian/debian-stable/patches/smbstatus-locking.patch
+++ b/packaging/Debian/debian-woody/patches/smbstatus-locking.patch
diff --git a/packaging/Debian/debian-woody/patches/version-fix-vscan.patch b/packaging/Debian/debian-woody/patches/version-fix-vscan.patch
new file mode 100644
index 0000000000..0f35598297
--- /dev/null
+++ b/packaging/Debian/debian-woody/patches/version-fix-vscan.patch
@@ -0,0 +1,37 @@
+Author: Lars Mueller <lmuelle at SuSE dot de>
+Subject: Non integer SAMBA_VERSION_RELEASE breaks samba-vscan build
+Bugzilla: bugzilla.Samba.org #2618
+
+--- samba-3.0.20b/source/script/mkversion.sh
++++ samba-3.0.20b/source/script/mkversion.sh 2005-10-22 12:56:30
+@@ -17,6 +17,7 @@
+ SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p' $SOURCE_DIR$VERSION_FILE`
+ SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE`
+ SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
++SAMBA_VERSION_RELEASE_SUFFIX=`sed -n 's/^SAMBA_VERSION_RELEASE_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE`
+
+ SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
+
+@@ -31,9 +32,10 @@
+ echo "#define SAMBA_VERSION_MAJOR ${SAMBA_VERSION_MAJOR}" >> $OUTPUT_FILE
+ echo "#define SAMBA_VERSION_MINOR ${SAMBA_VERSION_MINOR}" >> $OUTPUT_FILE
+ echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE
++echo "#define SAMBA_VERSION_RELEASE_SUFFIX ${SAMBA_VERSION_RELEASE_SUFFIX}" >> $OUTPUT_FILE
+
+
+-SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}"
++SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}${SAMBA_VERSION_RELEASE_SUFFIX}"
+
+
+ if test -n "${SAMBA_VERSION_PRE_RELEASE}";then
+--- samba-3.0.20b/source/VERSION
++++ samba-3.0.20b/source/VERSION 2005-10-22 12:56:30
+@@ -19,7 +19,8 @@
+ ########################################################
+ SAMBA_VERSION_MAJOR=3
+ SAMBA_VERSION_MINOR=0
+ SAMBA_VERSION_RELEASE=20
++SAMBA_VERSION_RELEASE_SUFFIX=b
+
+ ########################################################
+ # For 'pre' releases the version will be #
diff --git a/packaging/Debian/debian-woody/po/POTFILES.in b/packaging/Debian/debian-woody/po/POTFILES.in
new file mode 100644
index 0000000000..95a7ea8150
--- /dev/null
+++ b/packaging/Debian/debian-woody/po/POTFILES.in
@@ -0,0 +1,3 @@
+[type: gettext/rfc822deb] samba-common.templates
+[type: gettext/rfc822deb] samba.templates
+[type: gettext/rfc822deb] swat.templates
diff --git a/packaging/Debian/debian-woody/po/es.po b/packaging/Debian/debian-woody/po/es.po
new file mode 100644
index 0000000000..0d1d1a770d
--- /dev/null
+++ b/packaging/Debian/debian-woody/po/es.po
@@ -0,0 +1,298 @@
+#
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2003-07-02 21:51-0500\n"
+"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
+"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Juego de caracteres para el sistema de ficheros 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 ""
+"Actualmente hay una opción de \"character set\" en smb.conf. En Samba 3.0 "
+"esta opción ha sido reemplazado por una opción nueva: \"unix charset\". Por "
+"favor, indique el juego de caracteres que desea usar para esta opción nueva, "
+"que controla cómo Samba interpretará los nombres en el sistema de ficheros."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr "Si deja en blanco este campo, no se cambiará smb.conf."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Juego de caracteres para los clientes 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 ""
+"Actualmente hay una opción de \"client code page\" en smb.conf. En Samba "
+"3.0 esta opción ha sido reemplazado por la opción \"dos charset\". Por "
+"favor, indique el juego de caracteres que desea usar para esta opción "
+"nueva. Esta opción no se necesita en absoluto para clientes Windows; es "
+"exclusivamente para los clientes DOS. Si deja en blanco este campo, no se "
+"cambiará smb.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"¿Modificar smb.conf para usar la configuración WINS que proviene de DHCP?"
+
+#. 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 ""
+"Si su sistema recibe la dirección IP desde un servidor DHCP en la red, el "
+"servidor DHCP también puede proveerle informaciones sobre los servidores de "
+"WINS que haya en la red. Esto requiere un cambio en el fichero smb.conf "
+"para que la configuración de WINS proveniente de DHCP se lea automaticamente "
+"de /etc/samba/dhcp.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"Hay que instalar el paquete dhcp3-client para aprovechar esta funcionalidad."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "¿Configurar smb.conf mediante debconf?"
+
+#. 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 ""
+"El resto de la configuración de Samba trata sobre cuestiones que afectan al "
+"contenido de /etc/samba/smb.conf, que es el fichero utilizado para "
+"configurar los programas de Samba (nmbd y smbd). Su smb.conf actual contiene "
+"una línea 'include' o una opción que atraviesa más de una línea, así que "
+"debconf puede dejarlo con un smb.conf descompuesto, requiriendo que lo "
+"arregle a mano."
+
+#. 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 ""
+"Si no usa debconf para configurar smb.conf, tendrá que cuidar a mano "
+"cualquier cambio a la configuración de Samba y no disfrutará de aumentos "
+"periódicos de configuración. Por eso se recomienda el uso de debconf cuando "
+"sea posible."
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Nombre del dominio o del grupo de trabajo"
+
+#. 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 ""
+"Es el grupo de trabajo en el que aparecerá su servidor cuando se lo "
+"pregunten los clientes de la red. Este parámetro también controla el nombre "
+"de dominio que se usa con la configuración security=domain."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "¿Utilizar contraseñas cifradas?"
+
+#. 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 ""
+"Los clientes Windows más modernos se comunican con los servidores SMB "
+"utilizando contraseñas cifradas. Si quiere usar contraseñas en texto plano, "
+"tendrá que cambiar un parámetro en el registro de Windows. Es muy "
+"recomendable usar cifrado en las contraseñas. Si elige hacerlo, compruebe "
+"que tiene un fichero /etc/samba/smbpasswd válido y que ha puesto las "
+"contraseñas con el programa smbpasswd."
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "¿Crear el base de dados de contraseñas /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 ""
+"Para manterner la compatibilidad con el comportamiento por defecto de la "
+"mayoria de los sistemas Windows, hay que configurar Samba para que use "
+"contraseñas cifradas, lo cual requiere la creación de un fichero, distinto "
+"del /etc/passwd, donde se guarden las contraseñas de los usuarios. El "
+"fichero se puede crear automaticamente, aunque es necesario añadir las "
+"contraseñas manualmente (por usted o por el usuario) mediante el programa "
+"'smbpasswd', y debe encargarse de mantener las contraseñas al día. Si no "
+"crea este fichero, es imprescindible configurar Samba (y posiblemente los "
+"sistemas Windows) para que use contraseñas no cifradas. Véa /usr/share/doc/"
+"samba-doc/htmldocs/ENCRYPTION.html del paquete samba-doc para más "
+"información."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Se han cambiado de lugar los ficheros de registro de 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 ""
+"A partir de los primeros paquetes Debian de Samba 2.2, los ficheros de "
+"registro de los dos demonios del Samba (nmbd y smbd) se encuentran en /var/"
+"log/samba/. Los nombres de estos ficheros son log.nmbd y log.smbd, para "
+"nmbd y smbd respectivamente."
+
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+"Los ficheros de registro antiguos que había en /var/log se moverán "
+"automáticamente a su nueva ubicación."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "Ya no se puede ejecutar nmbd desde el inetd"
+
+#. 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 ""
+"Su sistema estaba configurado anteriormente para ejectuar nmbd y smbd desde "
+"inetd. A partir de la version 2.999+3.0.alpha20-4, nmbd ya no se ejecuta "
+"desde inetd. Si ha modificado el script de arranque /etc/init.d/samba, "
+"puede que tenga que editarlo ahora para que nmbd se ejecute."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "demonios, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "¿Cómo quiere que se ejecute 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 ""
+"El servicio Samba smbd puede ejecutarse como demonio normal o desde el "
+"inetd. Se recomienda que se ejecute como demonio independiente."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr ""
+"¿Convertir el fichero /etc/samba/smbpasswd en /var/lib/samba/passdb.tdb?"
+
+#. Description
+#: ../samba.templates:45
+#, fuzzy
+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 ""
+"La versión 3.0 de Samba introduce un nuevo base de dados \"SAM\" más "
+"completo que suplanta al fichero /etc/samba/smbpasswd. ¿Quiere que el "
+"fichero corriente smbpasswd sea convertido en /var/lib/samba/passdb.tdb? Si "
+"pretende usar otro "
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "¡Se sobrescribirá su configuración 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 ""
diff --git a/packaging/Debian/debian-woody/po/fr.po b/packaging/Debian/debian-woody/po/fr.po
new file mode 100644
index 0000000000..6be14c19b4
--- /dev/null
+++ b/packaging/Debian/debian-woody/po/fr.po
@@ -0,0 +1,301 @@
+#
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2003-07-02 21:52-0500\n"
+"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Jeu de caractères pour les systèmes de fichiers 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 ""
+"Une instruction « character set » (jeu de caractères) est utilisée dans "
+"votre fichier smb.conf. Avec Samba 3.0, cette option est remplacée par une "
+"nouvelle option, « unix charset » (jeu de caractères Unix). Veuillez "
+"indiquer le jeu de caractères que vous voulez utiliser avec cette option, "
+"qui permet d'interpréter les noms de fichiers sur le système."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr ""
+"Le fichier smb.conf ne sera pas modifié si vous laissez cette option sans "
+"réponse."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Jeu de caractères pour les clients 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 ""
+"Votre fichier smb.conf contient une option « client code page » (page de "
+"codes du client). Avec Samba 3.0, cette option a été remplacée par l'option "
+"« dos charset » (jeu de caractères DOS). Veuillez indiquer le jeu de "
+"caractères que vous voulez utiliser avec la nouvelle option. En général le "
+"jeu de caractères choisi par défaut est suffisant. Veuillez noter que cette "
+"option ne sert pas pour les clients Windows mais seulement pour les clients "
+"DOS. Le fichier smb.conf ne sera pas modifié si vous laissez cette option "
+"sans réponse. "
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Modifier smb.conf pour utiliser les paramètres WINS fournis par DHCP ?"
+
+#. 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 ""
+"Si votre ordinateur obtient ses paramètres IP à partir d'un serveur DHCP du "
+"réseau, ce serveur peut aussi fournir des informations sur les serveurs WINS "
+"(serveurs de noms NetBIOS) présents sur le réseau. Une modification du "
+"fichier smb.conf est nécessaire afin que les réglages WINS fournis par le "
+"serveur DHCP soient lus dans /etc/samba/dhcp.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr "Pour cela, le paquet dhcp3-client doit être installé."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Voulez-vous configurer smb.conf avec debconf ?"
+
+#. 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 ""
+"La suite de la configuration de Samba pose des questions sur des paramètres "
+"de /etc/samba/smb.conf, le fichier utilisé pour configurer les programmes de "
+"Samba (nmbd et smbd). Votre fichier actuel contient une ligne « include » ou "
+"une option qui s'étale sur plusieurs lignes : cela peut perturber debconf et "
+"il vaut mieux gérer manuellement le contenu de ce fichier."
+
+#. 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 ""
+"Si vous n'utilisez pas debconf pour configurer smb.conf, vous devrez vous-"
+"même gérer les modifications de configuration et vous ne pourrez pas "
+"bénéficier des améliorations faites dans la configuration. Si possible, il "
+"est conseillé d'utiliser debconf."
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Groupe de travail et nom de domaine ?"
+
+#. 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 ""
+"Ce paramètre indique le groupe de travail où les clients trouveront le "
+"serveur. Il indique aussi le nom de domaine utilisé par le paramètre "
+"« security=domain »."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Voulez-vous chiffrer les mots de passe ?"
+
+#. 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 ""
+"Des clients Windows récents communiquent avec les serveurs SMB en utilisant "
+"des mots de passe chiffrés. Si vous voulez utiliser des mots de passe sans "
+"chiffrement, vous devez modifier un paramètre dans le registre de Windows. "
+"Il est recommandé d'utiliser des mots de passe chiffrés. Si vous le faites, "
+"n'oubliez pas de créer un fichier /etc/samba/smbpasswd et d'y mettre les "
+"mots de passe de tous les utilisateurs qui se servent de la commande "
+"smbpasswd."
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Faut-il créer une base de données /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 ""
+"Pour préserver la compatibilité avec le comportement par défaut de la "
+"plupart des systèmes Windows, Samba doit utiliser les mots de passe "
+"chiffrés. Cela exige la création d'un fichier, distinct du fichier /etc/"
+"passwd, pour mettre les mots de passe des utilisateurs. Ce fichier peut être "
+"créé automatiquement, mais quelqu'un (vous ou l'utilisateur) devra ajouter "
+"les mots de passe manuellement en utilisant la commande smbpasswd ; et vous "
+"devrez maintenir à jour ce fichier. Si vous ne voulez pas créer le fichier "
+"maintenant, Samba (et peut-être les ordinateurs Windows) devra utiliser des "
+"mots de passe non chiffrés. Voyez /usr/share/doc/samba-doc/htmldocs/"
+"ENCRYPTION.html dans le paquet samba-doc pour plus de détails."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Les fichiers-journaux de Samba ont changé de place."
+
+#. 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 ""
+"À partir des premiers paquets de Samba 2.2 pour Debian, les fichiers-"
+"journaux des démons nmbd et smbd se trouvent dans /var/log/samba/. Les noms "
+"de ces fichiers sont log.nmbd et log.smbd pour, respectivement, nmbd et 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 ""
+"Les anciens fichiers-journaux dans /var/log/ seront mis au bon endroit."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "L'utilisation de nmbd à partir d'inetd n'est plus supportée"
+
+#. 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 ""
+"Votre système lançait nmbd et smbd à partir d'inetd. Depuis la version 2.999"
+"+3.0.alpha20-4, on ne peut plus exécuter nmbd à partir d'inetd. Si vous avez "
+"modifié le script de lancement /etc/init.d/samba, vous avez peut-être besoin "
+"de le corriger manuellement pour permettre le lancement de nmbd. "
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "démons, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Comment voulez-vous lancer 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 ""
+"Le service de Samba smbd peut s'exécuter en tant que démon classique ou bien "
+"être lancé par inetd. L'approche recommandée est qu'il s'exécute en tant que "
+"démon."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "Faut-il convertir /etc/samba/smbpasswd en /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 ""
+"Avec Samba 3.0, une nouvelle interface pour les bases de données SAM, plus "
+"complète, vient remplacer le fichier /etc/samba/smbpasswd. Voulez-vous que "
+"votre fichier existant soit remplacé par /var/lib/samba/passdb.tdb ? Si vous "
+"envisagez d'utiliser une autre interface d'authentification (p.ex. LDAP), "
+"refusez la proposition maintenant."
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Ré-écriture de votre fichier 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 va modifier votre fichier smb.conf. Les entrées seront réorganisées et "
+"les commentaires détruits ainsi que les entrées « include = » et « copy = ». "
+"Si votre smb.conf était soigneusement construit, sauvegardez-le ou "
+"n'utilisez pas SWAT !"
diff --git a/packaging/Debian/debian-woody/po/nl.po b/packaging/Debian/debian-woody/po/nl.po
new file mode 100644
index 0000000000..61e8742dbb
--- /dev/null
+++ b/packaging/Debian/debian-woody/po/nl.po
@@ -0,0 +1,302 @@
+#
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: samba\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-30 19:08-0500\n"
+"PO-Revision-Date: 2003-08-30 02:03+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
+"Language-Team: dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr "Karakterset voor Unix bestandsysteem"
+
+#. 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 ""
+"U heeft momenteel een \"karakterset\" ingesteld in uw smb.conf. In Samba 3.0 "
+"werd deze optie vervangen door een nieuwe \"unix karakterset\" optie. "
+"Gelieve de karakterset die u voor deze nieuwe optie wil gebruiken aan te "
+"geven, deze bepaald hoe Samba de bestandsnamen in het bestandsysteem "
+"interpreteerd."
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr ""
+"Uw smb.conf bestand wordt niet aangepast indien u deze optie leeg laat."
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr "Karakterset voor DOS-clients"
+
+#. 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 ""
+"U heeft momenteel een \"client code pagina\" ingesteld in uw smb.conf. In "
+"Samba 3.0 werd deze optie vervangen door de optie \"dos karakterset\". "
+"Gelieve de karakterset die u voor deze nieuwe optie wilt gebruiken aan te "
+"geven. In de meeste gevallen zal het standaard ingevulde antwoord voldoen. "
+"Merk op dat deze optie niet nodig is voor ondersteuning van Windows-clients, "
+"enkel voor DOS-clients. Uw smb.conf wordt niet veranderd wanneer u deze "
+"optie blank laat."
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "smb.conf aanpassen om de WINS instellingen van DHCP te gebruiken?"
+
+#. 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 ""
+"Indien uw computer zijn ip-addres informatie van een DHCP-server op het "
+"netwerk haalt, voorziet deze mogelijks ook informatie betreffende de op het "
+"netwerk aanwezige WINS-servers (\"NetBIOS naam servers\").\" Dit vereist een "
+"verandering aan uw smb.conf bestand, opdat de door DHCP doorgegeven WINS "
+"instellingen automatisch gelezen worden van /etc/samba/dhcp.conf."
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+"U dient het dhcp3-client-pakket geïnstalleert te hebben om van deze optie "
+"gebruik te maken."
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr "Configuratie in smb.conf met debconf beheren?"
+
+#. 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 ""
+"De resterende Samba configuratie beslaat parameters in /etc/samba/smb.conf, "
+"het configuratiebestand dat gebruikt wordt voor de Samba programmas (nmbd en "
+"smbd). Uw huidige smb.conf bevat een 'include' regel of een optie die "
+"meerdere regels beslaat, dit kan debconf mogelijks in verwarring brenngen. "
+"Indien debconf in verwarring raakt dient u uw smb.conf handmatig aan te "
+"passen om samba terug werkend te krijgen."
+
+#. 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 ""
+"Indien u geen gebruik maakt van debconf voor het beheer van smb.conf dient u "
+"alle configuratie instellingen zelf te doen, en zult u geen voordeel halen "
+"uit de periodieke configuratie verbeteringen. Het gebruik van debconf wordt "
+"dan ook aangeraden. "
+
+#. Description
+#: ../samba-common.templates:52
+msgid "Workgroup/Domain Name?"
+msgstr "Werkgroep/Domeinnaam?"
+
+#. 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 ""
+"Dit bepaald van welke werkgroep uw server deel zal lijken uit te maken bij "
+"het beantwoorden van vragen door clients. Merk op dat deze parameter ook de "
+"domeinnaam die gebruikt wordt voor de security=domein instelling bepaald."
+
+#. Description
+#: ../samba-common.templates:60
+msgid "Use password encryption?"
+msgstr "Wachtwoord versleuteling gebruiken?"
+
+#. 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 ""
+"Recente Windows clients maken gebruik van versleutelde wachtwoorden voor de "
+"communicatie met SMB-servers. Indien u onversleutelde tekst wachtwoorden "
+"wilt gebruiken dient u een parameter te veranderen in de Windows registry. "
+"Het gebruik van versleutelde wachtwoorden wordt aangeraden. Indien u dit "
+"doet zorg er dan voor dat u een geldig /etc/samba/smbpasswd bestand heeft en "
+"dat u de wachtwoorden daar voor elke gebruiker met behulp van smbpasswd "
+"insteld. "
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr "Samba wachtwoord database, /var/lib/samba/passdb.tdb, aanmaken?"
+
+#. 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 ""
+"Om compatibel te zijn met de standaard instellingen van de meeste "
+"Windowsversies dient Samba gebruik te maken van versleutelde wachtwoorden. "
+"Dit vereist dat de gebruikerswachtwoorden opgeslagen worden in een bestand "
+"dat verschilt van /etc/passwd. Dit bestand kan automatisch aangemaakt "
+"worden, maar de wachtwoorden dienen handmatig (door de gebuiker) toegevoegt "
+"te worden met het smbpasswd commando. U dient dit bestand in de toekomst ook "
+"aktueel te houden. Indien u dit bestand niet aanmaakt zult u samba (en naar "
+"alle waarschijnlijkheid de client machines) moeten herconfigureren zodat "
+"deze onversleutelde wachtwoorden gebruiken. Zie /usr/share/doc/samba-doc/"
+"htmldocs/ENCRYPTION.html uit het samba-doc pakket voor meer details."
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr "Samba's log bestanden zijn verhuisd."
+
+#. 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 ""
+"Vanaf de eerste Debian pakketten vaan Samba versie 2.2 zijn de log bestanden "
+"van beide Samba daemons (nmbd en smbd) opgeslagen in /var/log/samba/. De log "
+"bestanden voor nmbd en smbd zijn, respectievelijk, log.nmbd en 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 ""
+"De oude logbestanden in /var/log worden voor u naar de nieuwe locatie "
+"verplaatst."
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr "nmbd vanuit inetd draaien wordt niet langer ondersteund"
+
+#. 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 ""
+"Uw systeem was geconfigureerd om nmbd en smbd vanuit inetd te starten. Vanaf "
+"versie 2.999+3.0.alpha20-4 kan nmbd niet langer door inetd gestart worden. "
+"Indien u uw /etc/init.d/samba startup-script aangepast had, dient u dit "
+"mogelijks aan te passen opdat nmbd zou starten."
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr "daemons, inetd"
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr "Hoe wilt u Samba draaien?"
+
+#. 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 ""
+"De Samba daemon smbd kan als een normale daemon of via inetd draaien. Als "
+"een daemon is de aangeraden aanpak."
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr "/etc/samba/smbpasswd verplaatsen naar /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 introduceert een nieuwe, meer complete SAM databaseinterface die "
+"het /etc/samba/smbpasswd bestand overstijgt. \"Wilt u dat ik uw bestaand "
+"smbpasswd bestand voor u naar /var/lib/samba/passdb.tdb migreer? Indien u "
+"van plan bent om, in plaats hiervan, een ander pdb-backend (e.g. LDAP) te "
+"gebruiken dient u hier 'nee' te antwoorden."
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr "Uw smb.conf wordt herschreven!"
+
+#. 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 zal uw smb.conf bestand herschrijven. Het zal de ingangen anders "
+"schikken en alle comments, include= en copy= opties verwijderen. Als u een, "
+"met veel zorg, handmatig opgebouwd smb.conf bestand heeft, maak dan een "
+"reservekopie of zie van het gebruik van SWAT af! "
diff --git a/packaging/Debian/debian-stable/po/pt_BR.po b/packaging/Debian/debian-woody/po/pt_BR.po
index 2af42a562b..2af42a562b 100644
--- a/packaging/Debian/debian-stable/po/pt_BR.po
+++ b/packaging/Debian/debian-woody/po/pt_BR.po
diff --git a/packaging/Debian/debian-woody/po/templates.pot b/packaging/Debian/debian-woody/po/templates.pot
new file mode 100644
index 0000000000..465f4719b0
--- /dev/null
+++ b/packaging/Debian/debian-woody/po/templates.pot
@@ -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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../samba-common.templates:3
+msgid "Character Set for Unix filesystem"
+msgstr ""
+
+#. 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 ""
+
+#. Description
+#: ../samba-common.templates:3
+msgid "If you leave this option blank, your smb.conf will not be changed."
+msgstr ""
+
+#. Description
+#: ../samba-common.templates:13
+msgid "Character Set for DOS clients"
+msgstr ""
+
+#. 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 ""
+
+#. Description
+#: ../samba-common.templates:24
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. 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 ""
+
+#. Description
+#: ../samba-common.templates:24
+msgid ""
+"You must have the dhcp3-client package installed to take advantage of this "
+"feature."
+msgstr ""
+
+#. Description
+#: ../samba-common.templates:37
+msgid "Configure smb.conf through debconf?"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. Description
+#: ../samba.templates:4
+msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
+msgstr ""
+
+#. 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 ""
+
+#. Description
+#: ../samba.templates:17
+msgid "Samba's log files have moved."
+msgstr ""
+
+#. 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 ""
+
+#. Description
+#: ../samba.templates:17
+msgid ""
+"The old log files that were in /var/log/ will be moved to the new location "
+"for you."
+msgstr ""
+
+#. Description
+#: ../samba.templates:28
+msgid "Running nmbd from inetd is no longer supported"
+msgstr ""
+
+#. 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 ""
+
+#. Choices
+#: ../samba.templates:36
+msgid "daemons, inetd"
+msgstr ""
+
+#. Description
+#: ../samba.templates:38
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. 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 ""
+
+#. Description
+#: ../samba.templates:45
+msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
+msgstr ""
+
+#. 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 ""
+
+#. Description
+#: ../swat.templates:3
+msgid "Your smb.conf will be re-written!"
+msgstr ""
+
+#. 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 ""
diff --git a/packaging/Debian/debian-stable/python2.2-samba.files b/packaging/Debian/debian-woody/python2.2-samba.files
index a24e2b98c8..a24e2b98c8 100644
--- a/packaging/Debian/debian-stable/python2.2-samba.files
+++ b/packaging/Debian/debian-woody/python2.2-samba.files
diff --git a/packaging/Debian/debian-stable/rules b/packaging/Debian/debian-woody/rules
index f17ea75c01..f17ea75c01 100755
--- a/packaging/Debian/debian-stable/rules
+++ b/packaging/Debian/debian-woody/rules
diff --git a/packaging/Debian/debian-stable/samba-common.config b/packaging/Debian/debian-woody/samba-common.config
index ed76b95cb8..ed76b95cb8 100644
--- a/packaging/Debian/debian-stable/samba-common.config
+++ b/packaging/Debian/debian-woody/samba-common.config
diff --git a/packaging/Debian/debian-stable/samba-common.dhcp b/packaging/Debian/debian-woody/samba-common.dhcp
index 3b2fa4ba19..3b2fa4ba19 100644
--- a/packaging/Debian/debian-stable/samba-common.dhcp
+++ b/packaging/Debian/debian-woody/samba-common.dhcp
diff --git a/packaging/Debian/debian-woody/samba-common.dirs b/packaging/Debian/debian-woody/samba-common.dirs
new file mode 100644
index 0000000000..c089ad7357
--- /dev/null
+++ b/packaging/Debian/debian-woody/samba-common.dirs
@@ -0,0 +1,2 @@
+etc/samba
+etc/dhcp3/dhclient-enter-hooks.d
diff --git a/packaging/Debian/debian-stable/samba-common.files b/packaging/Debian/debian-woody/samba-common.files
index 0b6baff5f1..0b6baff5f1 100644
--- a/packaging/Debian/debian-stable/samba-common.files
+++ b/packaging/Debian/debian-woody/samba-common.files
diff --git a/packaging/Debian/debian-woody/samba-common.postinst b/packaging/Debian/debian-woody/samba-common.postinst
new file mode 100644
index 0000000000..6c6eb9bf53
--- /dev/null
+++ b/packaging/Debian/debian-woody/samba-common.postinst
@@ -0,0 +1,139 @@
+#!/bin/sh
+#
+#
+
+set -e
+
+# Do debconf stuff here
+. /usr/share/debconf/confmodule
+
+# We need a default smb.conf file. If one doesn't exist we put in place
+# one that has some basic defaults.
+if [ ! -e /etc/samba/smb.conf ]; then
+ cp -a /usr/share/samba/smb.conf /etc/samba/
+fi
+
+# Static tempfile location, dpkg-style
+TMPFILE=/etc/samba/smb.conf.dpkg-tmp
+
+# ------------------------- Debconf questions start ---------------------
+
+# Is the user configuring with debconf, or he/she prefers swat/manual
+# config?
+db_get samba-common/do_debconf || true
+if [ "${RET}" = "true" ]; then
+ # Get workgroup name
+ db_get samba-common/workgroup || true
+ WORKGROUP="${RET}"
+
+ # Oh my GOD, this is ugly. Why would anyone put these
+ # characters in a workgroup name? Why, Lord, why???
+ WORKGROUP=`echo $WORKGROUP | \
+ sed -e's/\\\\/\\\\\\\\/g
+ s#/#\\\\/#g
+ s/&/\\\&/g
+ s/\\\$/\\\\\\\$/g'`
+
+ sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \
+ s/^\([[:space:]]*\)workgroup[[:space:]]*=.*/\1workgroup = ${WORKGROUP}/i" \
+ < /etc/samba/smb.conf >${TMPFILE}
+ mv -f ${TMPFILE} /etc/samba/smb.conf
+
+ # Encrypt passwords?
+ db_get samba-common/encrypt_passwords || true
+ ENCRYPT_PASSWORDS="${RET}"
+
+ sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \
+ s/^\([[:space:]]*\)encrypt passwords[[:space:]]*=.*/\1encrypt passwords = ${ENCRYPT_PASSWORDS}/i" \
+ < /etc/samba/smb.conf >${TMPFILE}
+ mv -f ${TMPFILE} /etc/samba/smb.conf
+
+ # Install DHCP support
+ db_get samba-common/dhcp && DHCPVAL="$RET"
+ db_fget samba-common/dhcp applied || true
+ if [ "$DHCPVAL" = true ] && [ "$RET" != true ] && \
+ ! grep -q dhcp.conf /etc/samba/smb.conf
+ then
+ sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ {
+ /wins server[[:space:]]*=/a \\
+\\
+# If we receive WINS server info from DHCP, override the options above. \\
+ include = /etc/samba/dhcp.conf
+}" < /etc/samba/smb.conf > ${TMPFILE}
+ mv -f ${TMPFILE} /etc/samba/smb.conf
+ elif [ "$RET" != true ] && grep -q dhcp.conf /etc/samba/smb.conf
+ then
+ :
+ # FIXME: here we /delete/ the lines?
+ fi
+ # Once we get here, the config has been applied, whatever
+ # it is.
+ if [ "$RET" != true ]; then
+ db_fset samba-common/dhcp applied true
+ fi
+
+ # Update charset settings?
+ if ! grep -q "^[[:space:]]*unix charset[[:space:]]*=" /etc/samba/smb.conf
+ then
+ db_get samba-common/character_set || true
+ UNIXCHARSET="${RET}"
+ if [ -n "$UNIXCHARSET" ]
+ then
+ sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ s/^\([[:space:]]*\)character set/\1character set/i
+ /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ {
+ /^[[:space:]]*character set[[:space:]]*=/c \\
+ unix charset = $UNIXCHARSET
+ }" < /etc/samba/smb.conf > ${TMPFILE}
+ mv -f ${TMPFILE} /etc/samba/smb.conf
+ fi
+ fi
+
+ if grep -qi "^[[:space:]]*passdb backend[[:space:]]*=.*unixsam" /etc/samba/smb.conf
+ then
+ sed -e 's/^\([[:space:]]*\)passdb backend/\1passdb backend/i
+ /^[[:space:]]*passdb backend/ {
+ s/unixsam/guest/i
+ }' < /etc/samba/smb.conf > ${TMPFILE}
+ mv -f ${TMPFILE} /etc/samba/smb.conf
+ fi
+
+ if ! grep -q "^[[:space:]]*dos charset[[:space:]]*=" /etc/samba/smb.conf
+ then
+ db_get samba-common/codepage || true
+ DOSCHARSET="${RET}"
+ if [ -n "$DOSCHARSET" ]
+ then
+ sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ s/^\([[:space:]]*\)client code page/\1client code page/i
+ /^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ {
+ /^[[:space:]]*client code page[[:space:]]*=/c \\
+ dos charset = $DOSCHARSET
+}" < /etc/samba/smb.conf > ${TMPFILE}
+ mv -f ${TMPFILE} /etc/samba/smb.conf
+ fi
+ fi
+
+ if dpkg --compare-versions "$2" lt 2.999+3.0.alpha20-4 \
+ && ! grep -q "^[[:space:]]*panic action[[:space:]]*=" /etc/samba/smb.conf
+ then
+ sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
+ /^[[:space:]]*\[global\]/a \\
+\\
+# Do something sensible when Samba crashes: mail the admin a backtrace\\
+ panic action = /usr/share/samba/panic-action %d" < /etc/samba/smb.conf > ${TMPFILE}
+ mv -f ${TMPFILE} /etc/samba/smb.conf
+ fi
+
+fi
+
+chmod a+r /etc/samba/smb.conf
+
+# ------------------------- Debconf questions end ---------------------
+
+db_stop
+
+#DEBHELPER#
diff --git a/packaging/Debian/debian-woody/samba-common.postrm b/packaging/Debian/debian-woody/samba-common.postrm
new file mode 100644
index 0000000000..8a4b6d3d55
--- /dev/null
+++ b/packaging/Debian/debian-woody/samba-common.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+#
+
+if [ "$1" = purge ]; then
+ # Remove any files left in /etc/samba/
+ rm -Rf /etc/samba/
+fi
+
+#DEBHELPER#
diff --git a/packaging/Debian/debian-stable/samba-common.templates b/packaging/Debian/debian-woody/samba-common.templates
index 9eb0676e93..9eb0676e93 100644
--- a/packaging/Debian/debian-stable/samba-common.templates
+++ b/packaging/Debian/debian-woody/samba-common.templates
diff --git a/packaging/Debian/debian-woody/samba-doc.docs b/packaging/Debian/debian-woody/samba-doc.docs
new file mode 100644
index 0000000000..d9f0aa1d0a
--- /dev/null
+++ b/packaging/Debian/debian-woody/samba-doc.docs
@@ -0,0 +1,8 @@
+docs/Samba3-HOWTO.pdf
+docs/Samba3-ByExample.pdf
+docs/Samba3-Developers-Guide.pdf
+docs/REVISION
+docs/THANKS
+docs/history
+docs/htmldocs/
+docs/registry/
diff --git a/packaging/Debian/debian-woody/samba-doc.examples b/packaging/Debian/debian-woody/samba-doc.examples
new file mode 100644
index 0000000000..e71180364c
--- /dev/null
+++ b/packaging/Debian/debian-woody/samba-doc.examples
@@ -0,0 +1,2 @@
+debian/wins2dns.awk
+source/smbadduser
diff --git a/packaging/Debian/debian-stable/samba.config b/packaging/Debian/debian-woody/samba.config
index 89792d436e..89792d436e 100644
--- a/packaging/Debian/debian-stable/samba.config
+++ b/packaging/Debian/debian-woody/samba.config
diff --git a/packaging/Debian/debian-woody/samba.cron.daily b/packaging/Debian/debian-woody/samba.cron.daily
new file mode 100644
index 0000000000..42fc98d8f6
--- /dev/null
+++ b/packaging/Debian/debian-woody/samba.cron.daily
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# cron script to save a backup copy of /etc/samba/smbpasswd in /var/backups.
+#
+# Written by Eloy A. Paris <peloy@debian.org> for the Debian project.
+#
+
+BAK=/var/backups
+
+umask 022
+if cd $BAK; then
+ # Make sure /etc/samba/smbpasswd exists
+ if [ -f /etc/samba/smbpasswd ]; then
+ cmp -s smbpasswd.bak /etc/samba/smbpasswd || cp -p /etc/samba/smbpasswd smbpasswd.bak
+ fi
+fi
diff --git a/packaging/Debian/debian-stable/samba.dirs b/packaging/Debian/debian-woody/samba.dirs
index 33178f42d2..33178f42d2 100644
--- a/packaging/Debian/debian-stable/samba.dirs
+++ b/packaging/Debian/debian-woody/samba.dirs
diff --git a/packaging/Debian/debian-stable/samba.docs b/packaging/Debian/debian-woody/samba.docs
index 9a5a9fc6bf..9a5a9fc6bf 100644
--- a/packaging/Debian/debian-stable/samba.docs
+++ b/packaging/Debian/debian-woody/samba.docs
diff --git a/packaging/Debian/debian-stable/samba.files b/packaging/Debian/debian-woody/samba.files
index 4a08fa6af7..cbca5d8e86 100644
--- a/packaging/Debian/debian-stable/samba.files
+++ b/packaging/Debian/debian-woody/samba.files
@@ -1,4 +1,3 @@
-usr/bin/testprns
usr/bin/smbstatus
usr/bin/smbcontrol
usr/bin/tdbbackup
@@ -10,7 +9,6 @@ usr/sbin/mksmbpasswd
usr/lib/samba/vfs
usr/share/man/man1/smbcontrol.1
usr/share/man/man1/smbstatus.1
-usr/share/man/man1/testprns.1
usr/share/man/man1/profiles.1
usr/share/man/man5/smbpasswd.5
usr/share/man/man8/nmbd.8
diff --git a/packaging/Debian/debian-woody/samba.init b/packaging/Debian/debian-woody/samba.init
new file mode 100644
index 0000000000..5d0f4671a0
--- /dev/null
+++ b/packaging/Debian/debian-woody/samba.init
@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+# Start/stops the Samba daemons (nmbd and smbd).
+#
+#
+
+# Defaults
+RUN_MODE="daemons"
+
+# Reads config file (will override defaults above)
+[ -r /etc/default/samba ] && . /etc/default/samba
+
+NMBDPID=/var/run/samba/nmbd.pid
+SMBDPID=/var/run/samba/smbd.pid
+
+# clear conflicting settings from the environment
+unset TMPDIR
+
+# See if the daemons are there
+test -x /usr/sbin/nmbd -a -x /usr/sbin/smbd || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting Samba daemons:"
+
+ echo -n " nmbd"
+ start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- -D
+
+ if [ "$RUN_MODE" != "inetd" ]; then
+ echo -n " smbd"
+ start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- -D
+ fi
+
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping Samba daemons: "
+
+ start-stop-daemon --stop --quiet --pidfile $NMBDPID
+ # Wait a little and remove stale PID file
+ sleep 1
+ if [ -f $NMBDPID ] && ! ps h `cat $NMBDPID` > /dev/null
+ then
+ # Stale PID file (nmbd was succesfully stopped),
+ # remove it (should be removed by nmbd itself IMHO.)
+ rm -f $NMBDPID
+ fi
+ echo -n "nmbd"
+
+ if [ "$RUN_MODE" != "inetd" ]; then
+ start-stop-daemon --stop --quiet --pidfile $SMBDPID
+ # Wait a little and remove stale PID file
+ sleep 1
+ if [ -f $SMBDPID ] && ! ps h `cat $SMBDPID` > /dev/null
+ then
+ # Stale PID file (nmbd was succesfully stopped),
+ # remove it (should be removed by smbd itself IMHO.)
+ rm -f $SMBDPID
+ fi
+ echo -n " smbd"
+ fi
+
+ echo "."
+
+ ;;
+ reload)
+ echo -n "Reloading /etc/samba/smb.conf (smbd only)"
+ start-stop-daemon --stop --signal HUP --pidfile $SMBDPID
+
+ echo "."
+ ;;
+ restart|force-reload)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/packaging/Debian/debian-stable/samba.logrotate b/packaging/Debian/debian-woody/samba.logrotate
index f90437bf2a..f90437bf2a 100644
--- a/packaging/Debian/debian-stable/samba.logrotate
+++ b/packaging/Debian/debian-woody/samba.logrotate
diff --git a/packaging/Debian/debian-stable/samba.pamd b/packaging/Debian/debian-woody/samba.pamd
index 5db2bbd31f..5db2bbd31f 100644
--- a/packaging/Debian/debian-stable/samba.pamd
+++ b/packaging/Debian/debian-woody/samba.pamd
diff --git a/packaging/Debian/debian-stable/samba.postinst b/packaging/Debian/debian-woody/samba.postinst
index 7b0bdd92ad..7b0bdd92ad 100644
--- a/packaging/Debian/debian-stable/samba.postinst
+++ b/packaging/Debian/debian-woody/samba.postinst
diff --git a/packaging/Debian/debian-woody/samba.postrm b/packaging/Debian/debian-woody/samba.postrm
new file mode 100644
index 0000000000..b79fe1d009
--- /dev/null
+++ b/packaging/Debian/debian-woody/samba.postrm
@@ -0,0 +1,26 @@
+#!/bin/sh -e
+#
+#
+
+if [ "$1" = purge ]; then
+
+ # Remove Samba's state files, both volatile and non-volatile
+ rm -Rf /var/run/samba/ /var/cache/samba/ /var/lib/samba
+
+ # Remove log files
+ rm -Rf /var/log/samba/
+
+ # Remove init.d configuration file
+ echo Removing configuration file /etc/default/samba... >&2
+ rm -f /etc/default/samba
+
+ # Remove NetBIOS entries from /etc/inetd.conf
+ update-inetd --remove netbios-ssn
+
+else
+ # Not purging, do not remove NetBIOS entries from /etc/inetd.conf
+ update-inetd --disable netbios-ssn
+
+fi
+
+#DEBHELPER#
diff --git a/packaging/Debian/debian-woody/samba.prerm b/packaging/Debian/debian-woody/samba.prerm
new file mode 100644
index 0000000000..ab62c706d8
--- /dev/null
+++ b/packaging/Debian/debian-woody/samba.prerm
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = upgrade -a -n "$2" ] && dpkg --compare-versions "$2" lt 2.99 \
+ && [ -e /var/lib/samba/passdb.tdb -a ! -e /etc/samba/smbpasswd ]
+then
+ pdbedit -i tdbsam -e smbpasswd
+ rm -f /var/lib/samba/passdb.tdb
+fi
+
+#DEBHELPER#
diff --git a/packaging/Debian/debian-stable/samba.templates b/packaging/Debian/debian-woody/samba.templates
index e7fcd1d4cc..e7fcd1d4cc 100644
--- a/packaging/Debian/debian-stable/samba.templates
+++ b/packaging/Debian/debian-woody/samba.templates
diff --git a/packaging/Debian/debian-woody/scripts/patch-source b/packaging/Debian/debian-woody/scripts/patch-source
new file mode 100755
index 0000000000..a8559b4167
--- /dev/null
+++ b/packaging/Debian/debian-woody/scripts/patch-source
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+#
+#
+
+for patch in debian/patches/*.patch; do
+ echo '->'`basename $patch`:
+ patch -p1 --ignore-whitespace < $patch
+done
+
+# This code is currently not used because it creates a long version
+# number string. For now we're sticking to <upstream version>-Debian,
+# as in 3.0.0rc2-Debian. peloy@debian.org.-
+
+# ---- Begin unused code ----
+# Get Debian version number from 1st line of the Debian changelog
+#DEBIAN_VERSION=`sed -n -e '1s/^.*(\(.*\)).*$/\1/p' debian/changelog`
+
+# Insert Debian version number in source/VERSION, which will then be
+# used to create source/include/version.h.
+#TMPFILE=source/VERSION.debian
+#sed -e "s/^\(SAMBA_VERSION_VENDOR_SUFFIX=\).*$/\1\"Debian-${DEBIAN_VERSION}\"/" source/VERSION > ${TMPFILE}
+#mv -f ${TMPFILE} source/VERSION
+# ---- End unused code ----
+
+# Regenerate configure only if it is older than configure.in
+[ source/configure -ot source/configure.in ] && (cd source && sh ./autogen.sh)
+
+exit 0
diff --git a/packaging/Debian/debian-stable/scripts/unpatch-source b/packaging/Debian/debian-woody/scripts/unpatch-source
index d3681cfa50..d3681cfa50 100755
--- a/packaging/Debian/debian-stable/scripts/unpatch-source
+++ b/packaging/Debian/debian-woody/scripts/unpatch-source
diff --git a/packaging/Debian/debian-woody/smb.conf b/packaging/Debian/debian-woody/smb.conf
new file mode 100644
index 0000000000..8a75979945
--- /dev/null
+++ b/packaging/Debian/debian-woody/smb.conf
@@ -0,0 +1,237 @@
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options most of which
+# are not shown in this example
+#
+# Any line which starts with a ; (semi-colon) or a # (hash)
+# is a comment and is ignored. In this example we will use a #
+# for commentary and a ; for parts of the config file that you
+# may wish to enable
+#
+# NOTE: Whenever you modify this file you should run the command
+# "testparm" to check that you have not many any basic syntactic
+# errors.
+#
+
+#======================= Global Settings =======================
+
+[global]
+
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
+ workgroup = DEBIAN_FANS
+
+# server string is the equivalent of the NT Description field
+ server string = %h server (Samba %v)
+
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable its WINS Server
+; wins support = no
+
+# WINS Server - Tells the NMBD components of Samba to be a WINS Client
+# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
+; wins server = w.x.y.z
+
+# This will prevent nmbd to search for NetBIOS names through DNS.
+ dns proxy = no
+
+# What naming service and in what order should we use to resolve host names
+# to IP addresses
+; name resolve order = lmhosts host wins bcast
+
+
+#### Debugging/Accounting ####
+
+# This tells Samba to use a separate log file for each machine
+# that connects
+ log file = /var/log/samba/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+ max log size = 1000
+
+# If you want Samba to only log through syslog then set the following
+# parameter to 'yes'.
+; syslog only = no
+
+# We want Samba to log a minimum amount of information to syslog. Everything
+# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
+# through syslog you should set the following parameter to something higher.
+ syslog = 0
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+ panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
+# "security = user" is always a good idea. This will require a Unix account
+# in this server for every user accessing the server. See
+# /usr/share/doc/samba-doc/htmldocs/ServerType.html in the samba-doc
+# package for details.
+; security = user
+
+# You may wish to use password encryption. See the section on
+# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
+ encrypt passwords = no
+
+# If you are using encrypted passwords, Samba will need to know what
+# password database type you are using.
+ passdb backend = tdbsam guest
+
+ obey pam restrictions = yes
+
+; guest account = nobody
+ invalid users = root
+
+# This boolean parameter controls whether Samba attempts to sync the Unix
+# password with the SMB password when the encrypted SMB password in the
+# passdb is changed.
+; unix password sync = no
+
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Augustin Luton <aluton@hybrigenics.fr> for
+# sending the correct chat script for the passwd program in Debian Potato).
+ passwd program = /usr/bin/passwd %u
+ passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n .
+
+# This boolean controls whether PAM will be used for password changes
+# when requested by an SMB client instead of the program listed in
+# 'passwd program'. The default is 'no'.
+; pam password change = no
+
+
+########## Printing ##########
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+; load printers = yes
+
+# lpr(ng) printing. You may wish to override the location of the
+# printcap file
+; printing = bsd
+; printcap name = /etc/printcap
+
+# CUPS printing. See also the cupsaddsmb(8) manpage in the
+# cupsys-client package.
+; printing = cups
+; printcap name = cups
+
+# When using [print$], root is implicitly a 'printer admin', but you can
+# also give this right to other users to add drivers and set printer
+# properties
+; printer admin = @ntadmin
+
+
+######## File sharing ########
+
+# Name mangling options
+; preserve case = yes
+; short preserve case = yes
+
+
+############ Misc ############
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting
+; include = /home/samba/etc/smb.conf.%m
+
+# Most people will find that this option gives better performance.
+# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/speed.html
+# for details
+# You may want to add the following on a Linux system:
+# SO_RCVBUF=8192 SO_SNDBUF=8192
+ socket options = TCP_NODELAY
+
+# The following parameter is useful only if you have the linpopup package
+# installed. The samba maintainer and the linpopup maintainer are
+# working to ease installation and configuration of linpopup and samba.
+; message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
+
+# Domain Master specifies Samba to be the Domain Master Browser. If this
+# machine will be configured as a BDC (a secondary logon server), you
+# must set this to 'no'; otherwise, the default behavior is recommended.
+; domain master = auto
+
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+; idmap uid = 10000-20000
+; idmap gid = 10000-20000
+; template shell = /bin/bash
+
+#======================= Share Definitions =======================
+
+[homes]
+ comment = Home Directories
+ browseable = no
+
+# By default, the home directories are exported read-only. Change next
+# parameter to 'yes' if you want to be able to write to them.
+ writable = no
+
+# File creation mask is set to 0700 for security reasons. If you want to
+# create files with group=rw permissions, set next parameter to 0775.
+ create mask = 0700
+
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
+ directory mask = 0700
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+; comment = Network Logon Service
+; path = /home/samba/netlogon
+; guest ok = yes
+; writable = no
+; share modes = no
+
+[printers]
+ comment = All Printers
+ browseable = no
+ path = /tmp
+ printable = yes
+ public = no
+ writable = no
+ create mode = 0700
+
+# Windows clients look for this share name as a source of downloadable
+# printer drivers
+[print$]
+ comment = Printer Drivers
+ path = /var/lib/samba/printers
+ browseable = yes
+ read only = yes
+ guest ok = no
+# Uncomment to allow remote administration of Windows print drivers.
+# Replace 'ntadmin' with the name of the group your admin users are
+# members of.
+; write list = root, @ntadmin
+
+# A sample share for sharing your CD-ROM with others.
+;[cdrom]
+; comment = Samba server's CD-ROM
+; writable = no
+; locking = no
+; path = /cdrom
+; public = yes
+
+# The next two parameters show how to auto-mount a CD-ROM when the
+# cdrom share is accesed. For this to work /etc/fstab must contain
+# an entry like this:
+#
+# /dev/scd0 /cdrom iso9660 defaults,noauto,ro,user 0 0
+#
+# The CD-ROM gets unmounted automatically after the connection to the
+#
+# If you don't want to use auto-mounting/unmounting make sure the CD
+# is mounted on /cdrom
+#
+; preexec = /bin/mount /cdrom
+; postexec = /bin/umount /cdrom
+
diff --git a/packaging/Debian/debian-woody/smbclient.files b/packaging/Debian/debian-woody/smbclient.files
new file mode 100644
index 0000000000..96e8945bf3
--- /dev/null
+++ b/packaging/Debian/debian-woody/smbclient.files
@@ -0,0 +1,15 @@
+usr/bin/smbclient
+usr/bin/smbtar
+usr/bin/rpcclient
+usr/bin/smbspool
+usr/bin/smbtree
+usr/bin/smbcacls
+usr/bin/smbcquotas
+usr/share/man/man1/smbclient.1
+usr/share/man/man1/smbtar.1
+usr/share/man/man1/rpcclient.1
+usr/share/man/man8/smbspool.8
+usr/share/man/man1/smbcacls.1
+usr/share/man/man1/smbcquotas.1
+usr/share/man/man1/smbtree.1
+usr/lib/cups/backend/smb
diff --git a/packaging/Debian/debian-stable/smbfs.files b/packaging/Debian/debian-woody/smbfs.files
index 870db7d645..870db7d645 100644
--- a/packaging/Debian/debian-stable/smbfs.files
+++ b/packaging/Debian/debian-woody/smbfs.files
diff --git a/packaging/Debian/debian-woody/smbwrapper.dirs b/packaging/Debian/debian-woody/smbwrapper.dirs
new file mode 100644
index 0000000000..fd727bddf0
--- /dev/null
+++ b/packaging/Debian/debian-woody/smbwrapper.dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/samba
diff --git a/packaging/Debian/debian-woody/smbwrapper.docs b/packaging/Debian/debian-woody/smbwrapper.docs
new file mode 100644
index 0000000000..2924e78734
--- /dev/null
+++ b/packaging/Debian/debian-woody/smbwrapper.docs
@@ -0,0 +1,2 @@
+source/smbwrapper/README
+source/smbwrapper/PORTING
diff --git a/packaging/Debian/debian-woody/smbwrapper.files b/packaging/Debian/debian-woody/smbwrapper.files
new file mode 100644
index 0000000000..08edbead6e
--- /dev/null
+++ b/packaging/Debian/debian-woody/smbwrapper.files
@@ -0,0 +1 @@
+usr/bin/smbsh
diff --git a/packaging/Debian/debian-woody/swat.config b/packaging/Debian/debian-woody/swat.config
new file mode 100644
index 0000000000..e210fae55e
--- /dev/null
+++ b/packaging/Debian/debian-woody/swat.config
@@ -0,0 +1,11 @@
+#/bin/sh -e
+#
+#
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+db_title "Samba Web Administration Tool (SWAT)"
+
+db_input medium swat/smb_conf_warn || true
+db_go
diff --git a/packaging/Debian/debian-woody/swat.dirs b/packaging/Debian/debian-woody/swat.dirs
new file mode 100644
index 0000000000..d5df7df4b8
--- /dev/null
+++ b/packaging/Debian/debian-woody/swat.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+usr/share/samba/swat
diff --git a/packaging/Debian/debian-woody/swat.files b/packaging/Debian/debian-woody/swat.files
new file mode 100644
index 0000000000..82fdf104d3
--- /dev/null
+++ b/packaging/Debian/debian-woody/swat.files
@@ -0,0 +1,3 @@
+usr/sbin/swat
+usr/share/samba/swat
+usr/share/man/man8/swat.8
diff --git a/packaging/Debian/debian-woody/swat.postinst b/packaging/Debian/debian-woody/swat.postinst
new file mode 100644
index 0000000000..338f8a07c2
--- /dev/null
+++ b/packaging/Debian/debian-woody/swat.postinst
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+case "$1" in
+ configure)
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ exit 0
+ ;;
+ *)
+ echo "$0: Unknown action \"$1\""
+ exit 0
+ ;;
+esac
+
+# Set up swat, turned off by default.
+update-inetd --group OTHER --add \
+ '#<off># swat\t\tstream\ttcp\tnowait.400\troot\t/usr/sbin/tcpd\t/usr/sbin/swat'
+
+#DEBHELPER#
diff --git a/packaging/Debian/debian-woody/swat.postrm b/packaging/Debian/debian-woody/swat.postrm
new file mode 100644
index 0000000000..6bc5873096
--- /dev/null
+++ b/packaging/Debian/debian-woody/swat.postrm
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+#
+
+case "$1" in
+ purge)
+ update-inetd --remove '/usr/sbin/swat$'
+ ;;
+ remove)
+ ;;
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+ *)
+ echo "$0: unknown action \"$1\""
+ exit 0
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/packaging/Debian/debian-stable/swat.templates b/packaging/Debian/debian-woody/swat.templates
index 0e6ac9f106..0e6ac9f106 100644
--- a/packaging/Debian/debian-stable/swat.templates
+++ b/packaging/Debian/debian-woody/swat.templates
diff --git a/packaging/Debian/debian-woody/winbind.dirs b/packaging/Debian/debian-woody/winbind.dirs
new file mode 100644
index 0000000000..1da8fba83a
--- /dev/null
+++ b/packaging/Debian/debian-woody/winbind.dirs
@@ -0,0 +1 @@
+usr/share/lintian/overrides
diff --git a/packaging/Debian/debian-woody/winbind.files b/packaging/Debian/debian-woody/winbind.files
new file mode 100644
index 0000000000..fbb76774d4
--- /dev/null
+++ b/packaging/Debian/debian-woody/winbind.files
@@ -0,0 +1,9 @@
+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
+lib/libnss_wins.so.2
diff --git a/packaging/Debian/debian-woody/winbind.init b/packaging/Debian/debian-woody/winbind.init
new file mode 100644
index 0000000000..2dfdf3b835
--- /dev/null
+++ b/packaging/Debian/debian-woody/winbind.init
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# Start/stops the winbindd daemon.
+#
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+DAEMON=/usr/sbin/winbindd
+
+# clear conflicting settings from the environment
+unset TMPDIR
+
+# See if the daemon is there
+test -x $DAEMON || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting the Winbind daemon: winbindd"
+
+ start-stop-daemon --start --quiet --exec $DAEMON
+
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping the Winbind daemon: winbindd"
+
+ start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
+
+ echo "."
+ ;;
+ restart|force-reload)
+ echo -n "Restarting the Winbind daemon: winbindd"
+
+ start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
+ sleep 2
+ start-stop-daemon --start --quiet --exec $DAEMON
+
+ echo "."
+ ;;
+ *)
+ echo "Usage: /etc/init.d/winbind {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
+
diff --git a/packaging/Debian/debian-woody/winbind.lintian b/packaging/Debian/debian-woody/winbind.lintian
new file mode 100644
index 0000000000..fca17d3cca
--- /dev/null
+++ b/packaging/Debian/debian-woody/winbind.lintian
@@ -0,0 +1,6 @@
+winbind: ldconfig-symlink-missing-for-shlib lib/libnss_winbind.so lib/libnss_winbind.so.2 libnss_winbind.so
+winbind: ldconfig-symlink-missing-for-shlib lib/libnss_wins.so lib/libnss_wins.so.2 libnss_wins.so
+winbind: no-shlibs-control-file lib/libnss_winbind.so.2
+winbind: no-shlibs-control-file lib/libnss_wins.so.2
+winbind: postinst-must-call-ldconfig lib/libnss_wins.so.2
+winbind: postrm-should-call-ldconfig lib/libnss_wins.so.2
diff --git a/packaging/Debian/debian-woody/winbind.logrotate b/packaging/Debian/debian-woody/winbind.logrotate
new file mode 100644
index 0000000000..e36cd1281c
--- /dev/null
+++ b/packaging/Debian/debian-woody/winbind.logrotate
@@ -0,0 +1,10 @@
+/var/log/samba/log.winbindd {
+ weekly
+ missingok
+ rotate 7
+ postrotate
+ [ -f /var/run/samba/winbindd.pid ] && kill -HUP `cat /var/run/samba/winbindd.pid`
+ endscript
+ compress
+ notifempty
+}
diff --git a/packaging/Debian/debian-woody/wins2dns.awk b/packaging/Debian/debian-woody/wins2dns.awk
new file mode 100644
index 0000000000..176868a115
--- /dev/null
+++ b/packaging/Debian/debian-woody/wins2dns.awk
@@ -0,0 +1,38 @@
+#!/usr/bin/awk -f
+#
+# Date: Wed, 26 Aug 1998 10:37:39 -0600 (MDT)
+# From: Jason Gunthorpe <jgg@deltatee.com>
+# To: samba@packages.debian.org
+# Subject: Nifty samba script
+#
+# Here is a really nifty script I just wrote for samba, it takes the wins
+# database in /var/samba/wins and writes out two dns files for it. In this
+# way network wide wins clients can get into the dns for use by unix
+# machines.
+#
+# Perhaps this could be included in /usr/doc/examples or somesuch.
+#
+
+BEGIN {
+ FS="#|\"";
+FORWARD="/tmp/wins.hosts"
+REVERSE="/tmp/wins.rev"
+DOMAIN="ven.ra.rockwell.com"
+}
+$3 == "00" {
+ split($4,a," " );
+ split(a[2],b,".");
+ while (sub(" ","-",$2));
+ $2=tolower($2);
+ if (b[1] == "255")
+ next;
+ if (length($2) >= 8)
+ print $2"\ta\t"a[2] > FORWARD
+ else
+ print $2"\t\ta\t"a[2] > FORWARD
+ print b[4]"."b[3]"\t\tptr\t"$2"."DOMAIN"." > REVERSE
+}
+END {
+ system("echo killall -HUP named");
+}
+