[pkg-kolab] r818 - php-kolab/branches/2.2/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-04-26 12:09:14 +0000 (Sat, 26 Apr 2008)
New Revision: 818

Modified:
   php-kolab/branches/2.2/debian/changelog
Log:
Combine changelog for unreleased versions


Modified: php-kolab/branches/2.2/debian/changelog
===================================================================
--- php-kolab/branches/2.2/debian/changelog	2008-04-26 12:02:10 UTC (rev 817)
+++ php-kolab/branches/2.2/debian/changelog	2008-04-26 12:09:14 UTC (rev 818)
@@ -1,26 +1,14 @@
-php-kolab (2.2~rc2+20080314-3) experimental; urgency=low
+php-kolab (2.2~rc2+20080314-1) experimental; urgency=low
 
-  * Updated copyright 
+  * New upstream version: 2.2-rc2
+    - upstream reorganisation of kolab-resources-handler
+  * debian/control
+    - depends on horde3 > 3.2
+    - conflicts with kolab-resources-handler for proper upgrade
+  * Updated debian/copyright 
+  * preinst: remove obsolete conffiles from kolab-resource-handlers:
+    /etc/kolab/{freebusy.conf,resmgr.conf,kolabfilter.php,
+    kolabmailboxfilter.php}
+  * patch 20-horde-path: fix including of Horde libs
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 29 Mar 2008 12:52:29 +0100
-
-php-kolab (2.2~rc2+20080314-2) UNRELEASED; urgency=low
-
-  * Remove obsolete conffiles from kolab-resource-handlers:
-  /etc/kolab/{freebusy.conf,resmgr.conf,kolabfilter.php,kolabmailboxfilter.php}
-
- -- Mathieu Parent <math.parent at gmail.com>  Thu, 27 Mar 2008 15:40:59 +0100
-
-php-kolab (2.2~rc2+20080314-1) UNRELEASED; urgency=low
-
-  * New upstream version: 2.2rc2
-
- -- Mathieu Parent <math.parent at gmail.com>  Mon, 17 Mar 2008 19:13:04 +0100
-
-php-kolab (2.2~rc1+20080204-1) UNRELEASED; urgency=low
-
-  * Initial release, reorganisation of kolab-resources-handler
-  * patch 20-horde-path, to allow including of Horde libs
-  * depends on horde3 > 3.2
-
  -- Mathieu Parent <math.parent at gmail.com>  Sat, 15 Mar 2008 11:21:29 +0100