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 83f855fbf4bbd4dad6313c242a1ebb3b75059162..9994fd5e0b3c8e0dd4e4d0bc408d790333ed57f2 100644 (file)
--- 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 a883fbb752200d490baf1ae452ec7ab48b7758b3..e82e5204a9e6ead4a84da5d5e962879a9b3c1598 100644 (file)
--- 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.