Justin B Rye wrote:
> Revised to match the versions accepted so far:

Attached is a patch to the samba control file incorporating all
these proposed revisions (using Steve Langasek's version of the
boilerplate).  The ones for smbfs, swat and winbind may well still 
need attention from somebody more knowledgeable about Samba.

(Would merging them now blur the "confirmed" tags?)
-- 
JBR
Ankh kak! (Ancient Egyptian blessing)
diff -ur samba-3.2.1.pristine/debian/control samba-3.2.1/debian/control
--- samba-3.2.1.pristine/debian/control	2008-08-18 14:12:27.000000000 +0100
+++ samba-3.2.1/debian/control	2008-08-27 19:12:24.000000000 +0100
@@ -6,70 +6,49 @@
 Build-Depends: debhelper, libpam0g-dev, libreadline5-dev, libcups2-dev | libcupsys2-dev, libacl1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, quilt, uuid-dev, libtalloc-dev (>= 1.2.0~git20080616-1), libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]
 Build-Conflicts: libfam-dev
 Standards-Version: 3.8.0
+Homepage: http://www.samba.org/
 
 Package: samba
 Architecture: any
 Depends: samba-common (= ${binary:Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6), procps, update-inetd, adduser
-Suggests: openbsd-inetd | inet-superserver, smbldap-tools
+Suggests: openbsd-inetd | inet-superserver, smbldap-tools, samba-doc
 Replaces: samba-common (<= 2.0.5a-2)
-Description: a LanManager-like file and printer server for Unix
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS 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.
-  samba-doc-pdf - Samba documentation in PDF format.
-  smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above).
-  libpam-smbpass - pluggable authentication module for SMB/CIFS password 
-                   database
-  libsmbclient - Shared library that allows applications to talk to SMB/CIFS
-                 servers
-  libsmbclient-dev - libsmbclient shared libraries
-  libwbclient0 - Shared library for interfacing with the winbind service
-  winbind - Service to resolve user and group information from Windows NT 
-            servers
- .
- It is possible to install a subset of these packages depending on
- your particular needs. For example, to access other SMB/CIFS servers you
- should only need the smbclient and samba-common packages.
+Description: SMB/CIFS file, print, and login server for Unix
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.  Samba can also function
+ as an NT4-style domain controller, and can integrate with both NT4 domains
+ and Active Directory realms as a member server.
+ .
+ This package provides the components necessary to use Samba as a
+ stand-alone file and print server.  For use in an NT4 domain or Active
+ Directory realm, you will also need the winbind package.
  .
- http://www.samba.org/
+ This package is not required for connecting to existing SMB/CIFS servers
+ (see smbclient) or for mounting remote filesystems (see smbfs).
 
 Package: samba-common
 Architecture: any
 Depends: libpam-modules, ucf, ${shlibs:Depends}, ${misc:Depends}
 Replaces: samba (<< 3.0.20b-1)
-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/CIFS 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).
+Description: common files used by both the Samba server and client
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
+ .
+ This package contains files and programs needed by Samba when used as
+ either a client or a server.
 
 Package: samba-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: tools provided by the Samba suite
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS 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.
+Description: Samba testing utilities
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
  .
- This package contains tools such as smbtorture which may help
- testing the performance of CIFS servers or clients.
+ This package contains command line tools such as smbtorture for
+ performance-testing CIFS servers or clients.
 
 Package: smbclient
 Architecture: any
@@ -77,58 +56,54 @@
 Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
 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/CIFS 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.
+Description: command line SMB/CIFS clients for Unix
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
+ .
+ This package contains command line utilities for accessing Microsoft
+ Windows (or Samba) servers, including smbclient, smbtar, and smbspool.
+ Utilities for mounting shares locally are in the package smbfs.
 
 Package: swat
 Architecture: any
 Depends: samba (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, openbsd-inetd | inet-superserver
 Recommends: samba-doc (= ${source:Version})
 Description: Samba Web Administration Tool
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS 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.
- .
- SWAT will rewrite the smb.conf file. It will rearrange the entries and
- delete all comments, include= and copy= options. If you use a carefully
- crafted smb.conf, you should probably avoid using SWAT.
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
+ .
+ This package gives a Samba server an administrative interface accessible
+ via a web browser.
+ .
+ SWAT is no longer actively maintained, and its default configuration is
+ not secure for use over an untrusted network. You should also avoid
+ using it if you have a carefully crafted Samba configuration file; SWAT
+ will rewrite smb.conf, rearranging the entries and deleting all comments
+ as well as include= and copy= options.
 
 Package: samba-doc
 Section: doc
 Architecture: all
 Suggests: samba-doc-pdf
 Description: Samba documentation
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS 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.
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
  .
- This package contains all the documentation that comes in the original
- tarball, except in PDF format.
+ This package contains all the non-PDF documentation for the Samba
+ suite. See also samba-doc-pdf.
 
 Package: samba-doc-pdf
 Section: doc
 Architecture: all
-Description: Samba documentation (PDF format)
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS 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.
+Description: Samba documentation in PDF format
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
  .
- This package contains all the documentation that comes in the original
- tarball in PDF format.
+ This package contains all the PDF documentation for the Samba suite.
 
 Package: smbfs
 Section: otherosfs
@@ -137,15 +112,14 @@
 Depends: netbase (>= 2.02), samba-common (= ${binary:Version}), ${shlibs:Depends}
 Suggests: smbclient
 Replaces: smbfsx
-Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x)
- Smbfs is a filesystem which understands the SMB/CIFS 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.
+Description: Samba file system utilities
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
+ .
+ This package provides mount and umount utilities for the cifs and
+ (deprecated) smbfs network file systems. Other command line utilities such
+ as smbclient, smbtar and smbspool are in the package smbclient.
 
 Package: libpam-smbpass
 Section: admin
@@ -153,37 +127,34 @@
 Architecture: any
 Depends: ${shlibs:Depends}, samba-common (= ${binary:Version})
 Suggests: samba
-Description: pluggable authentication module for SMB/CIFS 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.
+Description: pluggable authentication module for Samba
+ This is a module for PAM that enables a system administrator to migrate
+ user passwords from the Unix password database to the SMB password
+ database as used by Samba, and to subsequently keep the two databases in
+ sync.  Unlike other solutions, it does this without needing users to log
+ in to Samba using cleartext passwords, or requiring them to change their
+ existing passwords.
 
 Package: libsmbclient
 Section: libs
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: shared library that allows applications to talk to SMB/CIFS servers
- libsmbclient allows to write applications that use the SMB/CIFS protocol.
- This gives applications the ability to talk to Microsoft Windows servers
- and Unix servers running Samba.
- .
- This package contains the libsmbclient shared library.
+Description: shared library for communication with SMB/CIFS servers
+ This package provides a shared library that enables client applications
+ to talk to Microsoft Windows and Samba servers using the SMB/CIFS
+ protocol.
 
 Package: libsmbclient-dev
 Section: libdevel
 Priority: extra
 Architecture: any
 Depends: libsmbclient (= ${binary:Version})
-Description: libsmbclient static libraries and headers
- libsmbclient allows to write applications that use the SMB/CIFS protocol.
- This gives applications the ability to talk to Microsoft Windows servers
- and Unix servers running Samba.
- .
- This package contains libraries and headers needed to build applications
- that use SMB/CIFS services.
+Description: development files for libsmbclient
+ This package provides the development files (static library and headers)
+ required for building applications against libsmbclient, a library that
+ enables client applications to talk to Microsoft Windows and Samba servers
+ using the SMB/CIFS protocol.
 
 Package: winbind
 Section: net
@@ -191,15 +162,17 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${binary:Version}), lsb-base (>= 3.0-6), adduser
 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.
+Description: Samba nameservice integration server
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
+ .
+ This package provides winbindd, a daemon which can integrate the
+ user/group lookup and authentication mechanisms from a Windows domain
+ with their equivalents on the Samba side. Thus for example users who
+ have Active Directory accounts can automatically be given working
+ Unix logins and vice versa, once /etc/nsswitch.conf and the winbind
+ module for PAM are configured appropriately.
 
 Package: samba-dbg
 Section: devel
@@ -207,20 +180,19 @@
 Architecture: any
 Depends: samba (= ${binary:Version})
 Description: Samba debugging symbols
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS 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.
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
+ .
+ This package provides debugging information for the software in the
+ Samba suite. Install it to get a better backtrace in the event of a
+ crash.
 
 Package: libwbclient0
 Section: libs
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: client library for interfacing with winbind service
- libwbclient is an API for client interactions with the winbind service.
- This library abstracts the winbind pipe protocol into a stable API that
- allows the winbind server to be independently upgraded.
+Description: Samba winbind client library
+ This package provides a library for client applications that interact
+ via the winbind pipe protocol with a Samba winbind server.

Reply via email to