[pkg-kolab] r1069 - libkolab-perl/branches/2.2.1/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-17 13:44:00 +0000 (Wed, 17 Dec 2008)
New Revision: 1069

Modified:
   libkolab-perl/branches/2.2.1/debian/changelog
   libkolab-perl/branches/2.2.1/debian/control
Log:
added conflict with previous kolabd as binaries are now here


Modified: libkolab-perl/branches/2.2.1/debian/changelog
===================================================================
--- libkolab-perl/branches/2.2.1/debian/changelog	2008-12-16 23:12:45 UTC (rev 1068)
+++ libkolab-perl/branches/2.2.1/debian/changelog	2008-12-17 13:44:00 UTC (rev 1069)
@@ -14,10 +14,10 @@
    - imported 30-invoke-rc.diff (now 10-invoke-rc)
    - removed 85-slapd-syncrepl-24.diff, integrated upstream
    - removed 95-runonchange.diff, integrated upstream
+  * added conflict with previous kolabd as binaries are now here
 
+ -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 14:40:28 +0100
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 16 Dec 2008 21:57:20 +0100
-
 libkolab-perl (1:2.2.0-4) UNRELEASED; urgency=low
 
   * added hidden debian/watch for beta and dev

Modified: libkolab-perl/branches/2.2.1/debian/control
===================================================================
--- libkolab-perl/branches/2.2.1/debian/control	2008-12-16 23:12:45 UTC (rev 1068)
+++ libkolab-perl/branches/2.2.1/debian/control	2008-12-17 13:44:00 UTC (rev 1069)
@@ -13,8 +13,8 @@
 Package: libkolab-perl
 Architecture: all
 Provides: kolabconf
-Conflicts: kolabconf (<=2.2.1~)
-Replaces: kolabconf (<=2.2.1~)
+Conflicts: kolabconf (<=2.2.1~), kolabd (<=2.2.1-20081212-1~)
+Replaces: kolabconf (<=2.2.1~), kolabd (<=2.2.1-20081212-1~)
 Depends: ${perl:Depends}, libconvert-asn1-perl, libmail-imapclient-perl, libmime-tools-perl, libnet-ldap-perl (>= 1:0.39-1), liburi-perl, kolab-libcyrus-imap-perl
 Description: Perl modules for Kolab
  Kolab is a secure, scalable, and reliable groupware server.  It consists