[pkg-kolab] r816 - kolabd/branches/2.2/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-04-26 12:01:33 +0000 (Sat, 26 Apr 2008)
New Revision: 816

Modified:
   kolabd/branches/2.2/debian/changelog
Log:
Combine changelog for unreleased versions


Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog	2008-04-26 11:45:06 UTC (rev 815)
+++ kolabd/branches/2.2/debian/changelog	2008-04-26 12:01:33 UTC (rev 816)
@@ -1,64 +1,31 @@
 kolabd (2.1.99+20080314.dfsg-6) experimental; urgency=low
 
-  * Re-add rfc2739 schema with a copyright notice 
-
- -- Mathieu Parent <math.parent at gmail.com>  Thu, 17 Apr 2008 22:05:29 +0200
-
-kolabd (2.1.99+20080314.dfsg-5) experimental; urgency=low
-
-  * Updated patch 50-postfix-hashes with a RUNONCHANGE for virtual
-
- -- Mathieu Parent <math.parent at gmail.com>  Thu, 03 Apr 2008 23:36:49 +0200
-
-kolabd (2.1.99+20080314.dfsg-4) UNRELEASED; urgency=low
-
-  * Add 91-workaround-bts-471253.dpatch
-
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 30 Mar 2008 15:16:38 +0200
-
-kolabd (2.1.99+20080314.dfsg-3) UNRELEASED; urgency=low
-
-  * Updated README.Debian: 
-    - Mention daemons to stop/start,
+  * New upstream version: 2.2-rc2
+    - updated 80-kolab-syslog-facility.dpatch: partially applied upstream
+  * README.Debian: 
+    - Mention which daemons to stop/start,
     - Remove unneeded creation of cyrus mailboxes
-
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 29 Mar 2008 15:34:45 +0100
-
-kolabd (2.1.99+20080314.dfsg-2) UNRELEASED; urgency=low
-
-  * Use FDS LDAP Backend for Persistent searches
-
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 29 Mar 2008 12:09:17 +0100
-
-kolabd (2.1.99+20080314.dfsg-1) UNRELEASED; urgency=low
-
-  * New upstream version: 2.2rc2
+  * debian/rules
+    - add user postfix to group sasl during postinst, to allow authentication
+      within postfix
   * updated common/dist_conf.dpatch
-  * Updated 50-postfix-hashes.dpatch:
-    - removed useless diff for Makefile.in~
+    - use FDS LDAP backend for persistent searches
+    - smarty has now the good path
+  * new patch 40-disable-amavis: amavis is suggested, so disabled as default
+  * new patch 50-postfix-hashes: Postfix hashes templates
     - Added RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/... so that 
       kolabconf doesn't need to know about postfix
-  * simplify 80-kolab-syslog-facility.dpatch: merged upstream
-
- -- Mathieu Parent <math.parent at gmail.com>  Mon, 17 Mar 2008 19:13:51 +0100
-
-kolabd (2.1.99+20080204.dfsg-1) UNRELEASED; urgency=low
-
-  * New upstream version
-  * updated patch 80-kolab-syslog-facility, part is gone to kolabconf
   * new patch 85-slapd-2.4-compat, to be compatible with slapd 2.4
   * new patch 86-slapd-syncrepl-24, to enable syncrepl and disable slurpd
     (Closes: #463791)
   * updated patch 91-postfix-template, partially applied upstream
   * updated patch 92-resmgr-template, path is now /etc/kolab/filter_config.php
     and format has changed
-  * updated patch  93-freebusy-template, path is now
+  * updated patch 93-freebusy-template, path is now
     /etc/kolab/freebusy_config.php and format has changed
-  * updated patch common/dist_conf, smarty has now the good path
-  * new patch 40-disable-amavis : amavis is suggested, so disabled as default
-  * add user postfix to group sasl during postinst, to allow authentication
-    within postfix
-  * new patch 50-postfix-hashes: Postfix hashes templates
+  * Add 91-workaround-bts-471253.dpatch
+  * Re-add rfc2739 schema with a copyright notice: see
+    http://lists.debian.org/debian-legal/2008/04/msg00087.html
 
  -- Mathieu Parent <math.parent at gmail.com>  Sat, 15 Mar 2008 11:10:22 +0100