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

Wed, 20 Apr 2005 13:11:35 +0200

Author: sven
Date: 2005-04-20 13:11:34 +0200 (Wed, 20 Apr 2005)
New Revision: 100

Modified:
   trunk/cyrus-imapd-2.2.12/debian/control
Log:
Fix a few Replaces:, Provides: and Conflicts: lines in debian/control

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-15 20:48:56 UTC (rev =
99)
+++ trunk/cyrus-imapd-2.2.12/debian/control	2005-04-20 11:11:34 UTC (rev =
100)
@@ -12,6 +12,7 @@
 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, cyrus21-common
+Replaces: 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:
@@ -65,6 +66,7 @@
 Depends: cyrus22-common (=3D ${Source-Version}), ${shlibs:Depends}
 Provides: imap-server
 Conflicts: imap-server
+Replaces: cyrus21-imapd
 Description: Cyrus mail system (IMAP support)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -91,6 +93,7 @@
 Depends: cyrus22-common (=3D ${Source-Version}), ${shlibs:Depends}
 Provides: pop3-server
 Conflicts: pop3-server
+Replaces: cyrus21-pop3d
 Description: Cyrus mail system (POP3 support)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -115,6 +118,7 @@
 Depends: libcyrus-imap-perl22 (>=3D ${Source-Version})
 Suggests: sasl2-bin
 Conflicts: cyrus-admin
+Replaces: cyrus21-admin
 Description: Cyrus mail system (administration tool)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -142,6 +146,7 @@
 Architecture: any
 Depends: cyrus22-common (=3D ${Source-Version}), ${shlibs:Depends}
 Recommends: cyrus22-imapd (=3D ${Source-Version}), cyrus22-pop3d (=3D ${=
Source-Version})
+Replaces: cyrus21-murder
 Description: Cyrus mail system (proxies and aggregator)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -197,7 +202,7 @@
 Architecture: any
 Section: devel
 Depends: libcyrus-imap-perl22 (>=3D ${Source-Version}), cyrus22-common (=
=3D ${Source-Version}), libsasl2-dev (>=3D 2.1.9)
-Conflicts: cyrus-dev, libdb3-dev (<< 3.2.9-15), libdb2-dev (<< 2.7.7.0-6=
), libdb4.2-dev (<<4.2.52)
+Conflicts: cyrus-dev, cyrus21-dev, libdb3-dev (<< 3.2.9-15), libdb2-dev =
(<< 2.7.7.0-6), libdb4.2-dev (<<4.2.52)
 Description: Cyrus mail system (developer files)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -222,9 +227,9 @@
 Package: libcyrus-imap-perl22
 Architecture: any
 Depends: ${perl:Depends}, ${shlibs:Depends}
-Provides: libcyrus-imap-perl
-Conflicts: libcyrus-imap-perl
-Replaces: libcyrus-imap-perl
+Provides: libcyrus-imap-perl, libcyrus21-imap-perl
+Conflicts: libcyrus-imap-perl, libcyrus21-imap-perl
+Replaces: libcyrus21-imap-perl
 Section: perl
 Description: Interface to Cyrus imap client imclient library
  Cyrus is a fully-featured IMAP daemon, with a number of features not



