take 3

git-svn-id: svn://svn.1ts.org/debian/branches/zephyr-reloaded@378 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/debian/control b/zephyr/debian/control
index 458a13c88091e58b0ed79da08486c5db66540df4..752d8f1b5d5f1d375215f4eb119834c1543e3fec 100644 (file)
--- a/zephyr/debian/control
+++ b/zephyr/debian/control
@@ -21,9 +21,9 @@ Package: libzephyr3-krb
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, krb4-config
+Conflicts: libzephyr3, libzephyr3-krb5, libzephyr3-krb45
 Replaces: libzephyr3, libzephyr3-krb5, libzephyr3-krb45
 Provides: libzephyr3
-Conflicts: libzephyr3
 Description: The original "Instant Message" system libraries with Kerberos 
  This version of the library uses Kerberos for message authentication.
  .
@@ -36,9 +36,9 @@ Package: libzephyr3-krb5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, krb5-config
+Conflicts: libzephyr3, libzephyr3-krb, libzephyr3-krb45
 Replaces: libzephyr3, libzephyr3-krb, libzephyr3-krb45
 Provides: libzephyr3
-Conflicts: libzephyr3
 Description: The original "Instant Message" system libraries with Kerberos 5
  This version of the library uses Kerberos for message authentication.
  .
@@ -51,9 +51,9 @@ Package: libzephyr3-krb45
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, krb5-config
+Conflicts: libzephyr3, libzephyr3-krb, libzephyr3-krb5
 Replaces: libzephyr3, libzephyr3-krb, libzephyr3-krb5
 Provides: libzephyr3
-Conflicts: libzephyr3
 Description: The original "Instant Message" system libraries with Kerberos 4+5
  This version of the library uses Kerberos for message authentication.
  .
@@ -97,9 +97,9 @@ Package: zephyr-server-krb
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb
+Conflicts: zephyr-server, zephyr-server-krb5, zephyr-server-krb45
 Replaces: zephyr-server, zephyr-server-krb5, zephyr-server-krb45
 Provides: zephyr-server
-Conflicts: 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.
@@ -119,9 +119,9 @@ Package: zephyr-server-krb5
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb5
+Conflicts: zephyr-server, zephyr-server-krb, zephyr-server-krb45
 Replaces: zephyr-server, zephyr-server-krb, zephyr-server-krb45
 Provides: zephyr-server
-Conflicts: zephyr-server
 Description: The original "Instant Message" system-server with Kerberos 5
  You probably only need one server for a group of clients.
  This can be a memory-intensive server, especially for very large sites.
@@ -141,9 +141,9 @@ Package: zephyr-server-krb45
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb45
+Conflicts: zephyr-server, zephyr-server-krb, zephyr-server-krb5
 Replaces: zephyr-server, zephyr-server-krb, zephyr-server-krb5
 Provides: zephyr-server
-Conflicts: zephyr-server
 Description: The original "Instant Message" system-server with Kerberos 4+5
  You probably only need one server for a group of clients.
  This can be a memory-intensive server, especially for very large sites.