[pkg-kolab] r1225 - in kolabd/branches/2.2.1/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Sat Mar 7 15:36:24 UTC 2009
Author: mparent-guest
Date: 2009-03-07 15:36:24 +0000 (Sat, 07 Mar 2009)
New Revision: 1225
Removed:
kolabd/branches/2.2.1/debian/patches/92-resmgr-template.diff
kolabd/branches/2.2.1/debian/patches/93-freebusy-template.diff
kolabd/branches/2.2.1/debian/patches/98-freebusy-ldap.diff
kolabd/branches/2.2.1/debian/patches/99-issue3331.diff
Modified:
kolabd/branches/2.2.1/debian/changelog
kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff
kolabd/branches/2.2.1/debian/patches/series
Log:
* New rc release 2.2.1-rc-1 (2.2.1-20090304)
+ part of 10-dist_conf.diff integrated
- for graveyard path
- backups are now in /var/lib/kolab/backups instead of
/var/lib/backups/kolab (Closes: #510210)
- kolabfilter is now in /usr/bin/
+ 92-resmgr-template.diff integrated
+ 93-freebusy-template.diff integrated
+ 98-freebusy-ldap.diff integrated: freebusy.conf.template: ldap server can
be on another machine
* 10-dist_conf.diff is back (again):
- corrected shell syntax error in dist_conf/debian
- corrected sed regexp to allow comma in dist_conf/common
Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog 2009-03-07 00:05:18 UTC (rev 1224)
+++ kolabd/branches/2.2.1/debian/changelog 2009-03-07 15:36:24 UTC (rev 1225)
@@ -1,4 +1,4 @@
-kolabd (2.2.1-20080304-1) UNRELEASED; urgency=low
+kolabd (2.2.1-20090304-1) UNRELEASED; urgency=low
* New beta release 2.2.1-beta-1 (20081212)
+ Integrated patches (wow!):
@@ -18,12 +18,23 @@
+ debian/kolabd.lintian-overrides: removed, as kolab.conf is removed
+ replaces kolab-{freebusy,filter} by php-kolab-{freebusy,filter} in
depends
- * New rc release 2.2.1-rc-1 (2.2.1-20090304)
- * 90-slapd.template.diff:
+ * New rc release 2.2.1-rc-1 (2.2.1-20090304)
+ + part of 10-dist_conf.diff integrated
+ - for graveyard path
+ - backups are now in /var/lib/kolab/backups instead of
+ /var/lib/backups/kolab (Closes: #510210)
+ - kolabfilter is now in /usr/bin/
+ + 92-resmgr-template.diff integrated
+ + 93-freebusy-template.diff integrated
+ + 98-freebusy-ldap.diff integrated: freebusy.conf.template: ldap server can
+ be on another machine
+ * 10-dist_conf.diff is back (again):
+ - corrected shell syntax error in dist_conf/debian
+ - corrected sed regexp to allow comma in dist_conf/common
+ * 90-slapd.template.diff updated:
- load module syncprov
- don't install horde schema anymore as horde now use flat files for
preferences
- * 92-resmgr-template.diff: freebusy config name is now kolabfilter.conf
* debian/rules
- don't create manpage for undocumented (s)bin
* debian/control:
@@ -33,18 +44,10 @@
- prerm and postinst scripts
- freebusy cache directory
- conflicts/replaces kolab-freebusy and kolab-resource-handlers
- * 10-dist_conf.diff is back:
- - for graveyard path
- - backups are now in /var/lib/kolab/backups instead of
- /var/lib/backups/kolab (Closes: #510210)
- - kolabfilter is now in /usr/bin/
- * 98-freebusy-ldap.diff: freebusy.conf.template: ldap server can be on
- another machine
- * 99-issue3311.diff: port upstream patch
* debian/copyright: refers to versionned license version
* debian/uupdate-wrapper: updated to keep upsteam version
- -- Mathieu Parent <math.parent at gmail.com> Sat, 07 Mar 2009 00:54:49 +0100
+ -- Mathieu Parent <math.parent at gmail.com> Sat, 07 Mar 2009 16:29:32 +0100
kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
Modified: kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff 2009-03-07 00:05:18 UTC (rev 1224)
+++ kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff 2009-03-07 15:36:24 UTC (rev 1225)
@@ -8,33 +8,329 @@
===================================================================
--- a/dist_conf/debian
+++ b/dist_conf/debian
-@@ -143,22 +143,22 @@
- resmgr_conffile_usr=kolab
- resmgr_conffile_grp=root
- #resmgr_tmpdir=
--resmgr_scriptsdir=/usr/share/kolab/filter
-+resmgr_scriptsdir=${bindir}
- resmgr_usr=root
+@@ -153,7 +153,7 @@
resmgr_grp=www-data
--resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
-+resmgr_filterdir=${kolab_statedir}/resmgr/filter
+ resmgr_filterdir=${kolab_statedir}/resmgr/filter
+ resmgr_log_type=syslog
+-resmgr_log_name=cons, pid
++resmgr_log_name='cons,pid'
--fbview_logfile=${localstatedir}/resmgr/fbview.log
-+fbview_logfile=${localstatedir}/log/fbview.log
+ fbview_logfile=${localstatedir}/log/fbview.log
freebusy_logdir=${localstatedir}/log
- freebusy_confdir=${sysconfdir}/kolab/freebusy
--freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache
-+freebusy_cachedir=${kolab_statedir}/freebusy-cache
+@@ -162,7 +162,7 @@
freebusy_usr=root
freebusy_grp=www-data
+ freebusy_log_type=syslog
+-freebusy_log_name=cons, pid
++freebusy_log_name='cons,pid'
--graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
--graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
-+graveyard_uidcache=${kolab_statedir}/graveyard_uidcache.db
-+graveyard_tscache=${kolab_statedir}/graveyard_tscache.db
-
--backupdir=${localstatedir}/backups/kolab
-+backupdir=${kolab_statedir}/backups
-
- pki_grp=${kolab_rgrp}
-
+ graveyard_uidcache=${kolab_statedir}/graveyard_uidcache.db
+ graveyard_tscache=${kolab_statedir}/graveyard_tscache.db
+Index: b/dist_conf/common
+===================================================================
+--- a/dist_conf/common
++++ b/dist_conf/common
+@@ -1,152 +1,152 @@
+ do_subst = sed \
+- -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+- -e 's,[@]bindir[@],$(bindir),g' \
+- -e 's,[@]sbindir[@],$(sbindir),g' \
+- -e 's,[@]prefix[@],$(prefix),g' \
+- -e 's,[@]libdir[@],$(libdir),g' \
+- -e 's,[@]datadir[@],$(datadir),g' \
+- -e 's,[@]libexecdir[@],$(libexecdir),g' \
+- -e 's,[@]localstatedir[@],$(localstatedir),g' \
+- -e 's,[@]phpini_dir[@],$(phpini_dir),g' \
+- -e 's,[@]phplibdir[@],$(phplibdir),g' \
+- -e 's,[@]phplibdir2[@],$(phplibdir2),g' \
+- -e 's,[@]phppeardir[@],$(phppeardir),g' \
+- -e 's,[@]BASH[@],$(BASHELL),g' \
+- -e 's,[@]CHKCONFIG[@],$(CHKCONFIG),g' \
+- -e 's,[@]KOLABRC[@],$(KOLABRC),g' \
+- -e 's,[@]LDAPD[@],$(LDAPD),g' \
+- -e 's,[@]PERL[@],$(PERL),g' \
+- -e 's,[@]PHP[@],$(PHP),g' \
+- -e 's,[@]RPM[@],$(RPM),g' \
+- -e 's,[@]TAR[@],$(TAR),g' \
+- -e 's,[@]VERSION[@],$(VERSION),g' \
+- -e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
+- -e 's,[@]aliases_file[@],$(aliases_file),g' \
+- -e 's,[@]syslog_facility[@],$(syslog_facility),g' \
+- -e 's,[@]directory_mode[@],$(directory_mode),g' \
+- -e 's,[@]amavisd_conffile[@],$(amavisd_conffile),g' \
+- -e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
+- -e 's,[@]amavisd_home[@],$(amavisd_home),g' \
+- -e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
+- -e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
+- -e 's,[@]amavisd_templatedir[@],$(amavisd_templatedir),g' \
+- -e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
+- -e 's,[@]backupdir[@],$(backupdir),g' \
+- -e 's,[@]backupfiles[@],$(backupfiles),g' \
+- -e 's,[@]clamav_confdir[@],$(clamav_confdir),g' \
+- -e 's,[@]clamav_datadir[@],$(clamav_datadir),g' \
+- -e 's,[@]clamav_grp[@],$(clamav_grp),g' \
+- -e 's,[@]clamav_logdir[@],$(clamav_logdir),g' \
+- -e 's,[@]clamav_logfile[@],$(clamav_logfile),g' \
+- -e 's,[@]clamav_pidfile[@],$(clamav_pidfile),g' \
+- -e 's,[@]clamav_rusr[@],$(clamav_rusr),g' \
+- -e 's,[@]clamav_socket[@],$(clamav_socket),g' \
+- -e 's,[@]clamav_usr[@],$(clamav_usr),g' \
+- -e 's,[@]emailserver_confdir[@],$(emailserver_confdir),g' \
+- -e 's,[@]emailserver_default_privs[@],$(emailserver_default_privs),g' \
+- -e 's,[@]emailserver_grp[@],$(emailserver_grp),g' \
+- -e 's,[@]emailserver_localstatedir[@],$(emailserver_localstatedir),g' \
+- -e 's,[@]emailserver_logfile[@],$(emailserver_logfile),g' \
+- -e 's,[@]emailserver_mail_owner[@],$(emailserver_mail_owner),g' \
+- -e 's,[@]emailserver_master_usr[@],$(emailserver_master_usr),g' \
+- -e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
+- -e 's,[@]emailserver_setgid_grp[@],$(emailserver_setgid_grp),g' \
+- -e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
+- -e 's,[@]emailserver_tables_usr[@],$(emailserver_tables_usr),g' \
+- -e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
+- -e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
+- -e 's,[@]freebusy_confdir[@],$(freebusy_confdir),g' \
+- -e 's,[@]freebusy_cachedir[@],$(freebusy_cachedir),g' \
+- -e 's,[@]freebusy_grp[@],$(freebusy_grp),g' \
+- -e 's,[@]freebusy_logdir[@],$(freebusy_logdir),g' \
+- -e 's,[@]freebusy_usr[@],$(freebusy_usr),g' \
+- -e 's,[@]freebusy_log_type[@],$(freebusy_log_type),g' \
+- -e 's,[@]freebusy_log_name[@],$(freebusy_log_name),g' \
+- -e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
+- -e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
+- -e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
+- -e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \
+- -e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \
+- -e 's,[@]imap_confdir[@],$(imap_confdir),g' \
+- -e 's,[@]imap_confperm[@],$(imap_confperm),g' \
+- -e 's,[@]imap_grp[@],$(imap_grp),g' \
+- -e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \
+- -e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
+- -e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \
+- -e 's,[@]imap_notify_socket[@],$(imap_notify_socket),g' \
+- -e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
+- -e 's,[@]imap_spool[@],$(imap_spool),g' \
+- -e 's,[@]imap_statedir[@],$(imap_statedir),g' \
+- -e 's,[@]imap_usr[@],$(imap_usr),g' \
+- -e 's,[@]kolab_gid[@],$(kolab_gid),g' \
+- -e 's,[@]kolab_grp[@],$(kolab_grp),g' \
+- -e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
+- -e 's,[@]kolab_mgrp[@],$(kolab_mgrp),g' \
+- -e 's,[@]kolab_musr[@],$(kolab_musr),g' \
+- -e 's,[@]kolab_php_module_prefix[@],$(kolab_php_module_prefix),g' \
+- -e 's,[@]kolab_php_smarty_prefix[@],$(kolab_php_smarty_prefix),g' \
+- -e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
+- -e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
+- -e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
+- -e 's,[@]kolab_pkgs[@],$(kolab_pkgs),g' \
+- -e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
+- -e 's,[@]kolab_scriptsdir[@],$(kolab_scriptsdir),g' \
+- -e 's,[@]kolab_statedir[@],$(kolab_statedir),g' \
+- -e 's,[@]kolab_smtpdpolicy_conffile_grp[@],$(kolab_smtpdpolicy_conffile_grp),g' \
+- -e 's,[@]kolab_smtpdpolicy_conffile_usr[@],$(kolab_smtpdpolicy_conffile_usr),g' \
+- -e 's,[@]kolab_susr[@],$(kolab_susr),g' \
+- -e 's,[@]kolab_usr[@],$(kolab_usr),g' \
+- -e 's,[@]kolab_wui[@],$(kolab_wui),g' \
+- -e 's,[@]kolab_quotawarning[@],$(kolab_quotawarning),g' \
+- -e 's,[@]kolabconf_script[@],$(kolabconf_script),g' \
+- -e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
+- -e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
+- -e 's,[@]ldapserver_dir[@],$(ldapserver_dir),g' \
+- -e 's,[@]ldapserver_grp[@],$(ldapserver_grp),g' \
+- -e 's,[@]ldapserver_logfile[@],$(ldapserver_logfile),g' \
+- -e 's,[@]ldapserver_pidfile[@],$(ldapserver_pidfile),g' \
+- -e 's,[@]ldapserver_replogfile[@],$(ldapserver_replogfile),g' \
+- -e 's,[@]ldapserver_rgrp[@],$(ldapserver_rgrp),g' \
+- -e 's,[@]ldapserver_rusr[@],$(ldapserver_rusr),g' \
+- -e 's,[@]ldapserver_schemadir[@],$(ldapserver_schemadir),g' \
+- -e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
+- -e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \
+- -e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
+- -e 's,[@]pear_horde_pkgs[@],$(pear_horde_pkgs),g' \
+- -e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
+- -e 's,[@]pki_grp[@],$(pki_grp),g' \
+- -e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
+- -e 's,[@]resmgr_conffile_grp[@],$(resmgr_conffile_grp),g' \
+- -e 's,[@]resmgr_conffile_usr[@],$(resmgr_conffile_usr),g' \
+- -e 's,[@]resmgr_tmpdir[@],$(resmgr_tmpdir),g' \
+- -e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
+- -e 's,[@]resmgr_logdir[@],$(resmgr_logdir),g' \
+- -e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
+- -e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
+- -e 's,[@]resmgr_log_type[@],$(resmgr_log_type),g' \
+- -e 's,[@]resmgr_log_name[@],$(resmgr_log_name),g' \
+- -e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
+- -e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
+- -e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \
+- -e 's,[@]smarty_compiledir[@],$(smarty_compiledir),g' \
+- -e 's,[@]spamassassin_confdir[@],$(spamassassin_confdir),g' \
+- -e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \
+- -e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
+- -e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \
+- -e 's,[@]webserver_confdir[@],$(webserver_confdir),g' \
+- -e 's,[@]webserver_document_root[@],$(webserver_document_root),g' \
+- -e 's,[@]webserver_logdir[@],$(webserver_logdir),g' \
+- -e 's,[@]webserver_errorlogfile[@],$(webserver_errorlogfile),g' \
+- -e 's,[@]webserver_grp[@],$(webserver_grp),g' \
+- -e 's,[@]webserver_musr[@],$(webserver_musr),g' \
+- -e 's,[@]webserver_pidfile[@],$(webserver_pidfile),g' \
+- -e 's,[@]webserver_runtime_status[@],$(webserver_runtime_status),g' \
+- -e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
+- -e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \
+- -e 's,[@]webserver_sslscache[@],$(webserver_sslscache),g' \
+- -e 's,[@]webserver_tmpdir[@],$(webserver_tmpdir),g' \
+- -e 's,[@]webserver_usr[@],$(webserver_usr),g' \
+- -e 's,[@]webserver_web_prefix[@],$(webserver_web_prefix),g' \
+- -e 's,[@]horde_cookie_path[@],$(horde_cookie_path),g' \
+- -e 's,[@]horde_confdir[@],$(horde_confdir),g' \
+- -e 's,[@]kronolith_confdir[@],$(kronolith_confdir),g'
++ -e 's=[@]sysconfdir[@]=$(sysconfdir)=g' \
++ -e 's=[@]bindir[@]=$(bindir)=g' \
++ -e 's=[@]sbindir[@]=$(sbindir)=g' \
++ -e 's=[@]prefix[@]=$(prefix)=g' \
++ -e 's=[@]libdir[@]=$(libdir)=g' \
++ -e 's=[@]datadir[@]=$(datadir)=g' \
++ -e 's=[@]libexecdir[@]=$(libexecdir)=g' \
++ -e 's=[@]localstatedir[@]=$(localstatedir)=g' \
++ -e 's=[@]phpini_dir[@]=$(phpini_dir)=g' \
++ -e 's=[@]phplibdir[@]=$(phplibdir)=g' \
++ -e 's=[@]phplibdir2[@]=$(phplibdir2)=g' \
++ -e 's=[@]phppeardir[@]=$(phppeardir)=g' \
++ -e 's=[@]BASH[@]=$(BASHELL)=g' \
++ -e 's=[@]CHKCONFIG[@]=$(CHKCONFIG)=g' \
++ -e 's=[@]KOLABRC[@]=$(KOLABRC)=g' \
++ -e 's=[@]LDAPD[@]=$(LDAPD)=g' \
++ -e 's=[@]PERL[@]=$(PERL)=g' \
++ -e 's=[@]PHP[@]=$(PHP)=g' \
++ -e 's=[@]RPM[@]=$(RPM)=g' \
++ -e 's=[@]TAR[@]=$(TAR)=g' \
++ -e 's=[@]VERSION[@]=$(VERSION)=g' \
++ -e 's=[@]WITHOPENPKG[@]=$(WITHOPENPKG)=g' \
++ -e 's=[@]aliases_file[@]=$(aliases_file)=g' \
++ -e 's=[@]syslog_facility[@]=$(syslog_facility)=g' \
++ -e 's=[@]directory_mode[@]=$(directory_mode)=g' \
++ -e 's=[@]amavisd_conffile[@]=$(amavisd_conffile)=g' \
++ -e 's=[@]amavisd_grp[@]=$(amavisd_grp)=g' \
++ -e 's=[@]amavisd_home[@]=$(amavisd_home)=g' \
++ -e 's=[@]amavisd_logfile[@]=$(amavisd_logfile)=g' \
++ -e 's=[@]amavisd_rusr[@]=$(amavisd_rusr)=g' \
++ -e 's=[@]amavisd_templatedir[@]=$(amavisd_templatedir)=g' \
++ -e 's=[@]amavisd_usr[@]=$(amavisd_usr)=g' \
++ -e 's=[@]backupdir[@]=$(backupdir)=g' \
++ -e 's=[@]backupfiles[@]=$(backupfiles)=g' \
++ -e 's=[@]clamav_confdir[@]=$(clamav_confdir)=g' \
++ -e 's=[@]clamav_datadir[@]=$(clamav_datadir)=g' \
++ -e 's=[@]clamav_grp[@]=$(clamav_grp)=g' \
++ -e 's=[@]clamav_logdir[@]=$(clamav_logdir)=g' \
++ -e 's=[@]clamav_logfile[@]=$(clamav_logfile)=g' \
++ -e 's=[@]clamav_pidfile[@]=$(clamav_pidfile)=g' \
++ -e 's=[@]clamav_rusr[@]=$(clamav_rusr)=g' \
++ -e 's=[@]clamav_socket[@]=$(clamav_socket)=g' \
++ -e 's=[@]clamav_usr[@]=$(clamav_usr)=g' \
++ -e 's=[@]emailserver_confdir[@]=$(emailserver_confdir)=g' \
++ -e 's=[@]emailserver_default_privs[@]=$(emailserver_default_privs)=g' \
++ -e 's=[@]emailserver_grp[@]=$(emailserver_grp)=g' \
++ -e 's=[@]emailserver_localstatedir[@]=$(emailserver_localstatedir)=g' \
++ -e 's=[@]emailserver_logfile[@]=$(emailserver_logfile)=g' \
++ -e 's=[@]emailserver_mail_owner[@]=$(emailserver_mail_owner)=g' \
++ -e 's=[@]emailserver_master_usr[@]=$(emailserver_master_usr)=g' \
++ -e 's=[@]emailserver_musr[@]=$(emailserver_musr)=g' \
++ -e 's=[@]emailserver_setgid_grp[@]=$(emailserver_setgid_grp)=g' \
++ -e 's=[@]emailserver_socket[@]=$(emailserver_socket)=g' \
++ -e 's=[@]emailserver_tables_usr[@]=$(emailserver_tables_usr)=g' \
++ -e 's=[@]emailserver_usr[@]=$(emailserver_usr)=g' \
++ -e 's=[@]fbview_logfile[@]=$(fbview_logfile)=g' \
++ -e 's=[@]freebusy_confdir[@]=$(freebusy_confdir)=g' \
++ -e 's=[@]freebusy_cachedir[@]=$(freebusy_cachedir)=g' \
++ -e 's=[@]freebusy_grp[@]=$(freebusy_grp)=g' \
++ -e 's=[@]freebusy_logdir[@]=$(freebusy_logdir)=g' \
++ -e 's=[@]freebusy_usr[@]=$(freebusy_usr)=g' \
++ -e 's=[@]freebusy_log_type[@]=$(freebusy_log_type)=g' \
++ -e 's=[@]freebusy_log_name[@]=$(freebusy_log_name)=g' \
++ -e 's=[@]freshclam_logfile[@]=$(freshclam_logfile)=g' \
++ -e 's=[@]freshclam_pidfile[@]=$(freshclam_pidfile)=g' \
++ -e 's=[@]fsl_logfile[@]=$(fsl_logfile)=g' \
++ -e 's=[@]graveyard_tscache[@]=$(graveyard_tscache)=g' \
++ -e 's=[@]graveyard_uidcache[@]=$(graveyard_uidcache)=g' \
++ -e 's=[@]imap_confdir[@]=$(imap_confdir)=g' \
++ -e 's=[@]imap_confperm[@]=$(imap_confperm)=g' \
++ -e 's=[@]imap_grp[@]=$(imap_grp)=g' \
++ -e 's=[@]imap_lmtp[@]=$(imap_lmtp)=g' \
++ -e 's=[@]imap_masterlogfile[@]=$(imap_masterlogfile)=g' \
++ -e 's=[@]imap_misclogfile[@]=$(imap_misclogfile)=g' \
++ -e 's=[@]imap_notify_socket[@]=$(imap_notify_socket)=g' \
++ -e 's=[@]imap_sievedir[@]=$(imap_sievedir)=g' \
++ -e 's=[@]imap_spool[@]=$(imap_spool)=g' \
++ -e 's=[@]imap_statedir[@]=$(imap_statedir)=g' \
++ -e 's=[@]imap_usr[@]=$(imap_usr)=g' \
++ -e 's=[@]kolab_gid[@]=$(kolab_gid)=g' \
++ -e 's=[@]kolab_grp[@]=$(kolab_grp)=g' \
++ -e 's=[@]kolab_mailboxuiddb[@]=$(kolab_mailboxuiddb)=g' \
++ -e 's=[@]kolab_mgrp[@]=$(kolab_mgrp)=g' \
++ -e 's=[@]kolab_musr[@]=$(kolab_musr)=g' \
++ -e 's=[@]kolab_php_module_prefix[@]=$(kolab_php_module_prefix)=g' \
++ -e 's=[@]kolab_php_smarty_prefix[@]=$(kolab_php_smarty_prefix)=g' \
++ -e 's=[@]kolab_pidfile[@]=$(kolab_pidfile)=g' \
++ -e 's=[@]kolab_rcdir[@]=$(kolab_rcdir)=g' \
++ -e 's=[@]kolab_rgrp[@]=$(kolab_rgrp)=g' \
++ -e 's=[@]kolab_pkgs[@]=$(kolab_pkgs)=g' \
++ -e 's=[@]kolab_rusr[@]=$(kolab_rusr)=g' \
++ -e 's=[@]kolab_scriptsdir[@]=$(kolab_scriptsdir)=g' \
++ -e 's=[@]kolab_statedir[@]=$(kolab_statedir)=g' \
++ -e 's=[@]kolab_smtpdpolicy_conffile_grp[@]=$(kolab_smtpdpolicy_conffile_grp)=g' \
++ -e 's=[@]kolab_smtpdpolicy_conffile_usr[@]=$(kolab_smtpdpolicy_conffile_usr)=g' \
++ -e 's=[@]kolab_susr[@]=$(kolab_susr)=g' \
++ -e 's=[@]kolab_usr[@]=$(kolab_usr)=g' \
++ -e 's=[@]kolab_wui[@]=$(kolab_wui)=g' \
++ -e 's=[@]kolab_quotawarning[@]=$(kolab_quotawarning)=g' \
++ -e 's=[@]kolabconf_script[@]=$(kolabconf_script)=g' \
++ -e 's=[@]ldapserver_argsfile[@]=$(ldapserver_argsfile)=g' \
++ -e 's=[@]ldapserver_confdir[@]=$(ldapserver_confdir)=g' \
++ -e 's=[@]ldapserver_dir[@]=$(ldapserver_dir)=g' \
++ -e 's=[@]ldapserver_grp[@]=$(ldapserver_grp)=g' \
++ -e 's=[@]ldapserver_logfile[@]=$(ldapserver_logfile)=g' \
++ -e 's=[@]ldapserver_pidfile[@]=$(ldapserver_pidfile)=g' \
++ -e 's=[@]ldapserver_replogfile[@]=$(ldapserver_replogfile)=g' \
++ -e 's=[@]ldapserver_rgrp[@]=$(ldapserver_rgrp)=g' \
++ -e 's=[@]ldapserver_rusr[@]=$(ldapserver_rusr)=g' \
++ -e 's=[@]ldapserver_schemadir[@]=$(ldapserver_schemadir)=g' \
++ -e 's=[@]ldapserverslurpd_pidfile[@]=$(ldapserverslurpd_pidfile)=g' \
++ -e 's=[@]ldapserver_statedir[@]=$(ldapserver_statedir)=g' \
++ -e 's=[@]ldapserver_usr[@]=$(ldapserver_usr)=g' \
++ -e 's=[@]pear_horde_pkgs[@]=$(pear_horde_pkgs)=g' \
++ -e 's=[@]pkgdocdir[@]=$(pkgdocdir)=g' \
++ -e 's=[@]pki_grp[@]=$(pki_grp)=g' \
++ -e 's=[@]resmgr_confdir[@]=$(resmgr_confdir)=g' \
++ -e 's=[@]resmgr_conffile_grp[@]=$(resmgr_conffile_grp)=g' \
++ -e 's=[@]resmgr_conffile_usr[@]=$(resmgr_conffile_usr)=g' \
++ -e 's=[@]resmgr_tmpdir[@]=$(resmgr_tmpdir)=g' \
++ -e 's=[@]resmgr_grp[@]=$(resmgr_grp)=g' \
++ -e 's=[@]resmgr_logdir[@]=$(resmgr_logdir)=g' \
++ -e 's=[@]resmgr_scriptsdir[@]=$(resmgr_scriptsdir)=g' \
++ -e 's=[@]resmgr_usr[@]=$(resmgr_usr)=g' \
++ -e 's=[@]resmgr_log_type[@]=$(resmgr_log_type)=g' \
++ -e 's=[@]resmgr_log_name[@]=$(resmgr_log_name)=g' \
++ -e 's=[@]sasl_authdconffile[@]=$(sasl_authdconffile)=g' \
++ -e 's=[@]sasl_logfile[@]=$(sasl_logfile)=g' \
++ -e 's=[@]sasl_smtpconffile[@]=$(sasl_smtpconffile)=g' \
++ -e 's=[@]smarty_compiledir[@]=$(smarty_compiledir)=g' \
++ -e 's=[@]spamassassin_confdir[@]=$(spamassassin_confdir)=g' \
++ -e 's=[@]webserver_acceptlock[@]=$(webserver_acceptlock)=g' \
++ -e 's=[@]webserver_accesslogfile[@]=$(webserver_accesslogfile)=g' \
++ -e 's=[@]webserver_cgidir[@]=$(webserver_cgidir)=g' \
++ -e 's=[@]webserver_confdir[@]=$(webserver_confdir)=g' \
++ -e 's=[@]webserver_document_root[@]=$(webserver_document_root)=g' \
++ -e 's=[@]webserver_logdir[@]=$(webserver_logdir)=g' \
++ -e 's=[@]webserver_errorlogfile[@]=$(webserver_errorlogfile)=g' \
++ -e 's=[@]webserver_grp[@]=$(webserver_grp)=g' \
++ -e 's=[@]webserver_musr[@]=$(webserver_musr)=g' \
++ -e 's=[@]webserver_pidfile[@]=$(webserver_pidfile)=g' \
++ -e 's=[@]webserver_runtime_status[@]=$(webserver_runtime_status)=g' \
++ -e 's=[@]webserver_sessions[@]=$(webserver_sessions)=g' \
++ -e 's=[@]webserver_sslmutex[@]=$(webserver_sslmutex)=g' \
++ -e 's=[@]webserver_sslscache[@]=$(webserver_sslscache)=g' \
++ -e 's=[@]webserver_tmpdir[@]=$(webserver_tmpdir)=g' \
++ -e 's=[@]webserver_usr[@]=$(webserver_usr)=g' \
++ -e 's=[@]webserver_web_prefix[@]=$(webserver_web_prefix)=g' \
++ -e 's=[@]horde_cookie_path[@]=$(horde_cookie_path)=g' \
++ -e 's=[@]horde_confdir[@]=$(horde_confdir)=g' \
++ -e 's=[@]kronolith_confdir[@]=$(kronolith_confdir)=g'
Deleted: kolabd/branches/2.2.1/debian/patches/92-resmgr-template.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/92-resmgr-template.diff 2009-03-07 00:05:18 UTC (rev 1224)
+++ kolabd/branches/2.2.1/debian/patches/92-resmgr-template.diff 2009-03-07 15:36:24 UTC (rev 1225)
@@ -1,21 +0,0 @@
-Goal: Adjustments in resmgr template
-
-Author: Peter Eisentraut <petere at debian.org>
-
-Upstream status: Specific to Debian
-
-Index: b/templates/resmgr.conf.template.in
-===================================================================
---- a/templates/resmgr.conf.template.in
-+++ b/templates/resmgr.conf.template.in
-@@ -166,8 +166,8 @@
- */
- $conf['log']['enabled'] = true;
- $conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
--$conf['log']['type'] = 'file';
--$conf['log']['name'] = '@resmgr_logdir@/filter.log';
-+$conf['log']['type'] = 'syslog';
-+$conf['log']['name'] = 'cons, pid';
- $conf['log']['ident'] = 'Kolab Filter';
- $conf['log']['params']['append'] = true;
-
Deleted: kolabd/branches/2.2.1/debian/patches/93-freebusy-template.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/93-freebusy-template.diff 2009-03-07 00:05:18 UTC (rev 1224)
+++ kolabd/branches/2.2.1/debian/patches/93-freebusy-template.diff 2009-03-07 15:36:24 UTC (rev 1225)
@@ -1,21 +0,0 @@
-Goal: Adjustments in freebusy template
-
-Author: Peter Eisentraut <petere at debian.org>
-
-Upstream status: Specific to Debian
-
-Index: b/templates/freebusy.conf.template.in
-===================================================================
---- a/templates/freebusy.conf.template.in
-+++ b/templates/freebusy.conf.template.in
-@@ -44,8 +44,8 @@
- /* Horde::Log configuration */
- $conf['log']['enabled'] = true;
- $conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
--$conf['log']['type'] = 'file';
--$conf['log']['name'] = '@freebusy_logdir@/freebusy.log';
-+$conf['log']['type'] = 'syslog';
-+$conf['log']['name'] = 'cons, pid';
- $conf['log']['ident'] = 'Kolab Free/Busy';
- $conf['log']['params']['append'] = true;
-
Deleted: kolabd/branches/2.2.1/debian/patches/98-freebusy-ldap.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/98-freebusy-ldap.diff 2009-03-07 00:05:18 UTC (rev 1224)
+++ kolabd/branches/2.2.1/debian/patches/98-freebusy-ldap.diff 2009-03-07 15:36:24 UTC (rev 1225)
@@ -1,19 +0,0 @@
-Goal: freebusy.conf.template: ldap server can be on another machine
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: https://www.intevation.de/roundup/kolab/issue3322
-
-Index: b/templates/freebusy.conf.template.in
-===================================================================
---- a/templates/freebusy.conf.template.in
-+++ b/templates/freebusy.conf.template.in
-@@ -53,7 +53,7 @@
- ini_set('error_log', '@freebusy_logdir@/php-error.log');
-
- /* Horde::Kolab::LDAP configuration */
--$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
-+$conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
- $conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
- $conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
- $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
Deleted: kolabd/branches/2.2.1/debian/patches/99-issue3331.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/99-issue3331.diff 2009-03-07 00:05:18 UTC (rev 1224)
+++ kolabd/branches/2.2.1/debian/patches/99-issue3331.diff 2009-03-07 15:36:24 UTC (rev 1225)
@@ -1,19 +0,0 @@
-Goal: https://www.intevation.de/roundup/kolab/issue3331
-
-Author: Gunnar Wrobel
-
-Upstream status: Already commited
-
-Index: b/templates/resmgr.conf.template.in
-===================================================================
---- a/templates/resmgr.conf.template.in
-+++ b/templates/resmgr.conf.template.in
-@@ -50,7 +50,7 @@
- @@@endif@@@
-
- /* Local delivery backend (default LMTP) */
--$conf['kolab']['filter']['delivery_backend'] = 'LMTP';
-+$conf['kolab']['filter']['delivery_backend'] = 'lmtp';
-
- /* LMTP settings (Cyrus IMAPd usually offers LMTP on port 2003) */
- $conf['kolab']['filter']['lmtp_host'] = '@@@local_addr@@@';
Modified: kolabd/branches/2.2.1/debian/patches/series
===================================================================
--- kolabd/branches/2.2.1/debian/patches/series 2009-03-07 00:05:18 UTC (rev 1224)
+++ kolabd/branches/2.2.1/debian/patches/series 2009-03-07 15:36:24 UTC (rev 1225)
@@ -3,7 +3,3 @@
70-kolab2.schema-removal.of.rfc2739.diff
90-slapd-template.diff
91-postfix-template.diff
-92-resmgr-template.diff
-93-freebusy-template.diff
-98-freebusy-ldap.diff
-99-issue3331.diff
More information about the pkg-kolab-devel
mailing list