[Pkg-Cyrus-imapd-Debian-devel] [SVN] r93 - trunk/cyrus-imapd-2.2.12/debian

[pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org]

Author: sven
Date: 2005-04-08 02:04:59 +0200 (Fri, 08 Apr 2005)
New Revision: 93

Modified:
   trunk/cyrus-imapd-2.2.12/debian/changelog
   trunk/cyrus-imapd-2.2.12/debian/control
Log:
Fix up Conflicts in debian/control a bit

Modified: trunk/cyrus-imapd-2.2.12/debian/changelog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/changelog	2005-04-08 00:03:34 UTC (re=
v 92)
+++ trunk/cyrus-imapd-2.2.12/debian/changelog	2005-04-08 00:04:59 UTC (re=
v 93)
@@ -2,6 +2,8 @@
=20
   * Add a README which contains the configure options used to
     compile the package. The README is auto-generated by debian/rules
+  * cyrus22-clients needs to conflict with cyrus21-clients
+  * cyrus22-common needs to conflict with cyrus21-common=20
=20
  -- Sven Mueller <debian@incase.de>  Thu, 24 Mar 2005 12:26:27 +0100
=20

Modified: trunk/cyrus-imapd-2.2.12/debian/control
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/control	2005-04-08 00:03:34 UTC (rev =
92)
+++ trunk/cyrus-imapd-2.2.12/debian/control	2005-04-08 00:04:59 UTC (rev =
93)
@@ -11,7 +11,7 @@
 Depends: postfix | mail-transport-agent, adduser (>=3D 3.34), dpkg (>> 1=
.9.0), netbase (>=3D 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${m=
isc:Depends}
 Recommends: cyrus22-imapd | cyrus22-pop3d | cyrus22-murder
 Suggests: cyrus22-clients, cyrus22-admin, cyrus22-doc, sasl2-bin, apt-li=
stchanges (>=3D 2.35)
-Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus22-common
+Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus21-common
 Description: Cyrus mail system (common files)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -168,6 +168,9 @@
 Package: cyrus22-clients
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: cyrus21-clients
+Provides: cyrus21-clients
+Replaces: cyrus21-clients
 Description: Cyrus mail system (test clients)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including: