From: kcr <kcr@cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f>
Date: Tue, 19 Jun 2001 13:28:15 +0000 (+0000)
Subject: be more explicit about conflicts
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bbe4f8ef25759d8d0398bdac11f034ace295693d;p=1ts-debian.git

be more explicit about conflicts
fix braino in zephyr-server config script


git-svn-id: svn://svn.1ts.org/debian/trunk/zephyr@77 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f
---

diff --git a/debian/control b/debian/control
index 83f855f..9994fd5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Standards-Version: 3.1.1
 Package: libzephyr3
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: libzephyr3-krb
 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
@@ -38,6 +39,7 @@ Description: The original "Instant Message" system client
 Package: zephyr-server
 Architecture: any
 Depends: ${shlibs:Depends}, debconf
+Conflicts: zephyr-server-krb
 Description: The original "Instant Message" system-server 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
diff --git a/debian/zephyr-server.config b/debian/zephyr-server.config
index a883fbb..e82e520 100644
--- a/debian/zephyr-server.config
+++ b/debian/zephyr-server.config
@@ -4,7 +4,7 @@
 db_version 2.0
 
 db_get zephyr-server/servers || true
-if -z "$RET"
+if test -z "$RET"
 then
 	# if there happens to be zephyr-clients runnin on this machine
 	# it might know something about servers.