-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2010-06-22 23:12:15 UTC
-
mfrom:
(30.1.5 maverick)
-
Revision ID:
james.westby@ubuntu.com-20100622231215-y68w7lhrjt97qhuh
* Merge from Debian unstable, remaining changes:
- Suggest default-mta | mail-transport-agent, not
exim4 | mail-transport-agent.
- debian/init, debian/fetchmail.postinst: don't stop fetchmail in
runlevels [06], the default 'killall' handler should be sufficient
because fetchmail writes are properly completed before telling the
server it's ok to delete.
* Dropped changes:
- don't depend on sysv-rc (>= 2.86.ds1-14.1ubuntu2); the 'multiuser'
argument to update-rc.d is deprecated.
- 06_cert_0_byte.patch: included upstream.
- python2.6 compatibility: fix included in Debian.
* debian/rules, debian/fetchmailconf.install: fix up python2.6 compatibility
by accounting for site-packages vs. dist-packages across python versions.