[Merge] lp:~ari-tczew/ubuntu/vivid/vsftpd/merge into lp:ubuntu/vsftpd

[Marc Deslauriers]

Review: Needs Fixing

Something is busted in this branch:

$ export QUILT_PATCHES=debian/patches/

$ quilt applied
0001-builddefs.patch
0002-config.patch
0003-db-doc.patch
0004-link-local.patch
0005-whitespaces.patch
0006-greedy.patch
0007-utf8.patch
0008-manpage.patch
0009-s390.patch
0010-remote-dos.patch
0011-alpha.patch
0012-buildflags.patch
0013-listen.patch
0014-ssl-cert.patch
0015-disable-clone-newpid.patch
ubuntu-disable-anonymous.patch
ubuntu-seccomp-gettimeofday.patch

$ quilt pop -a
Patch ubuntu-seccomp-gettimeofday.patch does not remove cleanly (refresh it or enforce with -f)

Please fix it, or simply provide a debdiff.

Thanks!

-- 
https://code.launchpad.net/~ari-tczew/ubuntu/vivid/vsftpd/merge/+merge/251536
Your team Ubuntu branches is subscribed to branch lp:ubuntu/vsftpd.