Branches for Vivid

Author: Steve Langasek
Revision Date: 2013-05-18 22:07:57 UTC

* Merge from Debian unstable, remaining changes:
  - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of
    /srv/tftp.
  - debian/tftpd-hpa.upstart: Convert to Upstart.
  - debian/patches/04-use-memcpy-for-header.patch: Fix FORTIFY-detected
    potential memory corruption.
  - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa
* Adjust tftpd-hpa init script to detect upstart, making the upstart
  patches upstreamable to Debian.