-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2010-06-21 14:07:17 UTC
-
mfrom:
(2.3.10 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20100621140717-fnd7ghb4s1vholau
Tags: 2.3.0~pre2-3ubuntu1
* Merge from debian unstable:
- Use snakeoil SSL certificates and key.
- debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart
- Add apport hook: (LP: #513978):
- debian/vsftpd.apport: Added.
- debian/control: Build-depends on dh-apport.
- debian/rules: Add --with apport.
- Dropped:
+ debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8:
Use the debian version instead.
- Add debian/watch file