[pkg-kolab] r1038 - kolabd/branches/2.2.1/debian kolabd/branches/2.2.1/debian/patches libkolab-perl/branches/2.2.1/debian libkolab-perl/branches/2.2.1/debian/patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-16 17:27:49 +0000 (Tue, 16 Dec 2008)
New Revision: 1038

Added:
   libkolab-perl/branches/2.2.1/debian/patches/40-disable-amavis.diff
Removed:
   kolabd/branches/2.2.1/debian/patches/40-disable-amavis.diff
Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/patches/series
   libkolab-perl/branches/2.2.1/debian/changelog
   libkolab-perl/branches/2.2.1/debian/patches/series
Log:
moved 40-disable-amavis.diff from kolabd to libkolab-perl


Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2008-12-15 23:14:37 UTC (rev 1037)
+++ kolabd/branches/2.2.1/debian/changelog	2008-12-16 17:27:49 UTC (rev 1038)
@@ -9,8 +9,9 @@
     - 85-slapd-2.4-compat
     - 86-slapd-syncrepl-24
   * Moved patch: 30-bootstrap to libkolab-perl 
+  * Moved patch: 40-disable-amavis to libkolab-perl 
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 16 Dec 2008 00:10:45 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 16 Dec 2008 18:23:46 +0100
 
 kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
 

Deleted: kolabd/branches/2.2.1/debian/patches/40-disable-amavis.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/40-disable-amavis.diff	2008-12-15 23:14:37 UTC (rev 1037)
+++ kolabd/branches/2.2.1/debian/patches/40-disable-amavis.diff	2008-12-16 17:27:49 UTC (rev 1038)
@@ -1,19 +0,0 @@
-Goal: amavis is only suggested, so disable by default
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Specific to Debian
-
-Index: b/kolab_bootstrap.in
-===================================================================
---- a/kolab_bootstrap.in
-+++ b/kolab_bootstrap.in
-@@ -517,7 +517,7 @@
-         'postfix-mynetworks' => $mynetworkinterfaces,
-         #'postfix-relayhost' => "",
-         #'postfix-transport' => "",
--        'postfix-enable-virus-scan' => "TRUE",
-+        'postfix-enable-virus-scan' => "FALSE",
-         'cyrus-autocreatequota' => 100000,
-         'cyrus-quotawarn' => 80,
-         'cyrus-admins' => "manager",

Modified: kolabd/branches/2.2.1/debian/patches/series
===================================================================
--- kolabd/branches/2.2.1/debian/patches/series	2008-12-15 23:14:37 UTC (rev 1037)
+++ kolabd/branches/2.2.1/debian/patches/series	2008-12-16 17:27:49 UTC (rev 1038)
@@ -1,4 +1,3 @@
-40-disable-amavis.diff 
 55-no-distconf_kolabsrv.diff 
 70-kolab2.schema-removal.of.rfc2739.diff 
 90-slapd-template.diff 

Modified: libkolab-perl/branches/2.2.1/debian/changelog
===================================================================
--- libkolab-perl/branches/2.2.1/debian/changelog	2008-12-15 23:14:37 UTC (rev 1037)
+++ libkolab-perl/branches/2.2.1/debian/changelog	2008-12-16 17:27:49 UTC (rev 1038)
@@ -3,8 +3,9 @@
   * New beta release 2.2.1-beta-1
   * Integrated patch: 50-sync-ldap-backend
   * Moved patch: 30-bootstrap from kolabd
+  * Moved patch: 40-disable-amavis from kolabd
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 16 Dec 2008 00:11:24 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 16 Dec 2008 18:24:16 +0100
 
 libkolab-perl (1:2.2.0-4) UNRELEASED; urgency=low
 

Copied: libkolab-perl/branches/2.2.1/debian/patches/40-disable-amavis.diff (from rev 1037, kolabd/branches/2.2.1/debian/patches/40-disable-amavis.diff)
===================================================================
--- libkolab-perl/branches/2.2.1/debian/patches/40-disable-amavis.diff	                        (rev 0)
+++ libkolab-perl/branches/2.2.1/debian/patches/40-disable-amavis.diff	2008-12-16 17:27:49 UTC (rev 1038)
@@ -0,0 +1,19 @@
+Goal: amavis is only suggested, so disable by default
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Specific to Debian
+
+Index: b/kolab_bootstrap.in
+===================================================================
+--- a/kolab_bootstrap.in
++++ b/kolab_bootstrap.in
+@@ -517,7 +517,7 @@
+         'postfix-mynetworks' => $mynetworkinterfaces,
+         #'postfix-relayhost' => "",
+         #'postfix-transport' => "",
+-        'postfix-enable-virus-scan' => "TRUE",
++        'postfix-enable-virus-scan' => "FALSE",
+         'cyrus-autocreatequota' => 100000,
+         'cyrus-quotawarn' => 80,
+         'cyrus-admins' => "manager",

Modified: libkolab-perl/branches/2.2.1/debian/patches/series
===================================================================
--- libkolab-perl/branches/2.2.1/debian/patches/series	2008-12-15 23:14:37 UTC (rev 1037)
+++ libkolab-perl/branches/2.2.1/debian/patches/series	2008-12-16 17:27:49 UTC (rev 1038)
@@ -1,2 +1,3 @@
 30-bootstrap.diff 
+40-disable-amavis.diff