merge in debian package update

1 files changed, 48 insertions, 48 deletions

diff --git a/debian/control b/debian/control
index ae6e4bc..df33b41 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Karl Ramm <kcr@debian.org>
 Uploaders: Karl Ramm <kcr@debian.org>, Sam Hartman <hartmans@debian.org>
-Build-Depends: debhelper (>= 4), libares-dev, libkrb5-dev (>= 1.2.2-4), comerr-dev, ss-dev, libreadline5-dev, libx11-dev, libxt-dev, x-dev, libxaw7-dev | libxaw8-dev, libxmu-dev, libncurses5-dev, bison, libhesiod-dev, libssl-dev
+Build-Depends: debhelper (>= 4), libares-dev, libkrb5-dev (>= 1.2.2-4), comerr-dev, ss-dev, libreadline5-dev, libx11-dev, libxt-dev, x-dev  | x11proto-core-dev, libxaw7-dev | libxaw8-dev, libxmu-dev, libncurses5-dev, bison, libhesiod-dev
 Standards-Version: 3.7.2.2
 
 Package: libzephyr4
@@ -11,11 +11,13 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libzephyr4-krb, libzephyr4-krb5, libzephyr4-krb45
-Description: The original "Instant Message" system libraries without Kerberos
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+Description: Project Athena's notification service - non-Kerberos libraries
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
+ .
+ This package provides the libraries without Kerberos support.
 
 Package: libzephyr4-krb
 Section: libs
@@ -24,13 +26,13 @@ Depends: ${shlibs:Depends}, krb4-config
 Conflicts: libzephyr4, libzephyr4-krb5, libzephyr4-krb45
 Replaces: libzephyr4, libzephyr4-krb5, libzephyr4-krb45
 Provides: libzephyr4
-Description: The original "Instant Message" system libraries with Kerberos 
- This version of the library uses Kerberos for message authentication.
+Description: Project Athena's notification service - libraries with Kerberos
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
  .
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+ This package provides libraries that use Kerberos.
 
 Package: libzephyr4-krb5
 Section: libs
@@ -67,31 +69,29 @@ Section: net
 Replaces: zephyr-client
 Architecture: any
 Depends: ${shlibs:Depends}, debianutils (>= 1.6), debconf | debconf-2.0
-Description: The original "Instant Message" system client
- This package only contains the clients; you'll need a server to talk to.
+Description: Project Athena's notification service - client programs
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
  .
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+ This package provides client programs for the messaging service.
 
 Package: zephyr-server
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0
 Conflicts: zephyr-server-krb, zephyr-server-krb5, zephyr-server-krb45
-Description: The original "Instant Message" system-server without Kerberos
- You probably only need one server for a group of clients.
- This can be a memory-intensive server, especially for very large sites.
- .
- The server maintains a location and subscription database for all the
- receiving clients. All zephyrgrams are sent to the server to be routed
- to the intended recipient.
- .
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+Description: Project Athena's notification service - non-Kerberos server
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
+ .
+ This package provides the server for the messaging service, which
+ maintains a location and subscription database for all the receiving
+ clients. All zephyrgrams are sent to the server to be routed to the
+ intended recipient. Only one server is required for a group of clients.
 
 Package: zephyr-server-krb
 Section: net
@@ -100,20 +100,21 @@ Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr4-krb
 Conflicts: zephyr-server, zephyr-server-krb5, zephyr-server-krb45
 Replaces: zephyr-server, zephyr-server-krb5, zephyr-server-krb45
 Provides: zephyr-server
-Description: The original "Instant Message" system-server with Kerberos
- You probably only need one server for a group of clients.
- This can be a memory-intensive server, especially for very large sites.
+Description: Project Athena's notification service - server with Kerberos
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
+ .
+ This package provides the server for the messaging service. Only one
+ server is needed for a group of client. The program consumes much memory,
+ especially for very large sites.
  .
  The server maintains a location and subscription database for all the
  receiving clients. All zephyrgrams are sent to the server to be routed
  to the intended recipient.
  .
- This version of the server uses Kerberos for message authentication.
- .
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+ This version of the server uses Kerberos.
 
 Package: zephyr-server-krb5
 Section: net
@@ -163,12 +164,11 @@ Package: libzephyr-dev
 Section: libdevel
 Architecture: any
 Depends: libzephyr4 (= ${binary:Version}) | libzephyr4-krb (= ${binary:Version}), libc6-dev
-Description: The original "Instant Message" system development libraries
- This package is needed to compile certain other zephyr clients. There are
- various other clients available, including a totally gratuitous Motif client,
- a Tcl client, several Emacs clients, and a number of X clients.
- .
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+Description: Project Athena's notification service - development files
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
+ .
+ This package provides development libraries and files, which are
+ needed to compile alternative Zephyr clients.