[pkg-kolab] r1113 - kolabd/branches/2.2.1/debian

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Tue Jan 6 22:38:31 UTC 2009


Author: mparent-guest
Date: 2009-01-06 22:38:31 +0000 (Tue, 06 Jan 2009)
New Revision: 1113

Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/control
Log:
conflicts/replaces kolab-resource-handlers


Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2009-01-06 22:37:03 UTC (rev 1112)
+++ kolabd/branches/2.2.1/debian/changelog	2009-01-06 22:38:31 UTC (rev 1113)
@@ -27,7 +27,8 @@
   * taken from kolab-freebusy:
     - apache.conf (referenced path changed)
     - prerm and postinst scripts
-    - freebusy cache directory 
+    - freebusy cache directory
+    - conflicts/replaces kolab-freebusy and kolab-resource-handlers 
   * 10-dist_conf.diff is back:
     - for graveyard path
     - backups are now in /var/lib/kolab/backups instead of 
@@ -35,7 +36,7 @@
     - kolabfilter is now in /usr/bin/
   * 99-issue3311.diff: port upstream patch 
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 30 Dec 2008 15:21:08 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 06 Jan 2009 23:34:45 +0100
 
 kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
 

Modified: kolabd/branches/2.2.1/debian/control
===================================================================
--- kolabd/branches/2.2.1/debian/control	2009-01-06 22:37:03 UTC (rev 1112)
+++ kolabd/branches/2.2.1/debian/control	2009-01-06 22:38:31 UTC (rev 1113)
@@ -20,8 +20,8 @@
  adduser, lsb-base (>= 3.0-3)
 Recommends: slapd, ldap-utils
 Suggests: openssl, db4.2-util, kolab-webadmin, amavisd-new, clamav, clamav-daemon, spamassassin
-Replaces: kolab-freebusy (<<2.2.1)
-Conflicts: kolab-freebusy (<<2.2.1)
+Replaces: kolab-freebusy (<<2.2.1), kolab-resource-handlers (<<2.2.1)
+Conflicts: 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




More information about the pkg-kolab-devel mailing list