small fixes for -13

git-svn-id: svn://svn.1ts.org/debian/branches/pre_sourceforge_packages@191 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/debian/changelog b/zephyr/debian/changelog
index 13421851b55a61926f49af7af8e234c515840ebb..6185939f9ddf3b547bf4549a7ccdf3a099a23fc3 100644 (file)
--- a/zephyr/debian/changelog
+++ b/zephyr/debian/changelog
@@ -1,3 +1,12 @@
+zephyr (2.1.20010518.SNAPSHOT-13) unstable; urgency=low
+
+  * Add alternate dependency on zephyr-2.0
+  * Fix brain-damage in package description.  Closes: #218079
+  (libzephyr3 was misidentified as having kerberos support, and
+    libzephyr3-krb was not identified as such.)
+
+ -- Karl Ramm <kcr@debian.org>  Thu, 11 Aug 2005 09:36:28 -0400
+
 zephyr (2.1.20010518.SNAPSHOT-12) unstable; urgency=low
 
   * Acknowledge NMU.

diff --git a/zephyr/debian/control b/zephyr/debian/control
index 4074aad64b3e5f1d964f871e597a089450c5271d..5cca83953b3e67612f26d505bff48a99856891d9 100644 (file)
--- a/zephyr/debian/control
+++ b/zephyr/debian/control
@@ -12,8 +12,6 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libzephyr3-krb
 Description: The original "Instant Message" system libraries without Kerberos
- This version of the library 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
@@ -26,6 +24,8 @@ Depends: ${shlibs:Depends}, krb4-config
 Conflicts: libzephyr3
 Provides: libzephyr3
 Description: The original "Instant Message" system libraries with Kerberos 
+ This version of the library 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
@@ -35,7 +35,7 @@ Package: zephyr-clients
 Section: net
 Replaces: zephyr-client
 Architecture: any
-Depends: ${shlibs:Depends}, debianutils (>= 1.6), debconf
+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.
  .
@@ -47,7 +47,7 @@ Description: The original "Instant Message" system client
 Package: zephyr-server
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, debconf
+Depends: ${shlibs:Depends}, debconf | debconf-2.0
 Conflicts: zephyr-server-krb
 Description: The original "Instant Message" system-server without Kerberos
  You probably only need one server for a group of clients.
@@ -65,7 +65,7 @@ Description: The original "Instant Message" system-server without Kerberos
 Package: zephyr-server-krb
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, debconf, libzephyr3-krb
+Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb
 Conflicts: zephyr-server
 Description: The original "Instant Message" system-server with Kerberos
  You probably only need one server for a group of clients.