Updating main trunk to RELEASE_2_2_2-11

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk@7 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 77 insertions, 25 deletions

diff --git a/control b/control
index 7d87c8bab8..2054da9f18 100644
--- a/control
+++ b/control
@@ -1,33 +1,36 @@
 Source: samba
 Section: net
 Priority: optional
-Build-Depends: debhelper, libpam0g-dev, libreadline4-dev
 Maintainer: Eloy A. Paris <peloy@debian.org>
 Uploaders: Steve Langasek <vorlon@debian.org>
-Standards-Version: 2.4.0.0
+Build-Depends: debhelper (>=2.0.103), libpam0g-dev, libreadline4-dev, libcupsys2-dev
+Standards-Version: 3.1.1
 
 Package: samba
 Architecture: any
-Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}
+Depends: 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.
  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.
+ 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.
  .
- As of Samba 2.0.6-1, the Samba Debian packages consist of the following:
+ As of Samba 2.2.1a-3, the Samba Debian packages consist of the following:
  .
- 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 (kernels 2.0.x and above).
+  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 (kernels 2.0.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
 
 Package: samba-common
 Architecture: any
@@ -37,7 +40,7 @@ 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.
+ 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
@@ -46,35 +49,41 @@ 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)
+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.
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
  .
- This package contains the client components of the Samba suite.
+ 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: samba, ${shlibs:Depends}
+Depends: 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.
+ 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.
 
 Package: samba-doc
-Section: docs
+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.
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
  .
  This package contains all the documentation that comes in the original
  tarball.
@@ -84,16 +93,59 @@ Section: otherosfs
 Priority: optional
 Architecture: any
 Depends: netbase (>= 2.02), samba-common (= ${Source-Version}), ${shlibs:Depends}
+Suggests: smbclient
 Replaces: smbfsx
-Conflicts: smbfsx
-Description: mount and umount commands for the smbfs (for kernels >= than 2.0.x)
+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
+ 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.
  .
- Starting with the Debian Samba packages version 2.0.4b-2, the old smbfs
- utilities for 2.0.x and the new smbfs utilities for 2.2.x kernels have been
- merged in a single package called smbfs. A wrapper script called smbmount.sh
- identifies the version of the kernel running and calls the correct binary.
+ If you want to use command-line utilities like smbclient, smbtar
+ and/or smbspool 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.
+
+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: devel
+Priority: extra
+Architecture: any
+Depends: libsmbclient (= ${Source-Version}), ${shlibs:Depends}
+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.