martin: server/kolabd/kolabd ChangeLog, 1.4, 1.5 Makefile.am, 1.4, 1.5

[cvs at intevation.de]

Author: martin

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Martin Konold: Applying patch from https://intevation.de/roundup/kolab/issue1017


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	27 Nov 2005 23:57:02 -0000	1.4
+++ ChangeLog	5 Dec 2005 16:21:34 -0000	1.5
@@ -1,3 +1,21 @@
+2005-12-04 Marcus Huwe <suse-tux at gmx.de>
+	* Makefile.am: changed kolab_upgrade.in to kolab_upgrade in
+	  dist_kolab_SCRIPTS
+
+2005-11-27 Richard Bos <richard at radoeka.nl>
+	* dist_conf/common: added imap_confperm, kolab_gid and kolab_statedir
+	  needed by a future patch to perl-kolab
+	  Removed webserver_phpdir as it has been replaced by phplibdir2
+	* dist_conf/kolab: removed kolabd_usr, it is not used anywhere
+	  Removed webserver_phpdir as it has been replaced by phplibdir2
+	* templates/httpd.conf.template.in changed webserver_phpdir in
+	  phplibdir2
+	* templates/php.ini.template.in changed webserver_phpdir in
+	  phplibdir2
+	* templates/session_vars.php.template.in changed webserver_phpdir
+	  in phplibdir2
+	* Makefile.am: added kolab_upgrade
+
 2005-11-27 Marcus Hüwe <suse-tux at gmx.de>
 	* dist_conf/common: altered bash_exec, perl_exec to respectively:
 	  BASH and PERL.

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	22 Nov 2005 14:21:58 -0000	1.4
+++ Makefile.am	5 Dec 2005 16:21:34 -0000	1.5
@@ -16,6 +16,7 @@
 	kolab kolab_bootstrap \
 	workaround.sh \
 	kolabquotawarn \
+	kolab_upgrade \
 	kolab_smtpdpolicy 
 
 
@@ -481,6 +482,13 @@
 	 chmod a+x workaround.sh
 CLEANFILES += workaround.sh
 EXTRA_DIST += workaround.sh.in
+
+kolab_upgrade:
+	@$(mkinstalldirs) .
+	$(do_subst) <$(srcdir)/kolab_upgrade.in >$@
+	chmod a+x kolab_upgrade
+CLEANFILES += kolab_upgrade
+EXTRA_DIST += kolab_upgrade.in
 
 kolab_smtpdpolicy:
 	@$(mkinstalldirs) .