-
Committer:
Bazaar Package Importer
-
Author(s):
Scott Kitterman
-
Date:
2008-06-11 21:07:08 UTC
-
mfrom:
(1.1.7 upstream)
-
Revision ID:
james.westby@ubuntu.com-20080611210708-spid89awy2rrjnzo
Tags: 1:2.6.0-1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
- Updated logcheck/ignore.d.server/amavisd-new (LP: #188754)
- Add libmail-dkim-perl (>= 0.31) to recommends for new DKIM based
whitelisting
- Added 81_fqdn-warning.dpatch so that correct config file path for
Debian/Ubuntu is displayed if it needs to be set manually
- Renumbered from 71 to put it after the new Debian patch
- Added patch description
- Add commented out $myhostname definition to debian/etc/conf.d05-node_id
so that it will be easier for people who don't know Perl syntax to set
- Updated debian/patches/40_fix_paths.dpatch to use the new path
(/var/lib) for amavis-release
- Remove amavisd-new-milter package for transition to Main
- Remove libmilter-dev from build-dep
- Comment out debian/rules related to amavisd-new-milter
- Change maintainer to Ubuntu Core Developers