[Merge] ~kick-d/ubuntu/+source/amavisd-new:master into ~ubuntu-server-dev/ubuntu/+source/amavisd-new:master

[Kick In]

The merge bug need to be changed for a newer one:
1357424

Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index 4efc46e..b8ea48d 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,23 @@
> +amavisd-new (1:2.10.1-1ubuntu1~ppa9) xenial; urgency=medium
> +
> +  * Merge from Debian stable, (LP: #1227195) remaining changes:

This is an ald merge request, 1357424 is a more recent one.

> +    + Add information in README.Debian about Ubuntu specific changes
> +    + Ubuntu configuration changes in 21-ubuntu_defaults
> +      - Reduce email responses for virus/blocked mail so as not to be a
> +        backscatter source by default
> +      - Enable DKIM checking by default
> +    + Include policy-bank of known good domains for DKIM whitelisting
> +      in 40-policy_banks
> +    + debian/control: drop altermime and ripole to Suggests after discussions
> +      with the server team. (LP: #992879)
> +    + amavisd-new-postfix configuration for anti-spam/virus
> +    + debian/rules: Add some comments about 22-amavisd-new-postfix file being forgotten 
> +      since 2.6.5-0ubuntu1. Decision has been made to keep this state, by commenting out,
> +      to avoid a different behavior which could disturb various configuration tools
> +      assumptions.
> +
> + -- Pierre-André MOREY <pierre-andre.morey at canonical.com>  Tue, 12 Jan 2016 15:40:02 +0100
> +
>  amavisd-new (1:2.10.1-1) unstable; urgency=medium
>  
>    * [486e81e] Update watchfile


-- 
https://code.launchpad.net/~kick-d/ubuntu/+source/amavisd-new/+git/amavisd-new/+merge/282326
Your team Ubuntu Server Developers is subscribed to branch ~ubuntu-server-dev/ubuntu/+source/amavisd-new:master.