Bringing packaging/Debian/* to a more recent state.

(This used to be commit cd7494a19608f2b4a63b9c654dd8e0a0fc587c39)

1 files changed, 58 insertions, 21 deletions

diff --git a/packaging/Debian/debian/control b/packaging/Debian/debian/control
index 2054da9f18..74f60c3213 100644
--- a/packaging/Debian/debian/control
+++ b/packaging/Debian/debian/control
@@ -3,15 +3,15 @@ Section: net
 Priority: optional
 Maintainer: Eloy A. Paris <peloy@debian.org>
 Uploaders: Steve Langasek <vorlon@debian.org>
-Build-Depends: debhelper (>=2.0.103), libpam0g-dev, libreadline4-dev, libcupsys2-dev
+Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libacl1-dev | acl-dev (>= 2.0.0), libkrb5-dev, libldap2-dev, po-debconf, python-dev (>= 2.2)
 Standards-Version: 3.1.1
 
 Package: samba
 Architecture: any
-Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}
+Depends: debconf, samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}
 Replaces: samba-common (<= 2.0.5a-2)
 Suggests: samba-doc
-Description: A LanManager like file and printer server for Unix.
+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
@@ -20,23 +20,29 @@ Description: A LanManager like file and printer server for Unix.
  This package contains all the components necessary to turn your
  Debian GNU/Linux box into a powerful file and printer server.
  .
- As of Samba 2.2.1a-3, the Samba Debian packages consist of the following:
+ Currently, the Samba Debian packages consist of the following:
  .
-  samba - A LanManager like file and printer server for Unix.
+  samba - 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.
+  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.0.x and above).
+  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.2-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: libpam-modules, ${shlibs:Depends}
-Replaces: samba (<= 2.0.5a-2)
-Description: Samba common files used by both the server and the client.
+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
@@ -49,10 +55,10 @@ Description: Samba common files used by both the server and the client.
 Package: smbclient
 Architecture: any
 Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}
-Replaces: samba (<= 2.2.2-5)
+Replaces: samba (<< 2.999+3.0.alpha21-4)
 Provides: samba-client
 Suggests: smbfs
-Description: A LanManager like simple client for Unix.
+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
@@ -65,7 +71,7 @@ Description: A LanManager like simple client for Unix.
 
 Package: swat
 Architecture: any
-Depends: samba (= ${Source-Version}), ${shlibs:Depends}
+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
@@ -75,11 +81,14 @@ Description: Samba Web Administration Tool
  .
  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.
+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
@@ -104,13 +113,13 @@ Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x)
  site into a file server for DOS or Windows clients.
  .
  If you want to use command-line utilities like smbclient, smbtar
- and/or smbspool just need to install the smbclient package.
+ 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/smbmount 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.
+ 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
@@ -130,7 +139,7 @@ Section: libs
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: Shared library that allows applications to talk to SMB servers
+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.
@@ -138,10 +147,10 @@ Description: Shared library that allows applications to talk to SMB servers
  This package contains the libsmbclient shared library.
 
 Package: libsmbclient-dev
-Section: devel
+Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libsmbclient (= ${Source-Version}), ${shlibs:Depends}
+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
@@ -149,3 +158,31 @@ Description: libsmbclient static libraries and headers
  .
  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}
+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.2-samba
+Section: python
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, python2.2
+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.2-samba/examples for a couple of examples.