[pkg-kolab] r1112 - php-kolab-freebusy/trunk/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-01-06 22:37:03 +0000 (Tue, 06 Jan 2009)
New Revision: 1112

Modified:
   php-kolab-freebusy/trunk/debian/changelog
   php-kolab-freebusy/trunk/debian/control
Log:
conflicts/replaces kolab-resource-handlers (upgrade path)


Modified: php-kolab-freebusy/trunk/debian/changelog
===================================================================
--- php-kolab-freebusy/trunk/debian/changelog	2009-01-06 20:28:10 UTC (rev 1111)
+++ php-kolab-freebusy/trunk/debian/changelog	2009-01-06 22:37:03 UTC (rev 1112)
@@ -2,9 +2,9 @@
 
   * Initial Release (Closes: #508958)
   * remove the upstream COPYING
-  * conflicts/replaces php-kolab and kolab-freebusy
+  * conflicts/replaces php-kolab, kolab-freebusy and kolab-resource-handlers
   * 10-remove-md5.diff: Remove md5sums to allow patching
   * 20-config-path.diff: Specify config path
   * 30-horde-path.diff: Avoid Horde include errors
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 06 Jan 2009 21:23:29 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 06 Jan 2009 23:33:24 +0100

Modified: php-kolab-freebusy/trunk/debian/control
===================================================================
--- php-kolab-freebusy/trunk/debian/control	2009-01-06 20:28:10 UTC (rev 1111)
+++ php-kolab-freebusy/trunk/debian/control	2009-01-06 22:37:03 UTC (rev 1112)
@@ -11,8 +11,8 @@
 Vcs-Svn: svn://svn.debian.org/pkg-kolab/php-kolab-freebusy/trunk/
 
 Package: php-kolab-freebusy
-Conflicts: php-kolab (<<2.2.1), kolab-freebusy (<<2.2.1)
-Replaces: php-kolab (<<2.2.1), kolab-freebusy (<<2.2.1)
+Conflicts: php-kolab (<<2.2.1), kolab-freebusy (<<2.2.1), kolab-resource-handlers (<<2.2.1)
+Replaces: php-kolab (<<2.2.1), kolab-freebusy (<<2.2.1), kolab-resource-handlers (<<2.2.1)
 Architecture: all
 Depends: ${misc:Depends}, php-pear, horde3, php-kolab-server, php-kolab-storage
 Description: provide Kolab free/busy information