marcus: server/kolabd/kolabd ChangeLog, 1.95, 1.96 Makefile.am, 1.22, 1.23
cvs at kolab.org
cvs at kolab.org
Thu Jun 21 16:37:36 CEST 2007
Author: marcus
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv22073
Modified Files:
ChangeLog Makefile.am
Log Message:
fixed kolab/issue1805 (Uncleaned files in kolabd source package)
Added missing Makefile dependencies (pointed out by Peter Eisentraut)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- ChangeLog 11 May 2007 10:06:19 -0000 1.95
+++ ChangeLog 21 Jun 2007 14:37:34 -0000 1.96
@@ -1,3 +1,10 @@
+2007-06-21 Marcus Hüwe <suse-tux at gmx.de>
+
+ * Makefile.am:
+
+ fixed kolab/issue1805 (Uncleaned files in kolabd source package)
+ Added missing Makefile dependencies (pointed out by Peter Eisentraut)
+
2007-05-11 Gunnar Wrobel <p at rdus.de>
* templates/saslauthd.conf.template.in (ldap_bind_pw):
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile.am 7 May 2007 20:20:52 -0000 1.22
+++ Makefile.am 21 Jun 2007 14:37:34 -0000 1.23
@@ -91,8 +91,7 @@
kolabnamespacedir = $(libexecdir)/kolab
kolabnamespace_DATA = $(kolabnamespace_FILES)
-EXTRA_DIST += namespace/libexec/start
-EXTRA_DIST += namespace/libexec/stop
+
ldapschema_FILES = kolab2.schema \
horde.schema \
@@ -125,18 +124,21 @@
amavisddedir = $(amavisd_templatedir)/de
dist_amavisdde_DATA = $(amavisdde_FILES)
-kolabdoc_FILES = doc/README.amavisd \
- doc/README.ldapdelete \
+
+kolabdoc_FILES = doc/README.ldapdelete \
doc/README.outlook \
doc/README.sieve \
- doc/README.webgui \
ChangeLog \
COPYING \
NEWS \
AUTHORS
kolabdocdir = $(pkgdocdir)/@PACKAGE@
-dist_kolabdoc_DATA = $(kolabdoc_FILES)
+kolabdoc_DATA = $(kolabdoc_FILES) \
+ doc/README.amavisd \
+ doc/README.webgui
+EXTRA_DIST += $(kolabdoc_FILES)
+
if OPENPKG
kolabsbin_FILES = kolabd \
@@ -151,7 +153,6 @@
kolabsbindir = $(sbindir)/
kolabsbin_DATA = $(kolabsbin_FILES)
-EXTRA_DIST += kolabcheckperm
kolabbindir = $(bindir)
@@ -169,364 +170,364 @@
endif
-kolab:
+kolab: kolab.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab.in >$@
chmod a+x kolab
CLEANFILES += kolab
EXTRA_DIST += kolab.in
-kolab_ca.sh:
+kolab_ca.sh: kolab_ca.sh.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_ca.sh.in >$@
chmod a+x kolab_ca.sh
CLEANFILES += kolab_ca.sh
EXTRA_DIST += kolab_ca.sh.in
-kolab_bootstrap:
+kolab_bootstrap: kolab_bootstrap.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_bootstrap.in >$@
chmod a+x kolab_bootstrap
CLEANFILES += kolab_bootstrap
EXTRA_DIST += kolab_bootstrap.in
-kolab_sslcert.sh:
+kolab_sslcert.sh: kolab_sslcert.sh.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_sslcert.sh.in >$@
chmod a+x kolab_sslcert.sh
CLEANFILES += kolab_sslcert.sh
EXTRA_DIST += kolab_sslcert.sh.in
-kolabconf:
+kolabconf: kolabconf.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabconf.in >$@
chmod a+x kolabconf
CLEANFILES += kolabconf
EXTRA_DIST += kolabconf.in
-kolabcheckperm:
+kolabcheckperm: kolabcheckperm.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabcheckperm.in >$@
CLEANFILES += kolabcheckperm
EXTRA_DIST += kolabcheckperm.in
-kolabd:
+kolabd: kolabd.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabd.in >$@
chmod a+x kolabd
CLEANFILES += kolabd
EXTRA_DIST += kolabd.in
-kolabpasswd:
+kolabpasswd: kolabpasswd.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabpasswd.in >$@
chmod a+x kolabpasswd
CLEANFILES += kolabpasswd
EXTRA_DIST += kolabpasswd.in
-kolabquotawarn:
+kolabquotawarn: kolabquotawarn.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabquotawarn.in >$@
chmod a+x kolabquotawarn
CLEANFILES += kolabquotawarn
EXTRA_DIST += kolabquotawarn.in
-namespace/libexec/adduser:
+namespace/libexec/adduser: namespace/libexec/adduser.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/adduser.in >$@
chmod a+x namespace/libexec/adduser
CLEANFILES += namespace/libexec/adduser
EXTRA_DIST += namespace/libexec/adduser.in
-namespace/libexec/deluser:
+namespace/libexec/deluser: namespace/libexec/deluser.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/deluser.in >$@
chmod a+x namespace/libexec/deluser
CLEANFILES += namespace/libexec/deluser
EXTRA_DIST += namespace/libexec/deluser.in
-namespace/libexec/listusers:
+namespace/libexec/listusers: namespace/libexec/listusers.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/listusers.in >$@
chmod a+x namespace/libexec/listusers
CLEANFILES += namespace/libexec/listusers
EXTRA_DIST += namespace/libexec/listusers.in
-namespace/libexec/newconfig:
+namespace/libexec/newconfig: namespace/libexec/newconfig.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/newconfig.in >$@
chmod a+x namespace/libexec/newconfig
CLEANFILES += namespace/libexec/newconfig
EXTRA_DIST += namespace/libexec/newconfig.in
-namespace/libexec/services:
+namespace/libexec/services: namespace/libexec/services.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/services.in >$@
chmod a+x namespace/libexec/services
CLEANFILES += namespace/libexec/services
EXTRA_DIST += namespace/libexec/services.in
-namespace/libexec/showlog:
+namespace/libexec/showlog: namespace/libexec/showlog.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/showlog.in >$@
chmod a+x namespace/libexec/showlog
CLEANFILES += namespace/libexec/showlog
EXTRA_DIST += namespace/libexec/showlog.in
-namespace/libexec/showuser:
+namespace/libexec/showuser: namespace/libexec/showuser.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/showuser.in >$@
chmod a+x namespace/libexec/showuser
CLEANFILES += namespace/libexec/showuser
EXTRA_DIST += namespace/libexec/showuser.in
-namespace/libexec/start:
+namespace/libexec/start: namespace/libexec/start.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/start.in >$@
chmod a+x namespace/libexec/start
CLEANFILES += namespace/libexec/start
EXTRA_DIST += namespace/libexec/start.in
-namespace/libexec/stop:
+namespace/libexec/stop: namespace/libexec/stop.in
@$(mkinstalldirs) namespace/libexec
$(do_subst) <$(srcdir)/namespace/libexec/stop.in >$@
chmod a+x namespace/libexec/stop
CLEANFILES += namespace/libexec/stop
EXTRA_DIST += namespace/libexec/stop.in
-namespace/kolab:
+namespace/kolab: namespace/kolab.in
@$(mkinstalldirs) namespace/
$(do_subst) <$(srcdir)/namespace/kolab.in >$@
chmod a+x namespace/kolab
CLEANFILES += namespace/kolab
EXTRA_DIST += namespace/kolab.in
-templates/clamd.conf.template:
+templates/clamd.conf.template: templates/clamd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/clamd.conf.template.in >$@
CLEANFILES += templates/clamd.conf.template
EXTRA_DIST += templates/clamd.conf.template.in
-templates/cyrus.conf.template:
+templates/cyrus.conf.template: templates/cyrus.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/cyrus.conf.template.in >$@
CLEANFILES += templates/cyrus.conf.template
EXTRA_DIST += templates/cyrus.conf.template.in
-templates/DB_CONFIG.slapd.template:
+templates/DB_CONFIG.slapd.template: templates/DB_CONFIG.slapd.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/DB_CONFIG.slapd.template.in >$@
CLEANFILES += templates/DB_CONFIG.slapd.template
EXTRA_DIST += templates/DB_CONFIG.slapd.template.in
-templates/fbview.conf.template:
+templates/fbview.conf.template: templates/fbview.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/fbview.conf.template.in >$@
CLEANFILES += templates/fbview.conf.template
EXTRA_DIST += templates/fbview.conf.template.in
-templates/freebusy.conf.template:
+templates/freebusy.conf.template: templates/freebusy.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/freebusy.conf.template.in >$@
CLEANFILES += templates/freebusy.conf.template
EXTRA_DIST += templates/freebusy.conf.template.in
-templates/freshclam.conf.template:
+templates/freshclam.conf.template: templates/freshclam.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/freshclam.conf.template.in >$@
CLEANFILES += templates/freshclam.conf.template
EXTRA_DIST += templates/freshclam.conf.template.in
-templates/httpd.conf.template:
+templates/httpd.conf.template: templates/httpd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/httpd.conf.template.in >$@
CLEANFILES += templates/httpd.conf.template
EXTRA_DIST += templates/httpd.conf.template.in
-templates/httpd.local.template:
+templates/httpd.local.template: templates/httpd.local.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/httpd.local.template.in >$@
CLEANFILES += templates/httpd.local.template
EXTRA_DIST += templates/httpd.local.template.in
-templates/imapd.conf.template:
+templates/imapd.conf.template: templates/imapd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/imapd.conf.template.in >$@
CLEANFILES += templates/imapd.conf.template
EXTRA_DIST += templates/imapd.conf.template.in
-templates/imapd.group.template:
+templates/imapd.group.template: templates/imapd.group.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/imapd.group.template.in >$@
CLEANFILES += templates/imapd.group.template
EXTRA_DIST += templates/imapd.group.template.in
-templates/kolab.conf.template:
+templates/kolab.conf.template: templates/kolab.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/kolab.conf.template.in >$@
CLEANFILES += templates/kolab.conf.template
EXTRA_DIST += templates/kolab.conf.template.in
-templates/ldap.conf.template:
+templates/ldap.conf.template: templates/ldap.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/ldap.conf.template.in >$@
CLEANFILES += templates/ldap.conf.template
EXTRA_DIST += templates/ldap.conf.template.in
-templates/ldapdistlist.cf.template:
+templates/ldapdistlist.cf.template: templates/ldapdistlist.cf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/ldapdistlist.cf.template.in >$@
CLEANFILES += templates/ldapdistlist.cf.template
EXTRA_DIST += templates/ldapdistlist.cf.template.in
-templates/ldaptransport.cf.template:
+templates/ldaptransport.cf.template: templates/ldaptransport.cf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/ldaptransport.cf.template.in >$@
CLEANFILES += templates/ldaptransport.cf.template
EXTRA_DIST += templates/ldaptransport.cf.template.in
-templates/ldapvirtual.cf.template:
+templates/ldapvirtual.cf.template: templates/ldapvirtual.cf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/ldapvirtual.cf.template.in >$@
CLEANFILES += templates/ldapvirtual.cf.template
EXTRA_DIST += templates/ldapvirtual.cf.template.in
-templates/main.cf.template:
+templates/main.cf.template: templates/main.cf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/main.cf.template.in >$@
CLEANFILES += templates/main.cf.template
EXTRA_DIST += templates/main.cf.template.in
-templates/master.cf.template:
+templates/master.cf.template: templates/master.cf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/master.cf.template.in >$@
CLEANFILES += templates/master.cf.template
EXTRA_DIST += templates/master.cf.template.in
-templates/kolab_smtpdpolicy.conf.template:
+templates/kolab_smtpdpolicy.conf.template: templates/kolab_smtpdpolicy.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/kolab_smtpdpolicy.conf.template.in >$@
CLEANFILES += templates/kolab_smtpdpolicy.conf.template
EXTRA_DIST += templates/kolab_smtpdpolicy.conf.template.in
-templates/php.ini.template:
+templates/php.ini.template: templates/php.ini.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/php.ini.template.in >$@
CLEANFILES += templates/php.ini.template
EXTRA_DIST += templates/php.ini.template.in
-templates/proftpd.conf.template:
+templates/proftpd.conf.template: templates/proftpd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/proftpd.conf.template.in >$@
CLEANFILES += templates/proftpd.conf.template
EXTRA_DIST += templates/proftpd.conf.template.in
-templates/rc.conf.template:
+templates/rc.conf.template: templates/rc.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/rc.conf.template.in >$@
CLEANFILES += templates/rc.conf.template
EXTRA_DIST += templates/rc.conf.template.in
-templates/resmgr.conf.template:
+templates/resmgr.conf.template: templates/resmgr.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/resmgr.conf.template.in >$@
CLEANFILES += templates/resmgr.conf.template
EXTRA_DIST += templates/resmgr.conf.template.in
-templates/saslauthd.conf.template:
+templates/saslauthd.conf.template: templates/saslauthd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/saslauthd.conf.template.in >$@
CLEANFILES += templates/saslauthd.conf.template
EXTRA_DIST += templates/saslauthd.conf.template.in
-templates/session_vars.php.template:
+templates/session_vars.php.template: templates/session_vars.php.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/session_vars.php.template.in >$@
CLEANFILES += templates/session_vars.php.template
EXTRA_DIST += templates/session_vars.php.template.in
-templates/slapd.access.template:
+templates/slapd.access.template: templates/slapd.access.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/slapd.access.template.in >$@
CLEANFILES += templates/slapd.access.template
EXTRA_DIST += templates/slapd.access.template.in
-templates/slapd.conf.template:
+templates/slapd.conf.template: templates/slapd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/slapd.conf.template.in >$@
CLEANFILES += templates/slapd.conf.template
EXTRA_DIST += templates/slapd.conf.template.in
-templates/slapd.replicas.template:
+templates/slapd.replicas.template: templates/slapd.replicas.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/slapd.replicas.template.in >$@
CLEANFILES += templates/slapd.replicas.template
EXTRA_DIST += templates/slapd.replicas.template.in
-templates/smtpd.conf.template:
+templates/smtpd.conf.template: templates/smtpd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/smtpd.conf.template.in >$@
CLEANFILES += templates/smtpd.conf.template
EXTRA_DIST += templates/smtpd.conf.template.in
-templates/transport.template:
+templates/transport.template: templates/transport.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/transport.template.in >$@
CLEANFILES += templates/transport.template
EXTRA_DIST += templates/transport.template.in
-templates/virtual.template:
+templates/virtual.template: templates/virtual.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/virtual.template.in >$@
CLEANFILES += templates/virtual.template
EXTRA_DIST += templates/virtual.template.in
-templates/amavisd.conf.template:
+templates/amavisd.conf.template: templates/amavisd.conf.template.in
@$(mkinstalldirs) templates
$(do_subst) <$(srcdir)/templates/amavisd.conf.template.in >$@
CLEANFILES += templates/amavisd.conf.template
EXTRA_DIST += templates/amavisd.conf.template.in
-workaround.sh:
+workaround.sh: workaround.sh.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/workaround.sh.in >$@
chmod a+x workaround.sh
CLEANFILES += workaround.sh
EXTRA_DIST += workaround.sh.in
-kolab_upgrade:
+kolab_upgrade: kolab_upgrade.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_upgrade.in >$@
chmod a+x kolab_upgrade
CLEANFILES += kolab_upgrade
EXTRA_DIST += kolab_upgrade.in
-kolab_smtpdpolicy:
+kolab_smtpdpolicy: kolab_smtpdpolicy.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolab_smtpdpolicy.in >$@
chmod a+x kolab_smtpdpolicy
CLEANFILES += kolab_smtpdpolicy
EXTRA_DIST += kolab_smtpdpolicy.in
-doc/README.amavisd:
+doc/README.amavisd: doc/README.amavisd.in
@$(mkinstalldirs) doc
$(do_subst) <$(srcdir)/doc/README.amavisd.in >$@
CLEANFILES += doc/README.amavisd
EXTRA_DIST += doc/README.amavisd.in
-doc/README.webgui:
+doc/README.webgui: doc/README.webgui.in
@$(mkinstalldirs) doc
$(do_subst) <$(srcdir)/doc/README.webgui.in >$@
CLEANFILES += doc/README.webgui
EXTRA_DIST += doc/README.webgui.in
-rc.kolabd:
+rc.kolabd: rc.kolabd.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/rc.kolabd.in >$@
CLEANFILES += rc.kolabd
EXTRA_DIST += rc.kolabd.in
-dist_conf/kolabsrv:
+dist_conf/kolabsrv: dist_conf/kolabsrv.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/dist_conf/kolabsrv.in >$@
CLEANFILES += dist_conf/kolabsrv
More information about the commits
mailing list