[SVN] r458 - in /branches: dual-build/cyrus-imapd-2.2.13/debian/cyrus.conf idled/debian/cyrus.conf sarge-2.2.13/debian/cyrus.conf

[debian at incase.de]

Author: sven
Date: Tue May 16 23:20:38 2006
New Revision: 458

URL: https://mail.incase.de/viewcvs?rev=458&root=cyrus22&view=rev
Log:
merge r457 from trunk into all relevant branches

Modified:
    branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus.conf
    branches/idled/debian/cyrus.conf
    branches/sarge-2.2.13/debian/cyrus.conf

Modified: branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus.conf
URL: https://mail.incase.de/viewcvs/branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus.conf?rev=458&root=cyrus22&r1=457&r2=458&view=diff
==============================================================================
--- branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus.conf (original)
+++ branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus.conf Tue May 16 23:20:38 2006
@@ -18,7 +18,7 @@
 	#mupdatepush   cmd="/usr/sbin/ctl_mboxlist -m"
 
 	# this is recommended if using duplicate delivery suppression
-	delprune	cmd="/usr/sbin/ctl_deliver -E 3"
+	delprune	cmd="/usr/sbin/cyr_expire -E 3"
 	# this is recommended if caching TLS sessions
 	tlsprune	cmd="/usr/sbin/tls_prune"
 }

Modified: branches/idled/debian/cyrus.conf
URL: https://mail.incase.de/viewcvs/branches/idled/debian/cyrus.conf?rev=458&root=cyrus22&r1=457&r2=458&view=diff
==============================================================================
--- branches/idled/debian/cyrus.conf (original)
+++ branches/idled/debian/cyrus.conf Tue May 16 23:20:38 2006
@@ -18,7 +18,7 @@
 	#mupdatepush   cmd="/usr/sbin/ctl_mboxlist -m"
 
 	# this is recommended if using duplicate delivery suppression
-	delprune	cmd="/usr/sbin/ctl_deliver -E 3"
+	delprune	cmd="/usr/sbin/cyr_expire -E 3"
 	# this is recommended if caching TLS sessions
 	tlsprune	cmd="/usr/sbin/tls_prune"
 }

Modified: branches/sarge-2.2.13/debian/cyrus.conf
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/cyrus.conf?rev=458&root=cyrus22&r1=457&r2=458&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/cyrus.conf (original)
+++ branches/sarge-2.2.13/debian/cyrus.conf Tue May 16 23:20:38 2006
@@ -18,7 +18,7 @@
 	#mupdatepush   cmd="/usr/sbin/ctl_mboxlist -m"
 
 	# this is recommended if using duplicate delivery suppression
-	delprune	cmd="/usr/sbin/ctl_deliver -E 3"
+	delprune	cmd="/usr/sbin/cyr_expire -E 3"
 	# this is recommended if caching TLS sessions
 	tlsprune	cmd="/usr/sbin/tls_prune"
 }