[pkg-kolab] r1501 - kolabd/trunk/debian

[Mathieu Parent]

Author: sathieu
Date: 2010-07-05 21:18:24 +0000 (Mon, 05 Jul 2010)
New Revision: 1501

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/control
Log:
use Breaks instead of Conflicts
with kolab-resource-handlers and kolab-freebusy as suggested by lintian



Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2010-07-05 21:12:09 UTC (rev 1500)
+++ kolabd/trunk/debian/changelog	2010-07-05 21:18:24 UTC (rev 1501)
@@ -8,9 +8,10 @@
   * Fix "I can't enable/disable pop3/s and imap/s" by providing a brand new
     cyrus.conf.template. Thanks to Matthias Geerdsen's initial patch
     (Closes: #579933 and issue4374)
-  * Updated Standards-Version to 3.9.0: no changes
+  * Updated Standards-Version to 3.9.0: use Breaks instead of Conflicts
+    with kolab-resource-handlers and kolab-freebusy as suggested by lintian
 
- -- Mathieu Parent <sathieu at debian.org>  Mon, 05 Jul 2010 23:12:12 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Mon, 05 Jul 2010 23:18:15 +0200
 
 kolabd (2.2.3-20091217-2) unstable; urgency=medium
 

Modified: kolabd/trunk/debian/control
===================================================================
--- kolabd/trunk/debian/control	2010-07-05 21:12:09 UTC (rev 1500)
+++ kolabd/trunk/debian/control	2010-07-05 21:18:24 UTC (rev 1501)
@@ -21,7 +21,7 @@
 Recommends: slapd, ldap-utils
 Suggests: openssl, db4.2-util, kolab-webadmin, amavisd-new, clamav, clamav-daemon, spamassassin
 Replaces: kolab-freebusy (<<2.2.1), kolab-resource-handlers (<<2.2.1)
-Conflicts: kolab-freebusy (<<2.2.1), kolab-resource-handlers (<<2.2.1)
+Breaks: kolab-freebusy (<<2.2.1), kolab-resource-handlers (<<2.2.1)
 Description: groupware server
  Kolab is a secure, scalable, and reliable groupware server.  It consists
  of a number of well-known and proven components for the standard tasks