[pkg-kolab] r996 - in kolabd/trunk: debian templates

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-11-12 22:15:33 +0000 (Wed, 12 Nov 2008)
New Revision: 996

Added:
   kolabd/trunk/templates/amavisd.conf.template.in
Removed:
   kolabd/trunk/templates/amavis-kolab.in
Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/rules
Log:
keep amavisd.conf.template.in in debian/rules


Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2008-11-12 22:08:11 UTC (rev 995)
+++ kolabd/trunk/debian/changelog	2008-11-12 22:15:33 UTC (rev 996)
@@ -1,12 +1,12 @@
 kolabd (2.2.0-20080709.dfsg-2) unstable; urgency=low
 
-  * amavis-new:
-    - add a template to redirect scanned messages to the postfix port 10026.
-      Default port make messages bounce when amavis is enabled 
-      (Closes: #499094).
+  * amavis-new (Closes: #499094):
+    - amavisd.conf.template to redirect scanned messages to the postfix port
+      10026. Default port make messages bounce when amavis is enabled.
+    - debian/rules to keep this template
   * refreshed patches 
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 12 Nov 2008 23:06:03 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Wed, 12 Nov 2008 23:13:08 +0100
 
 kolabd (2.2.0-20080709.dfsg-1) unstable; urgency=low
 

Modified: kolabd/trunk/debian/rules
===================================================================
--- kolabd/trunk/debian/rules	2008-11-12 22:08:11 UTC (rev 995)
+++ kolabd/trunk/debian/rules	2008-11-12 22:15:33 UTC (rev 996)
@@ -52,7 +52,7 @@
 
 	# Kolab bootstrapping templates
 	for i in templates/*.template ; do install -D -m 644 $$i debian/kolabd/etc/kolab/$$i ; done
-	rm $(addprefix debian/kolabd/etc/kolab/templates/,amavisd.* clamd.* cyrus.* freshclam.* httpd.* session_vars.* local.cf.template)
+	rm $(addprefix debian/kolabd/etc/kolab/templates/,clamd.* cyrus.* freshclam.* httpd.* session_vars.* local.cf.template)
 
 	# LDAP files
 	install -D -m 644 debian/rfc2739.schema debian/kolabd/etc/ldap/schema/rfc2739.schema

Deleted: kolabd/trunk/templates/amavis-kolab.in
===================================================================
--- kolabd/trunk/templates/amavis-kolab.in	2008-11-12 22:08:11 UTC (rev 995)
+++ kolabd/trunk/templates/amavis-kolab.in	2008-11-12 22:15:33 UTC (rev 996)
@@ -1,17 +0,0 @@
-KOLAB_META_START
-TARGET=/etc/amavis/conf.d/40-kolab
-PERMISSIONS=0640
-OWNERSHIP=@amavisd_usr@:@amavisd_grp@
-KOLAB_META_END
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
-
-use strict;
-
-##
-## Kolab
-##
-
-# reinjection path
-$notify_method  = 'smtp:[127.0.0.1]:10026'; # notifications about scanned messages
-$forward_method = $forward_method; # scanned messages

Copied: kolabd/trunk/templates/amavisd.conf.template.in (from rev 994, kolabd/trunk/templates/amavis-kolab.in)
===================================================================
--- kolabd/trunk/templates/amavisd.conf.template.in	                        (rev 0)
+++ kolabd/trunk/templates/amavisd.conf.template.in	2008-11-12 22:15:33 UTC (rev 996)
@@ -0,0 +1,17 @@
+KOLAB_META_START
+TARGET=/etc/amavis/conf.d/40-kolab
+PERMISSIONS=0640
+OWNERSHIP=@amavisd_usr@:@amavisd_grp@
+KOLAB_META_END
+# this file is automatically written by the Kolab config backend
+# manual additions are lost unless made to the template in the Kolab config directory
+
+use strict;
+
+##
+## Kolab
+##
+
+# reinjection path
+$notify_method  = 'smtp:[127.0.0.1]:10026'; # notifications about scanned messages
+$forward_method = $forward_method; # scanned messages


Property changes on: kolabd/trunk/templates/amavisd.conf.template.in
___________________________________________________________________
Name: svn:mergeinfo
   +