gunnar: server/kolabd/kolabd ChangeLog, 1.292, 1.293 Makefile.am, 1.54, 1.55 kolab.globals.in, 1.27, 1.28
cvs at kolab.org
cvs at kolab.org
Sun May 16 08:58:55 CEST 2010
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv23910/d/kolabd
Modified Files:
ChangeLog Makefile.am kolab.globals.in
Log Message:
freebusy.conf.template.in moved to the Kolab_FreeBusy package.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- ChangeLog 4 May 2010 14:10:42 -0000 1.292
+++ ChangeLog 16 May 2010 06:58:53 -0000 1.293
@@ -1,3 +1,15 @@
+2010-05-16 Gunnar Wrobel <p at rdus.de>
+
+ * Makefile.am (kolabtemplate_DATA): freebusy.conf.template.in
+ moved to the Kolab_FreeBusy package.
+
+ * kolab.globals.in (freebusy_*): Add the freebusy variables into
+ the global parameter list so that the freebusy.conf.template.in
+ can be removed.
+
+ * templates/freebusy.conf.template.in: Moved to the Kolab_FreeBusy
+ package.
+
2010-05-04 Thomas Arendsen Hein <thomas at intevation.de>
* templates/imapd.annotation_definitions.template.in:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile.am 23 Jul 2009 08:10:02 -0000 1.54
+++ Makefile.am 16 May 2010 06:58:53 -0000 1.55
@@ -36,7 +36,6 @@
templates/clamd.conf.template \
templates/cyrus.conf.template \
templates/DB_CONFIG.slapd.template \
- templates/freebusy.conf.template \
templates/freshclam.conf.template \
templates/header_checks.template \
templates/httpd.conf.template \
Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- kolab.globals.in 9 Feb 2010 09:42:21 -0000 1.27
+++ kolab.globals.in 16 May 2010 06:58:53 -0000 1.28
@@ -90,3 +90,10 @@
syncrepl_cookie_file : @kolab_statedir@/syncrepl_cookie
imap_confdir : @imap_confdir@
imappartitions_script : @sbindir@/kolab_imappartitions
+freebusy_confdir: @freebusy_confdir@
+freebusy_usr: @freebusy_usr@
+freebusy_grp: @freebusy_grp@
+freebusy_log_type: @freebusy_log_type@
+freebusy_log_name: @freebusy_log_name@
+freebusy_logdir: @freebusy_logdir@
+freebusy_cachedir: @freebusy_cachedir@
More information about the commits
mailing list