[pkg-kolab] r821 - kolab-webadmin/branches/2.2/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-04-26 12:17:06 +0000 (Sat, 26 Apr 2008)
New Revision: 821

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


Modified: kolab-webadmin/branches/2.2/debian/changelog
===================================================================
--- kolab-webadmin/branches/2.2/debian/changelog	2008-04-26 12:13:51 UTC (rev 820)
+++ kolab-webadmin/branches/2.2/debian/changelog	2008-04-26 12:17:06 UTC (rev 821)
@@ -1,17 +1,12 @@
 kolab-webadmin (2.1.99+20080314.dfsg-1) experimental; urgency=low
 
-  * New upstream version: 2.2rc2
+  * New upstream version: 2.2-rc2
+  * updated common/dist_conf.dpatch
+    - smarty has now the good path
   * updated 10-fix-requires.dpatch
-
- -- Mathieu Parent <math.parent at gmail.com>  Mon, 17 Mar 2008 19:13:59 +0100
-
-kolab-webadmin (2.1.99+20080204-1) UNRELEASED; urgency=low
-
-  * New upstream release
-  * updated 50-dist_conf, smarty is no with the good path
   * 60-no_extra_doc partially dropped
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 15 Mar 2008 11:08:19 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 26 Apr 2008 14:16:24 +0200
 
 kolab-webadmin (2.1.0-20070510-3) UNRELEASED; urgency=low