~ubuntu-branches/ubuntu/quantal/tftp-hpa/quantal

Viewing all changes in revision 31.

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-10-17 18:54:29 UTC
  • mfrom: (2.1.26 sid)
  • Revision ID: james.westby@ubuntu.com-20111017185429-afrs4ras4hkfg4wm
Tags: 5.1-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Set /var/lib/tftpboot by default instead of /srv/tftp.
  - Decrease priority of tftp path from high to low.
  - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509)
  - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected
    potential memory corruption (LP: #6913

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: