Make it more clear that OPTIONS can only be set once in the

configuration file (Thanks to Matt Jamison) (closes: #695809).

diff --git a/debian/changelog b/debian/changelog
index 3b6e0eb21825db08d5f370749fbb76d9ef6d1a91..813435211381d47d085bfce434ccde79e4a828d8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spamass-milter (0.3.2-2) unstable; urgency=low
+
+  * Make it more clear that OPTIONS can only be set once in the
+    configuration file (Thanks to Matt Jamison) (closes: #695809).
+
+ -- Don Armstrong <don@donarmstrong.com>  Wed, 12 Dec 2012 17:05:17 -0800
+
 spamass-milter (0.3.2-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/spamass-milter.default b/debian/spamass-milter.default
index afb56f9bfd84c7f5efb1ca4234f7853b39e76da2..8922fb582b9d2738e2907ffdaadaa0cb558cc6e1 100644 (file)
--- a/debian/spamass-milter.default
+++ b/debian/spamass-milter.default
@@ -12,10 +12,10 @@
 OPTIONS="-u spamass-milter -i 127.0.0.1"
 
 # Reject emails with spamassassin scores > 15.
-#OPTIONS="-r 15"
+#OPTIONS="${OPTIONS} -r 15"
 
 # Do not modify Subject:, Content-Type: or body.
-#OPTIONS="-m"
+#OPTIONS="${OPTIONS} -m"
 
 ######################################
 # If /usr/sbin/postfix is executable, the following are set by