[pkg-kolab] r771 - kolabconf/branches/2.2/debian kolabconf/branches/2.2/debian/patches kolabd/branches/2.2/debian kolabd/branches/2.2/debian/patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-03-17 19:24:51 +0000 (Mon, 17 Mar 2008)
New Revision: 771

Removed:
   kolabconf/branches/2.2/debian/patches/50-postfix-hashes.dpatch
Modified:
   kolabconf/branches/2.2/debian/changelog
   kolabconf/branches/2.2/debian/patches/00list
   kolabd/branches/2.2/debian/changelog
   kolabd/branches/2.2/debian/patches/50-postfix-hashes.dpatch
   kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch
Log:
Updated patches :
* 50-postfix-hashes.dpatch : better way of doing it
* 80-kolab-syslog-facility.dpatch : remove useless line



Modified: kolabconf/branches/2.2/debian/changelog
===================================================================
--- kolabconf/branches/2.2/debian/changelog	2008-03-17 18:55:29 UTC (rev 770)
+++ kolabconf/branches/2.2/debian/changelog	2008-03-17 19:24:51 UTC (rev 771)
@@ -1,6 +1,8 @@
 kolabconf (2.2~rc2+20080314-1) UNRELEASED; urgency=low
 
   * New upstream version: 2.2rc2
+  * Removed 50-postfix-hashes.dpatch, because of the use of RUNONCHANGE in the
+    corresponding kolabd patch
   * Removed 80-kolab-syslog-facility.dpatch: applied upstream
 
  -- Mathieu Parent <math.parent at gmail.com>  Mon, 17 Mar 2008 19:11:53 +0100

Modified: kolabconf/branches/2.2/debian/patches/00list
===================================================================
--- kolabconf/branches/2.2/debian/patches/00list	2008-03-17 18:55:29 UTC (rev 770)
+++ kolabconf/branches/2.2/debian/patches/00list	2008-03-17 19:24:51 UTC (rev 771)
@@ -1,4 +1,3 @@
 10-kolabconf-perl-path
 30-invoke-rc
-50-postfix-hashes
 85-slapd-syncrepl-24

Deleted: kolabconf/branches/2.2/debian/patches/50-postfix-hashes.dpatch
===================================================================
--- kolabconf/branches/2.2/debian/patches/50-postfix-hashes.dpatch	2008-03-17 18:55:29 UTC (rev 770)
+++ kolabconf/branches/2.2/debian/patches/50-postfix-hashes.dpatch	2008-03-17 19:24:51 UTC (rev 771)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50-postfix-hashes.dpatch by Mathieu Parent <math.parent at gmail.com>
-##
-## DP: Add building of various postfix maps
-## DP: See https://www.intevation.de/roundup/kolab/issue2550
-
- at DPATCH@
-diff -urNad kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm
---- kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm	2008-03-14 20:25:44.000000000 +0100
-+++ kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm	2008-03-14 20:30:50.000000000 +0100
-@@ -262,6 +262,20 @@
- {
-     buildPostfixMap( 'virtual' );
- }
-+sub buildPostfixAccessMap
-+{
-+    buildPostfixMap( 'access' );
-+}
-+
-+sub buildPostfixCanonicalMap
-+{
-+    buildPostfixMap( 'canonical' );
-+}
-+
-+sub buildPostfixRelocatedMap
-+{
-+    buildPostfixMap( 'relocated' );
-+}
- 
- sub buildPostfixMap
- {
-@@ -667,6 +681,9 @@
- 
-     buildPostfixTransportMap;
-     buildPostfixVirtualMap;
-+    buildPostfixAccessMap;
-+    buildPostfixCanonicalMap;
-+    buildPostfixRelocatedMap;
-     buildLDAPAccess;
-     buildLDAPReplicas;
-     buildCyrusGroups;

Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog	2008-03-17 18:55:29 UTC (rev 770)
+++ kolabd/branches/2.2/debian/changelog	2008-03-17 19:24:51 UTC (rev 771)
@@ -2,6 +2,10 @@
 
   * New upstream version: 2.2rc2
   * updated common/dist_conf.dpatch
+  * Updated 50-postfix-hashes.dpatch:
+    - removed useless diff for Makefile.in~
+    - 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

Modified: kolabd/branches/2.2/debian/patches/50-postfix-hashes.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/50-postfix-hashes.dpatch	2008-03-17 18:55:29 UTC (rev 770)
+++ kolabd/branches/2.2/debian/patches/50-postfix-hashes.dpatch	2008-03-17 19:24:51 UTC (rev 771)
@@ -1,12 +1,12 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 50-postfix-hashes.dpatch by  <math.parent at gmail.com>
+## 50-postfix-hashes.dpatch by Mathieu Parent <math.parent at gmail.com>
 ##
 ## DP: Postfix hashes templates
 
 @DPATCH@
-diff -urNad kolabd-2.1.99+20080204.dfsg~/Makefile.am kolabd-2.1.99+20080204.dfsg/Makefile.am
---- kolabd-2.1.99+20080204.dfsg~/Makefile.am	2008-03-15 19:57:22.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/Makefile.am	2008-03-15 19:57:26.000000000 +0100
+diff -urNad kolabd-2.1.99+20080314.dfsg~/Makefile.am kolabd-2.1.99+20080314.dfsg/Makefile.am
+--- kolabd-2.1.99+20080314.dfsg~/Makefile.am	2008-03-06 09:26:25.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/Makefile.am	2008-03-17 20:08:51.000000000 +0100
 @@ -43,6 +43,8 @@
  
  
@@ -16,7 +16,7 @@
  	templates/clamd.conf.template \
  	templates/cyrus.conf.template \
  	templates/DB_CONFIG.slapd.template \
-@@ -63,6 +65,7 @@
+@@ -64,6 +66,7 @@
  	templates/ldapvirtual.cf.template \
  	templates/kolab_smtpdpolicy.conf.template \
  	templates/php.ini.template \
@@ -24,7 +24,7 @@
  	templates/resmgr.conf.template \
  	templates/saslauthd.conf.template \
  	templates/session_vars.php.template \
-@@ -324,6 +327,18 @@
+@@ -325,6 +328,18 @@
  CLEANFILES += namespace/kolab
  EXTRA_DIST += namespace/kolab.in
  
@@ -43,7 +43,7 @@
  templates/clamd.conf.template: templates/clamd.conf.template.in
  	@$(mkinstalldirs) templates
  	$(do_subst) <$(srcdir)/templates/clamd.conf.template.in >$@
-@@ -450,6 +465,12 @@
+@@ -451,6 +466,12 @@
  CLEANFILES += templates/rc.conf.template
  EXTRA_DIST += templates/rc.conf.template.in
  
@@ -56,9 +56,9 @@
  templates/resmgr.conf.template: templates/resmgr.conf.template.in
  	@$(mkinstalldirs) templates
  	$(do_subst) <$(srcdir)/templates/resmgr.conf.template.in >$@
-diff -urNad kolabd-2.1.99+20080204.dfsg~/Makefile.in kolabd-2.1.99+20080204.dfsg/Makefile.in
---- kolabd-2.1.99+20080204.dfsg~/Makefile.in	2008-03-15 19:57:22.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/Makefile.in	2008-03-15 20:03:17.000000000 +0100
+diff -urNad kolabd-2.1.99+20080314.dfsg~/Makefile.in kolabd-2.1.99+20080314.dfsg/Makefile.in
+--- kolabd-2.1.99+20080314.dfsg~/Makefile.in	2008-03-14 12:17:40.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/Makefile.in	2008-03-17 20:08:51.000000000 +0100
 @@ -177,6 +177,8 @@
  	namespace/libexec/services.in namespace/libexec/showlog.in \
  	namespace/libexec/showuser.in namespace/libexec/start.in \
@@ -76,7 +76,7 @@
  	templates/resmgr.conf.template.in \
  	templates/saslauthd.conf.template.in \
  	templates/session_vars.php.template.in \
-@@ -217,6 +220,8 @@
+@@ -218,6 +221,8 @@
  	namespace/libexec/newconfig namespace/libexec/services \
  	namespace/libexec/showlog namespace/libexec/showuser \
  	namespace/libexec/start namespace/libexec/stop namespace/kolab \
@@ -85,7 +85,7 @@
  	templates/clamd.conf.template templates/cyrus.conf.template \
  	templates/DB_CONFIG.slapd.template \
  	templates/fbview.conf.template \
-@@ -232,6 +237,7 @@
+@@ -233,6 +238,7 @@
  	templates/master.cf.template \
  	templates/kolab_smtpdpolicy.conf.template \
  	templates/php.ini.template templates/rc.conf.template \
@@ -93,7 +93,7 @@
  	templates/resmgr.conf.template \
  	templates/saslauthd.conf.template \
  	templates/session_vars.php.template \
-@@ -271,6 +277,8 @@
+@@ -272,6 +278,8 @@
  	templates/clamd.conf.template \
  	templates/cyrus.conf.template \
  	templates/DB_CONFIG.slapd.template \
@@ -102,7 +102,7 @@
  	templates/fbview.conf.template \
  	templates/freebusy.conf.template \
  	templates/freshclam.conf.template \
-@@ -288,6 +296,7 @@
+@@ -290,6 +298,7 @@
  	templates/ldapvirtual.cf.template \
  	templates/kolab_smtpdpolicy.conf.template \
  	templates/php.ini.template \
@@ -110,7 +110,7 @@
  	templates/resmgr.conf.template \
  	templates/saslauthd.conf.template \
  	templates/session_vars.php.template \
-@@ -1033,6 +1042,14 @@
+@@ -1035,6 +1044,14 @@
  	$(do_subst) <$(srcdir)/namespace/kolab.in >$@
  	chmod a+x namespace/kolab
  
@@ -125,7 +125,7 @@
  templates/clamd.conf.template: templates/clamd.conf.template.in
  	@$(mkinstalldirs) templates
  	$(do_subst) <$(srcdir)/templates/clamd.conf.template.in >$@
-@@ -1117,6 +1134,10 @@
+@@ -1119,6 +1136,10 @@
  	@$(mkinstalldirs) templates
  	$(do_subst) <$(srcdir)/templates/rc.conf.template.in >$@
  
@@ -136,1252 +136,15 @@
  templates/resmgr.conf.template: templates/resmgr.conf.template.in
  	@$(mkinstalldirs) templates
  	$(do_subst) <$(srcdir)/templates/resmgr.conf.template.in >$@
-diff -urNad kolabd-2.1.99+20080204.dfsg~/Makefile.in~ kolabd-2.1.99+20080204.dfsg/Makefile.in~
---- kolabd-2.1.99+20080204.dfsg~/Makefile.in~	1970-01-01 01:00:00.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/Makefile.in~	2008-03-15 20:02:39.000000000 +0100
-@@ -0,0 +1,1234 @@
-+# Makefile.in generated by automake 1.10 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+
-+
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+subdir = .
-+DIST_COMMON = README $(am__configure_deps) $(dist_amavisdde_DATA) \
-+	$(dist_amavisdus_DATA) $(dist_kolabconfig_DATA) \
-+	$(dist_ldapschema_DATA) $(noinst_HEADERS) \
-+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+	$(srcdir)/kolabd.spec.in $(top_srcdir)/configure AUTHORS \
-+	COPYING ChangeLog INSTALL NEWS install-sh missing
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno config.status.lineno
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_CLEAN_FILES = kolabd.spec
-+am__installdirs = "$(DESTDIR)$(kolabdir)" "$(DESTDIR)$(amavisddedir)" \
-+	"$(DESTDIR)$(amavisdusdir)" "$(DESTDIR)$(kolabconfigdir)" \
-+	"$(DESTDIR)$(ldapschemadir)" "$(DESTDIR)$(kolabbindir)" \
-+	"$(DESTDIR)$(kolabdocdir)" "$(DESTDIR)$(kolabnamespacedir)" \
-+	"$(DESTDIR)$(kolabrcdir)" "$(DESTDIR)$(kolabsbindir)" \
-+	"$(DESTDIR)$(kolabspecialdir)" "$(DESTDIR)$(kolabtemplatedir)"
-+kolabSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-+SCRIPTS = $(kolab_SCRIPTS)
-+SOURCES =
-+DIST_SOURCES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+dist_amavisddeDATA_INSTALL = $(INSTALL_DATA)
-+dist_amavisdusDATA_INSTALL = $(INSTALL_DATA)
-+dist_kolabconfigDATA_INSTALL = $(INSTALL_DATA)
-+dist_ldapschemaDATA_INSTALL = $(INSTALL_DATA)
-+kolabbinDATA_INSTALL = $(INSTALL_DATA)
-+kolabdocDATA_INSTALL = $(INSTALL_DATA)
-+kolabnamespaceDATA_INSTALL = $(INSTALL_DATA)
-+kolabrcDATA_INSTALL = $(INSTALL_DATA)
-+kolabsbinDATA_INSTALL = $(INSTALL_DATA)
-+kolabspecialDATA_INSTALL = $(INSTALL_DATA)
-+kolabtemplateDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(dist_amavisdde_DATA) $(dist_amavisdus_DATA) \
-+	$(dist_kolabconfig_DATA) $(dist_ldapschema_DATA) \
-+	$(kolabbin_DATA) $(kolabdoc_DATA) $(kolabnamespace_DATA) \
-+	$(kolabrc_DATA) $(kolabsbin_DATA) $(kolabspecial_DATA) \
-+	$(kolabtemplate_DATA)
-+HEADERS = $(noinst_HEADERS)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+GZIP_ENV = --best
-+DIST_ARCHIVES = $(distdir).tar.bz2
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+AMTAR = @AMTAR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+WITHOPENPKG = @WITHOPENPKG@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+am__leading_dot = @am__leading_dot@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build_alias = @build_alias@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host_alias = @host_alias@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+spec_build_date = @spec_build_date@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+
-+# Please update the perl-kolab, kolab-webadmin and kolab-resource-handlers
-+# Makefile.ams too when the underneath EXTRA_DIST assignment is altered
-+EXTRA_DIST = $(kolabdoc_FILES) kolab.in kolab.globals.in \
-+	kolab_ca.sh.in kolab_bootstrap.in kolab_sslcert.sh.in \
-+	kolabcheckperm.in kolabd.in kolabpasswd.in kolabquotawarn.in \
-+	kolabquotareport.in kolabquotareport.in kolabdcachetool.in \
-+	namespace/libexec/adduser.in namespace/libexec/deluser.in \
-+	namespace/libexec/listusers.in namespace/libexec/newconfig.in \
-+	namespace/libexec/services.in namespace/libexec/showlog.in \
-+	namespace/libexec/showuser.in namespace/libexec/start.in \
-+	namespace/libexec/stop.in namespace/kolab.in \
-+	templates/access.template.in \
-+	templates/canonical.template.in \
-+	templates/clamd.conf.template.in \
-+	templates/cyrus.conf.template.in \
-+	templates/DB_CONFIG.slapd.template.in \
-+	templates/fbview.conf.template.in \
-+	templates/freebusy.conf.template.in \
-+	templates/freshclam.conf.template.in \
-+	templates/httpd.conf.template.in \
-+	templates/httpd.local.template.in \
-+	templates/imapd.annotation_definitions.template.in \
-+	templates/imapd.conf.template.in \
-+	templates/imapd.group.template.in \
-+	templates/kolab.conf.template.in \
-+	templates/ldap.conf.template.in \
-+	templates/ldapdistlist.cf.template.in \
-+	templates/ldaptransport.cf.template.in \
-+	templates/ldapvirtual.cf.template.in \
-+	templates/main.cf.template.in templates/master.cf.template.in \
-+	templates/kolab_smtpdpolicy.conf.template.in \
-+	templates/php.ini.template.in templates/rc.conf.template.in \
-+	templates/relocation.template.in \
-+	templates/resmgr.conf.template.in \
-+	templates/saslauthd.conf.template.in \
-+	templates/session_vars.php.template.in \
-+	templates/slapd.access.template.in \
-+	templates/slapd.conf.template.in \
-+	templates/slapd.replicas.template.in \
-+	templates/smtpd.conf.template.in \
-+	templates/transport.template.in templates/virtual.template.in \
-+	templates/amavisd.conf.template.in workaround.sh.in \
-+	kolab_upgrade.in kolab_smtpdpolicy.in doc/README.amavisd.in \
-+	doc/README.webgui.in rc.kolabd.in dist_conf/kolabsrv.in \
-+	dist_conf/common dist_conf/debian dist_conf/gentoo \
-+	dist_conf/kolab dist_conf/mandriva dist_conf/suse
-+CLEANFILES = kolab kolab.globals kolab_ca.sh kolab_bootstrap \
-+	kolab_sslcert.sh kolabcheckperm kolabd kolabpasswd \
-+	kolabquotawarn kolabquotareport kolabquotareport \
-+	kolabdcachetool namespace/libexec/adduser \
-+	namespace/libexec/deluser namespace/libexec/listusers \
-+	namespace/libexec/newconfig namespace/libexec/services \
-+	namespace/libexec/showlog namespace/libexec/showuser \
-+	namespace/libexec/start namespace/libexec/stop namespace/kolab \
-+	templates/access.template \
-+	templates/canonical.template \
-+	templates/clamd.conf.template templates/cyrus.conf.template \
-+	templates/DB_CONFIG.slapd.template \
-+	templates/fbview.conf.template \
-+	templates/freebusy.conf.template \
-+	templates/freshclam.conf.template \
-+	templates/httpd.conf.template templates/httpd.local.template \
-+	templates/imapd.annotation_definitions.template \
-+	templates/imapd.conf.template templates/imapd.group.template \
-+	templates/kolab.conf.template templates/ldap.conf.template \
-+	templates/ldapdistlist.cf.template \
-+	templates/ldaptransport.cf.template \
-+	templates/ldapvirtual.cf.template templates/main.cf.template \
-+	templates/master.cf.template \
-+	templates/kolab_smtpdpolicy.conf.template \
-+	templates/php.ini.template templates/rc.conf.template \
-+	templates/relocation.template \
-+	templates/resmgr.conf.template \
-+	templates/saslauthd.conf.template \
-+	templates/session_vars.php.template \
-+	templates/slapd.access.template templates/slapd.conf.template \
-+	templates/slapd.replicas.template \
-+	templates/smtpd.conf.template templates/transport.template \
-+	templates/virtual.template templates/amavisd.conf.template \
-+	workaround.sh kolab_upgrade kolab_smtpdpolicy \
-+	doc/README.amavisd doc/README.webgui rc.kolabd \
-+	dist_conf/kolabsrv
-+noinst_HEADERS = @PACKAGE at .spec
-+
-+# is sometimes used in this file
-+kolabconfdir = $(sysconfdir)/kolab
-+kolabdir = $(kolab_scriptsdir)
-+ at OPENPKG_TRUE@KOLAB_SCRIPTS_FILES = kolab
-+kolab_SCRIPTS = $(KOLAB_SCRIPTS_FILES) \
-+	kolab_sslcert.sh \
-+	kolab_ca.sh \
-+	kolab_bootstrap \
-+	workaround.sh \
-+	kolabquotawarn \
-+	kolabquotareport \
-+	kolab_upgrade \
-+	kolab_smtpdpolicy \
-+	kolabdcachetool
-+
-+kolabspecialdir = $(kolabconfdir)
-+kolabspecial_DATA = kolab.globals
-+kolabconfig_FILES = kolab.conf \
-+	rootDSE.ldif \
-+	quotawarning.txt
-+
-+kolabconfigdir = $(kolabconfdir)
-+dist_kolabconfig_DATA = $(kolabconfig_FILES)
-+kolabtemplate_FILES = templates/amavisd.conf.template \
-+	templates/clamd.conf.template \
-+	templates/cyrus.conf.template \
-+	templates/DB_CONFIG.slapd.template \
-+	templates/access.template \
-+	templates/canonical.template \
-+	templates/fbview.conf.template \
-+	templates/freebusy.conf.template \
-+	templates/freshclam.conf.template \
-+	templates/httpd.conf.template \
-+	templates/httpd.local.template \
-+	templates/imapd.annotation_definitions.template \
-+	templates/imapd.conf.template \
-+	templates/imapd.group.template \
-+	templates/kolab.conf.template \
-+	templates/ldap.conf.template \
-+	templates/main.cf.template \
-+	templates/master.cf.template \
-+	templates/ldapdistlist.cf.template \
-+	templates/ldaptransport.cf.template \
-+	templates/ldapvirtual.cf.template \
-+	templates/kolab_smtpdpolicy.conf.template \
-+	templates/php.ini.template \
-+	templates/relocation.template \
-+	templates/resmgr.conf.template \
-+	templates/saslauthd.conf.template \
-+	templates/session_vars.php.template \
-+	templates/slapd.access.template \
-+	templates/slapd.conf.template \
-+	templates/slapd.replicas.template \
-+	templates/smtpd.conf.template \
-+	templates/transport.template \
-+	templates/virtual.template
-+
-+kolabtemplatedir = $(kolabconfdir)/templates
-+ at OPENPKG_FALSE@kolabtemplate_DATA = $(kolabtemplate_FILES)
-+ at OPENPKG_TRUE@kolabtemplate_DATA = $(kolabtemplate_FILES) \
-+ at OPENPKG_TRUE@	templates/rc.conf.template
-+
-+kolabnamespace_FILES = namespace/libexec/newconfig \
-+	namespace/libexec/adduser \
-+	namespace/libexec/deluser \
-+	namespace/libexec/listusers \
-+	namespace/libexec/showuser \
-+	namespace/libexec/newconfig \
-+	namespace/libexec/services \
-+	namespace/libexec/showlog \
-+	namespace/libexec/start \
-+	namespace/libexec/stop 
-+
-+kolabnamespacedir = $(libexecdir)/kolab
-+kolabnamespace_DATA = $(kolabnamespace_FILES)
-+ldapschema_FILES = kolab2.schema \
-+	horde.schema \
-+	rfc2739.schema
-+
-+ldapschemadir = $(ldapserver_confdir)/schema
-+dist_ldapschema_DATA = $(ldapschema_FILES)
-+amavisdus_FILES = amavisd/en_US/charset \
-+	amavisd/en_US/template-dsn.txt \
-+	amavisd/en_US/template-spam-admin.txt \
-+	amavisd/en_US/template-spam-sender.txt \
-+	amavisd/en_US/template-virus-admin.txt \
-+	amavisd/en_US/template-virus-recipient.txt \
-+	amavisd/en_US/template-virus-sender.txt
-+
-+amavisdusdir = $(amavisd_templatedir)/en_US
-+dist_amavisdus_DATA = $(amavisdus_FILES)
-+amavisdde_FILES = amavisd/de/charset \
-+	amavisd/de/template-dsn.txt \
-+	amavisd/de/template-spam-admin.txt \
-+	amavisd/de/template-spam-sender.txt \
-+	amavisd/de/template-virus-admin.txt \
-+	amavisd/de/template-virus-recipient.txt \
-+	amavisd/de/template-virus-sender.txt
-+
-+amavisddedir = $(amavisd_templatedir)/de
-+dist_amavisdde_DATA = $(amavisdde_FILES)
-+kolabdoc_FILES = doc/README.ldapdelete \
-+	doc/README.outlook \
-+	doc/README.sieve \
-+	ChangeLog \
-+	COPYING \
-+	NEWS \
-+	AUTHORS
-+
-+kolabdocdir = $(pkgdocdir)/@PACKAGE@
-+kolabdoc_DATA = $(kolabdoc_FILES) \
-+	doc/README.amavisd \
-+	doc/README.webgui
-+
-+ at OPENPKG_FALSE@kolabsbin_FILES = kolabd \
-+ at OPENPKG_FALSE@	kolabcheckperm \
-+ at OPENPKG_FALSE@	dist_conf/kolabsrv
-+
-+ at OPENPKG_TRUE@kolabsbin_FILES = kolabd \
-+ at OPENPKG_TRUE@	kolabcheckperm
-+
-+kolabsbindir = $(sbindir)/
-+kolabsbin_DATA = $(kolabsbin_FILES)
-+kolabbindir = $(bindir)
-+ at OPENPKG_TRUE@KOLABBIN_FILES = namespace/kolab
-+kolabbin_DATA = kolabpasswd $(KOLABBIN_FILES)
-+ at OPENPKG_TRUE@kolabrcdir = $(kolab_rcdir)
-+ at OPENPKG_TRUE@kolabrc_DATA = rc.kolabd
-+all: all-am
-+
-+.SUFFIXES:
-+am--refresh:
-+	@:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+kolabd.spec: $(top_builddir)/config.status $(srcdir)/kolabd.spec.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+install-kolabSCRIPTS: $(kolab_SCRIPTS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(kolabdir)" || $(MKDIR_P) "$(DESTDIR)$(kolabdir)"
-+	@list='$(kolab_SCRIPTS)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  if test -f $$d$$p; then \
-+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+	    echo " $(kolabSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(kolabdir)/$$f'"; \
-+	    $(kolabSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(kolabdir)/$$f"; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-kolabSCRIPTS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(kolab_SCRIPTS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+	  echo " rm -f '$(DESTDIR)$(kolabdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(kolabdir)/$$f"; \
-+	done
-+install-dist_amavisddeDATA: $(dist_amavisdde_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(amavisddedir)" || $(MKDIR_P) "$(DESTDIR)$(amavisddedir)"
-+	@list='$(dist_amavisdde_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(dist_amavisddeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(amavisddedir)/$$f'"; \
-+	  $(dist_amavisddeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(amavisddedir)/$$f"; \
-+	done
-+
-+uninstall-dist_amavisddeDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_amavisdde_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(amavisddedir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(amavisddedir)/$$f"; \
-+	done
-+install-dist_amavisdusDATA: $(dist_amavisdus_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(amavisdusdir)" || $(MKDIR_P) "$(DESTDIR)$(amavisdusdir)"
-+	@list='$(dist_amavisdus_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(dist_amavisdusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(amavisdusdir)/$$f'"; \
-+	  $(dist_amavisdusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(amavisdusdir)/$$f"; \
-+	done
-+
-+uninstall-dist_amavisdusDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_amavisdus_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(amavisdusdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(amavisdusdir)/$$f"; \
-+	done
-+install-dist_kolabconfigDATA: $(dist_kolabconfig_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(kolabconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(kolabconfigdir)"
-+	@list='$(dist_kolabconfig_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(dist_kolabconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kolabconfigdir)/$$f'"; \
-+	  $(dist_kolabconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kolabconfigdir)/$$f"; \
-+	done
-+
-+uninstall-dist_kolabconfigDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_kolabconfig_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(kolabconfigdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(kolabconfigdir)/$$f"; \
-+	done
-+install-dist_ldapschemaDATA: $(dist_ldapschema_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(ldapschemadir)" || $(MKDIR_P) "$(DESTDIR)$(ldapschemadir)"
-+	@list='$(dist_ldapschema_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(dist_ldapschemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ldapschemadir)/$$f'"; \
-+	  $(dist_ldapschemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ldapschemadir)/$$f"; \
-+	done
-+
-+uninstall-dist_ldapschemaDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_ldapschema_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(ldapschemadir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(ldapschemadir)/$$f"; \
-+	done
-+install-kolabbinDATA: $(kolabbin_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(kolabbindir)" || $(MKDIR_P) "$(DESTDIR)$(kolabbindir)"
-+	@list='$(kolabbin_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(kolabbinDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kolabbindir)/$$f'"; \
-+	  $(kolabbinDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kolabbindir)/$$f"; \
-+	done
-+
-+uninstall-kolabbinDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(kolabbin_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(kolabbindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(kolabbindir)/$$f"; \
-+	done
-+install-kolabdocDATA: $(kolabdoc_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(kolabdocdir)" || $(MKDIR_P) "$(DESTDIR)$(kolabdocdir)"
-+	@list='$(kolabdoc_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(kolabdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kolabdocdir)/$$f'"; \
-+	  $(kolabdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kolabdocdir)/$$f"; \
-+	done
-+
-+uninstall-kolabdocDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(kolabdoc_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(kolabdocdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(kolabdocdir)/$$f"; \
-+	done
-+install-kolabnamespaceDATA: $(kolabnamespace_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(kolabnamespacedir)" || $(MKDIR_P) "$(DESTDIR)$(kolabnamespacedir)"
-+	@list='$(kolabnamespace_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(kolabnamespaceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kolabnamespacedir)/$$f'"; \
-+	  $(kolabnamespaceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kolabnamespacedir)/$$f"; \
-+	done
-+
-+uninstall-kolabnamespaceDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(kolabnamespace_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(kolabnamespacedir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(kolabnamespacedir)/$$f"; \
-+	done
-+install-kolabrcDATA: $(kolabrc_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(kolabrcdir)" || $(MKDIR_P) "$(DESTDIR)$(kolabrcdir)"
-+	@list='$(kolabrc_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(kolabrcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kolabrcdir)/$$f'"; \
-+	  $(kolabrcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kolabrcdir)/$$f"; \
-+	done
-+
-+uninstall-kolabrcDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(kolabrc_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(kolabrcdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(kolabrcdir)/$$f"; \
-+	done
-+install-kolabsbinDATA: $(kolabsbin_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(kolabsbindir)" || $(MKDIR_P) "$(DESTDIR)$(kolabsbindir)"
-+	@list='$(kolabsbin_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(kolabsbinDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kolabsbindir)/$$f'"; \
-+	  $(kolabsbinDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kolabsbindir)/$$f"; \
-+	done
-+
-+uninstall-kolabsbinDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(kolabsbin_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(kolabsbindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(kolabsbindir)/$$f"; \
-+	done
-+install-kolabspecialDATA: $(kolabspecial_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(kolabspecialdir)" || $(MKDIR_P) "$(DESTDIR)$(kolabspecialdir)"
-+	@list='$(kolabspecial_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(kolabspecialDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kolabspecialdir)/$$f'"; \
-+	  $(kolabspecialDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kolabspecialdir)/$$f"; \
-+	done
-+
-+uninstall-kolabspecialDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(kolabspecial_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(kolabspecialdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(kolabspecialdir)/$$f"; \
-+	done
-+install-kolabtemplateDATA: $(kolabtemplate_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(kolabtemplatedir)" || $(MKDIR_P) "$(DESTDIR)$(kolabtemplatedir)"
-+	@list='$(kolabtemplate_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(kolabtemplateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kolabtemplatedir)/$$f'"; \
-+	  $(kolabtemplateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kolabtemplatedir)/$$f"; \
-+	done
-+
-+uninstall-kolabtemplateDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(kolabtemplate_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(kolabtemplatedir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(kolabtemplatedir)/$$f"; \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	$(am__remove_distdir)
-+	test -d $(distdir) || mkdir $(distdir)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+dist-bzip2: distdir
-+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
-+
-+dist-tarZ: distdir
-+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
-+
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
-+
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
-+
-+dist dist-all: distdir
-+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	*.tar.bz2*) \
-+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && cd $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+	$(am__remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-+distuninstallcheck:
-+	@cd $(distuninstallcheck_dir) \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
-+	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(SCRIPTS) $(DATA) $(HEADERS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(kolabdir)" "$(DESTDIR)$(amavisddedir)" "$(DESTDIR)$(amavisdusdir)" "$(DESTDIR)$(kolabconfigdir)" "$(DESTDIR)$(ldapschemadir)" "$(DESTDIR)$(kolabbindir)" "$(DESTDIR)$(kolabdocdir)" "$(DESTDIR)$(kolabnamespacedir)" "$(DESTDIR)$(kolabrcdir)" "$(DESTDIR)$(kolabsbindir)" "$(DESTDIR)$(kolabspecialdir)" "$(DESTDIR)$(kolabtemplatedir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-local \
-+	distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-dist_amavisddeDATA install-dist_amavisdusDATA \
-+	install-dist_kolabconfigDATA install-dist_ldapschemaDATA \
-+	install-kolabSCRIPTS install-kolabbinDATA install-kolabdocDATA \
-+	install-kolabnamespaceDATA install-kolabrcDATA \
-+	install-kolabsbinDATA install-kolabspecialDATA \
-+	install-kolabtemplateDATA
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+
-+install-dvi: install-dvi-am
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-dist_amavisddeDATA \
-+	uninstall-dist_amavisdusDATA uninstall-dist_kolabconfigDATA \
-+	uninstall-dist_ldapschemaDATA uninstall-kolabSCRIPTS \
-+	uninstall-kolabbinDATA uninstall-kolabdocDATA \
-+	uninstall-kolabnamespaceDATA uninstall-kolabrcDATA \
-+	uninstall-kolabsbinDATA uninstall-kolabspecialDATA \
-+	uninstall-kolabtemplateDATA
-+
-+.MAKE: install-am install-data-am install-strip
-+
-+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-+	clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
-+	dist-shar dist-tarZ dist-zip distcheck distclean \
-+	distclean-generic distclean-local distclean-tags \
-+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-data-hook install-dist_amavisddeDATA \
-+	install-dist_amavisdusDATA install-dist_kolabconfigDATA \
-+	install-dist_ldapschemaDATA install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-kolabSCRIPTS \
-+	install-kolabbinDATA install-kolabdocDATA \
-+	install-kolabnamespaceDATA install-kolabrcDATA \
-+	install-kolabsbinDATA install-kolabspecialDATA \
-+	install-kolabtemplateDATA install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-+	pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-dist_amavisddeDATA uninstall-dist_amavisdusDATA \
-+	uninstall-dist_kolabconfigDATA uninstall-dist_ldapschemaDATA \
-+	uninstall-kolabSCRIPTS uninstall-kolabbinDATA \
-+	uninstall-kolabdocDATA uninstall-kolabnamespaceDATA \
-+	uninstall-kolabrcDATA uninstall-kolabsbinDATA \
-+	uninstall-kolabspecialDATA uninstall-kolabtemplateDATA
-+
-+
-+ at distribution@
-+ at common@
-+
-+# Work around to autoconf's deficiencies
-+distclean-local:
-+	rm -rf $(srcdir)/autom4te*.cache
-+
-+kolab: kolab.in
-+	@$(mkinstalldirs) .
-+	$(do_subst) <$(srcdir)/kolab.in >$@
-+	chmod a+x kolab
-+
-+kolab.globals: kolab.globals.in
-+	@$(mkinstalldirs) .
-+	$(do_subst) <$(srcdir)/kolab.globals.in >$@
-+
-+kolab_ca.sh: kolab_ca.sh.in
-+	@$(mkinstalldirs) .
-+	 $(do_subst) <$(srcdir)/kolab_ca.sh.in >$@
-+	 chmod a+x kolab_ca.sh
-+
-+kolab_bootstrap: kolab_bootstrap.in
-+	@$(mkinstalldirs) .
-+	$(do_subst) <$(srcdir)/kolab_bootstrap.in >$@
-+	chmod a+x kolab_bootstrap
-+
-+kolab_sslcert.sh: kolab_sslcert.sh.in
-+	@$(mkinstalldirs) .
-+	$(do_subst) <$(srcdir)/kolab_sslcert.sh.in >$@
-+	chmod a+x kolab_sslcert.sh
-+
-+kolabcheckperm: kolabcheckperm.in
-+	@$(mkinstalldirs) .
-+	$(do_subst) <$(srcdir)/kolabcheckperm.in >$@
-+
-+kolabd: kolabd.in
-+	@$(mkinstalldirs) .
-+	 $(do_subst) <$(srcdir)/kolabd.in >$@
-+	 chmod a+x kolabd
-+
-+kolabpasswd: kolabpasswd.in
-+	@$(mkinstalldirs) .
-+	 $(do_subst) <$(srcdir)/kolabpasswd.in >$@
-+	 chmod a+x kolabpasswd
-+
-+kolabquotawarn: kolabquotawarn.in
-+	@$(mkinstalldirs) .
-+	 $(do_subst) <$(srcdir)/kolabquotawarn.in >$@
-+	 chmod a+x kolabquotawarn
-+
-+kolabquotareport: kolabquotareport.in
-+	@$(mkinstalldirs) .
-+	 $(do_subst) <$(srcdir)/kolabquotareport.in >$@
-+	 chmod a+x kolabquotareport
-+
-+kolabquotareport: kolabquotareport.in
-+	@$(mkinstalldirs) .
-+	 $(do_subst) <$(srcdir)/kolabquotareport.in >$@
-+	 chmod a+x kolabquotareport
-+
-+kolabdcachetool: kolabdcachetool.in
-+	@$(mkinstalldirs) .
-+	$(do_subst) <$(srcdir)/kolabdcachetool.in >$@
-+	chmod a+x kolabdcachetool
-+
-+namespace/libexec/adduser: namespace/libexec/adduser.in
-+	@$(mkinstalldirs) namespace/libexec
-+	 $(do_subst) <$(srcdir)/namespace/libexec/adduser.in >$@
-+	 chmod a+x namespace/libexec/adduser
-+
-+namespace/libexec/deluser: namespace/libexec/deluser.in
-+	@$(mkinstalldirs) namespace/libexec
-+	$(do_subst) <$(srcdir)/namespace/libexec/deluser.in >$@
-+	chmod a+x namespace/libexec/deluser
-+
-+namespace/libexec/listusers: namespace/libexec/listusers.in
-+	@$(mkinstalldirs) namespace/libexec
-+	$(do_subst) <$(srcdir)/namespace/libexec/listusers.in >$@
-+	chmod a+x namespace/libexec/listusers
-+
-+namespace/libexec/newconfig: namespace/libexec/newconfig.in
-+	@$(mkinstalldirs) namespace/libexec
-+	$(do_subst) <$(srcdir)/namespace/libexec/newconfig.in >$@
-+	chmod a+x namespace/libexec/newconfig
-+
-+namespace/libexec/services: namespace/libexec/services.in
-+	@$(mkinstalldirs) namespace/libexec
-+	$(do_subst) <$(srcdir)/namespace/libexec/services.in >$@
-+	chmod a+x namespace/libexec/services
-+
-+namespace/libexec/showlog: namespace/libexec/showlog.in
-+	@$(mkinstalldirs) namespace/libexec
-+	$(do_subst) <$(srcdir)/namespace/libexec/showlog.in >$@
-+	chmod a+x namespace/libexec/showlog
-+
-+namespace/libexec/showuser: namespace/libexec/showuser.in
-+	@$(mkinstalldirs) namespace/libexec
-+	$(do_subst) <$(srcdir)/namespace/libexec/showuser.in >$@
-+	chmod a+x namespace/libexec/showuser
-+
-+namespace/libexec/start: namespace/libexec/start.in
-+	@$(mkinstalldirs) namespace/libexec
-+	$(do_subst) <$(srcdir)/namespace/libexec/start.in >$@
-+	chmod a+x namespace/libexec/start
-+
-+namespace/libexec/stop: namespace/libexec/stop.in
-+	@$(mkinstalldirs) namespace/libexec
-+	$(do_subst) <$(srcdir)/namespace/libexec/stop.in >$@
-+	chmod a+x namespace/libexec/stop
-+
-+namespace/kolab: namespace/kolab.in
-+	@$(mkinstalldirs) namespace/
-+	$(do_subst) <$(srcdir)/namespace/kolab.in >$@
-+	chmod a+x namespace/kolab
-+
-+templates/access.template: templates/access.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/access.template.in >$@
-+
-+templates/canonical.template: templates/canonical.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/canonical.template.in >$@
-+
-+templates/clamd.conf.template: templates/clamd.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/clamd.conf.template.in >$@
-+
-+templates/cyrus.conf.template: templates/cyrus.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/cyrus.conf.template.in >$@
-+
-+templates/DB_CONFIG.slapd.template: templates/DB_CONFIG.slapd.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/DB_CONFIG.slapd.template.in >$@
-+
-+templates/fbview.conf.template: templates/fbview.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/fbview.conf.template.in >$@
-+
-+templates/freebusy.conf.template: templates/freebusy.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/freebusy.conf.template.in >$@
-+
-+templates/freshclam.conf.template: templates/freshclam.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/freshclam.conf.template.in >$@
-+
-+templates/httpd.conf.template: templates/httpd.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/httpd.conf.template.in >$@
-+
-+templates/httpd.local.template: templates/httpd.local.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/httpd.local.template.in >$@
-+
-+templates/imapd.annotation_definitions.template: templates/imapd.annotation_definitions.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/imapd.annotation_definitions.template.in >$@
-+
-+templates/imapd.conf.template: templates/imapd.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/imapd.conf.template.in >$@
-+
-+templates/imapd.group.template: templates/imapd.group.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/imapd.group.template.in >$@
-+
-+templates/kolab.conf.template: templates/kolab.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/kolab.conf.template.in >$@
-+
-+templates/ldap.conf.template: templates/ldap.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/ldap.conf.template.in >$@
-+
-+templates/ldapdistlist.cf.template: templates/ldapdistlist.cf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/ldapdistlist.cf.template.in >$@
-+
-+templates/ldaptransport.cf.template: templates/ldaptransport.cf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/ldaptransport.cf.template.in >$@
-+
-+templates/ldapvirtual.cf.template: templates/ldapvirtual.cf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/ldapvirtual.cf.template.in >$@
-+
-+templates/main.cf.template: templates/main.cf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/main.cf.template.in >$@
-+
-+templates/master.cf.template: templates/master.cf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/master.cf.template.in >$@
-+
-+templates/kolab_smtpdpolicy.conf.template: templates/kolab_smtpdpolicy.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/kolab_smtpdpolicy.conf.template.in >$@
-+
-+templates/php.ini.template: templates/php.ini.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/php.ini.template.in >$@
-+
-+templates/rc.conf.template: templates/rc.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/rc.conf.template.in >$@
-+
-+templates/relocated.template: templates/relocated.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/relocated.template.in >$@
-+
-+templates/resmgr.conf.template: templates/resmgr.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/resmgr.conf.template.in >$@
-+
-+templates/saslauthd.conf.template: templates/saslauthd.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/saslauthd.conf.template.in >$@
-+
-+templates/session_vars.php.template: templates/session_vars.php.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/session_vars.php.template.in >$@
-+
-+templates/slapd.access.template: templates/slapd.access.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/slapd.access.template.in >$@
-+
-+templates/slapd.conf.template: templates/slapd.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/slapd.conf.template.in >$@
-+
-+templates/slapd.replicas.template: templates/slapd.replicas.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/slapd.replicas.template.in >$@
-+
-+templates/smtpd.conf.template: templates/smtpd.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/smtpd.conf.template.in >$@
-+
-+templates/transport.template: templates/transport.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/transport.template.in >$@
-+
-+templates/virtual.template: templates/virtual.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/virtual.template.in >$@
-+
-+templates/amavisd.conf.template: templates/amavisd.conf.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/amavisd.conf.template.in >$@
-+
-+workaround.sh: workaround.sh.in
-+	@$(mkinstalldirs) .
-+	 $(do_subst) <$(srcdir)/workaround.sh.in >$@
-+	 chmod a+x workaround.sh
-+
-+kolab_upgrade: kolab_upgrade.in
-+	@$(mkinstalldirs) .
-+	$(do_subst) <$(srcdir)/kolab_upgrade.in >$@
-+	chmod a+x kolab_upgrade
-+
-+kolab_smtpdpolicy: kolab_smtpdpolicy.in
-+	@$(mkinstalldirs) .
-+	$(do_subst) <$(srcdir)/kolab_smtpdpolicy.in >$@
-+	chmod a+x kolab_smtpdpolicy
-+
-+doc/README.amavisd: doc/README.amavisd.in
-+	@$(mkinstalldirs) doc
-+	$(do_subst) <$(srcdir)/doc/README.amavisd.in >$@
-+
-+doc/README.webgui: doc/README.webgui.in
-+	@$(mkinstalldirs) doc
-+	$(do_subst) <$(srcdir)/doc/README.webgui.in >$@
-+
-+rc.kolabd: rc.kolabd.in
-+	@$(mkinstalldirs) .
-+	$(do_subst) <$(srcdir)/rc.kolabd.in >$@
-+
-+dist_conf/kolabsrv: dist_conf/kolabsrv.in
-+	@$(mkinstalldirs) .
-+	$(do_subst) <$(srcdir)/dist_conf/kolabsrv.in >$@
-+
-+install-data-hook:
-+	$(mkinstalldirs) -m 755 $(DESTDIR)
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_logdir)
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/cgi-bin
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/icons
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/freebusy
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_logdir)/php
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_sessions)
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_tmpdir)
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_statedir)
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
-+	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
-+	chmod 600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
-+	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
-+	chmod 744 $(DESTDIR)$(sbindir)/kolabd
-+	chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
-+	chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
-+ at OPENPKG_FALSE@	chmod 755 $(DESTDIR)$(sbindir)/kolabsrv
-+ at OPENPKG_TRUE@	chmod 755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_DATA)
-+ at OPENPKG_TRUE@	chmod 744 $(DESTDIR)$(bindir)/kolab
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/access.template.in kolabd-2.1.99+20080204.dfsg/templates/access.template.in
---- kolabd-2.1.99+20080204.dfsg~/templates/access.template.in	1970-01-01 01:00:00.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/templates/access.template.in	2008-03-15 19:57:26.000000000 +0100
-@@ -0,0 +1,13 @@
+diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/access.template.in kolabd-2.1.99+20080314.dfsg/templates/access.template.in
+--- kolabd-2.1.99+20080314.dfsg~/templates/access.template.in	1970-01-01 01:00:00.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/templates/access.template.in	2008-03-17 20:11:24.000000000 +0100
+@@ -0,0 +1,14 @@
 +KOLAB_META_START
 +TARGET=@emailserver_confdir@/access
 +PERMISSIONS=0640
 +OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
++RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/access
 +KOLAB_META_END
 +# (c) 2008 Mathieu Parent <math.parent at gmail.com>
 +# This program is Free Software under the GNU General Public License (>=v2).
@@ -1391,14 +154,15 @@
 +# manual additions are lost unless made to the template in the Kolab config
 +# directory
 +# The template is  @sysconfdir@/kolab/templates/access.template
-diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/canonical.template.in kolabd-2.1.99+20080204.dfsg/templates/canonical.template.in
---- kolabd-2.1.99+20080204.dfsg~/templates/canonical.template.in	1970-01-01 01:00:00.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/templates/canonical.template.in	2008-03-15 19:57:26.000000000 +0100
-@@ -0,0 +1,13 @@
+diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/canonical.template.in kolabd-2.1.99+20080314.dfsg/templates/canonical.template.in
+--- kolabd-2.1.99+20080314.dfsg~/templates/canonical.template.in	1970-01-01 01:00:00.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/templates/canonical.template.in	2008-03-17 20:11:43.000000000 +0100
+@@ -0,0 +1,14 @@
 +KOLAB_META_START
 +TARGET=@emailserver_confdir@/canonical
 +PERMISSIONS=0640
 +OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
++RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/canonical
 +KOLAB_META_END
 +# (c) 2008 Mathieu Parent <math.parent at gmail.com>
 +# This program is Free Software under the GNU General Public License (>=v2).
@@ -1408,14 +172,15 @@
 +# manual additions are lost unless made to the template in the Kolab config
 +# directory
 +# The template is  @sysconfdir@/kolab/templates/canonical.template
-diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/relocated.template.in kolabd-2.1.99+20080204.dfsg/templates/relocated.template.in
---- kolabd-2.1.99+20080204.dfsg~/templates/relocated.template.in	1970-01-01 01:00:00.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/templates/relocated.template.in	2008-03-15 19:57:26.000000000 +0100
-@@ -0,0 +1,13 @@
+diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/relocated.template.in kolabd-2.1.99+20080314.dfsg/templates/relocated.template.in
+--- kolabd-2.1.99+20080314.dfsg~/templates/relocated.template.in	1970-01-01 01:00:00.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/templates/relocated.template.in	2008-03-17 20:11:59.000000000 +0100
+@@ -0,0 +1,14 @@
 +KOLAB_META_START
 +TARGET=@emailserver_confdir@/relocated
 +PERMISSIONS=0640
 +OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
++RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/relocated
 +KOLAB_META_END
 +# (c) 2008 Mathieu Parent <math.parent at gmail.com>
 +# This program is Free Software under the GNU General Public License (>=v2).

Modified: kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch	2008-03-17 18:55:29 UTC (rev 770)
+++ kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch	2008-03-17 19:24:51 UTC (rev 771)
@@ -4,12 +4,12 @@
 ## DP: Use syslog
 
 @DPATCH@
-diff -Nwru kolabd-1.9.4dfsg/kolab.globals.in kolabd-1.9.4dfsg.patched/kolab.globals.in
---- kolabd-1.9.4dfsg/kolab.globals.in	2004-11-23 21:26:47.000000000 +0100
-+++ kolabd-1.9.4dfsg.patched/kolab.globals.in	2006-05-26 15:21:52.000000000 +0200
-@@ -10,3 +10,4 @@
+diff -urNad kolabd-2.1.99+20080314.dfsg~/kolab.globals.in kolabd-2.1.99+20080314.dfsg/kolab.globals.in
+--- kolabd-2.1.99+20080314.dfsg~/kolab.globals.in	2008-03-06 09:26:25.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/kolab.globals.in	2008-03-17 20:22:35.000000000 +0100
+@@ -48,4 +48,4 @@
+ bind_any : TRUE
  bind_addr : 0.0.0.0
  calendar_id : calendar
- syslog_facility : user
+-syslog_facility : user
 +syslog_facility : local5
-