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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-17 16:06:31 +0000 (Wed, 17 Dec 2008)
New Revision: 1082

Modified:
   php-kolab-freebusy/trunk/debian/changelog
   php-kolab-freebusy/trunk/debian/control
Log:
conflicts/replaces php-kolab and kolab-freebusy


Modified: php-kolab-freebusy/trunk/debian/changelog
===================================================================
--- php-kolab-freebusy/trunk/debian/changelog	2008-12-17 16:05:43 UTC (rev 1081)
+++ php-kolab-freebusy/trunk/debian/changelog	2008-12-17 16:06:31 UTC (rev 1082)
@@ -2,6 +2,6 @@
 
   * Initial Release (Closes: #508958)
   * remove the upstream COPYING
-  * conflicts/replaces php-kolab 
+  * conflicts/replaces php-kolab and kolab-freebusy
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 14:53:07 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 17:03:52 +0100

Modified: php-kolab-freebusy/trunk/debian/control
===================================================================
--- php-kolab-freebusy/trunk/debian/control	2008-12-17 16:05:43 UTC (rev 1081)
+++ php-kolab-freebusy/trunk/debian/control	2008-12-17 16:06:31 UTC (rev 1082)
@@ -11,8 +11,8 @@
 Vcs-Svn: svn://svn.debian.org/pkg-kolab/php-kolab-freebusy/trunk/
 
 Package: php-kolab-freebusy
-Conflicts: php-kolab
-Replaces: php-kolab
+Conflicts: php-kolab (<<2.2.1), kolab-freebusy (<<2.2.1)
+Replaces: php-kolab (<<2.2.1), kolab-freebusy (<<2.2.1)
 Architecture: all
 Depends: ${misc:Depends}, php-pear, horde3, php-kolab-server, php-kolab-storage
 Description: provide free/busy information