gunnar: server/kolabd/kolabd ChangeLog, 1.109, 1.110 Makefile.am, 1.33, 1.34 kolabquotareport.in, 1.3, 1.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv4379/kolabd/kolabd

Modified Files:
	ChangeLog Makefile.am kolabquotareport.in 
Log Message:
Bug fixes for the Beta release.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- ChangeLog	7 Aug 2007 11:40:15 -0000	1.109
+++ ChangeLog	3 Oct 2007 10:05:18 -0000	1.110
@@ -1,3 +1,37 @@
+2007-10-03  Gunnar Wrobel  <p at rdus.de>
+
+	* templates/httpd.conf.template.in:
+
+	kolab/issue1796 (httpd.conf : MISSING Include "/kolab/etc/apache/apache.d/*.conf")
+	https://intevation.de/roundup/kolab/issue1796
+
+	* Makefile.am:
+
+	Add kolabquotareport.
+
+	See kolab/issue1811 (Spurious files in CVS, kolabd directory)
+	https://intevation.de/roundup/kolab/issue1811
+
+	* templates/main.cf.template.in (virtual_alias_maps):
+
+	Switched from virtual_maps to virtual_alias_maps.
+
+	See kolab/issue1895 (switch from virtual_maps to virtual_alias_maps)
+	https://intevation.de/roundup/kolab/issue1895
+
+	* templates/imapd.annotation_definitions.template.in:
+
+	Added additional "/vendor/horde/share-params" annotation for
+	extended shares in Horde.
+
+	* templates/imapd.conf.template.in (sieve_extensions):
+
+	Define this parameter for additional sieve extensions "body" and
+	"include".
+
+	See kolab/issue2038 (additional sieve extensions)
+	https://intevation.de/roundup/kolab/issue2038
+
 2007-08-05  Gunnar Wrobel  <p at rdus.de>
 
 	* kolabd.spec.in:

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile.am	31 Aug 2007 09:36:06 -0000	1.33
+++ Makefile.am	3 Oct 2007 10:05:18 -0000	1.34
@@ -25,6 +25,7 @@
 	kolab_bootstrap \
 	workaround.sh \
 	kolabquotawarn \
+	kolabquotareport \
 	kolab_upgrade \
 	kolab_smtpdpolicy \
 	kolabdcachetool
@@ -232,6 +233,13 @@
 	 chmod a+x kolabquotawarn
 CLEANFILES += kolabquotawarn
 EXTRA_DIST += kolabquotawarn.in
+
+kolabquotareport: kolabquotareport.in
+	@$(mkinstalldirs) .
+	 $(do_subst) <$(srcdir)/kolabquotareport.in >$@
+	 chmod a+x kolabquotareport
+CLEANFILES += kolabquotareport
+EXTRA_DIST += kolabquotareport.in
 
 kolabquotareport: kolabquotareport.in
 	@$(mkinstalldirs) .

Index: kolabquotareport.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotareport.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabquotareport.in	2 Aug 2007 06:49:43 -0000	1.3
+++ kolabquotareport.in	3 Oct 2007 10:05:18 -0000	1.4
@@ -1,4 +1,4 @@
-#!@l_prefix@/bin/perl
+#!@PERL@
 
 ##
 ##  Copyright (c) 2004 Klarälvdalens Datakonsult AB