lp:~ubuntu-branches/ubuntu/quantal/dnsmasq/quantal-201312110254

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/quantal/dnsmasq

Ubuntu branches: Pending requested 2013-12-11

Diff: 21993 lines (+6816/-3245) (has conflicts)

34 files modified

CHANGELOG (+110/-0)
VERSION (+4/-0)
contrib/wrt/dhcp_lease_time.1 (+0/-23)
contrib/wrt/dhcp_release.1 (+0/-35)
debian/changelog (+1030/-0)
debian/conffiles (+14/-5)
debian/control (+44/-0)
debian/init (+272/-0)
debian/rules (+200/-0)
debian/systemd.service (+34/-0)
man/dnsmasq.8 (+77/-32)
man/fr/dnsmasq.8 (+79/-33)
po/de.po (+573/-249)
po/es.po (+392/-319)
po/fi.po (+389/-323)
po/fr.po (+394/-321)
po/id.po (+400/-322)
po/it.po (+389/-323)
po/no.po (+392/-319)
po/pl.po (+459/-291)
po/pt_BR.po (+389/-323)
po/ro.po (+392/-319)
src/bpf.c (+3/-0)
src/cache.c (+25/-0)
src/dbus.c (+4/-0)
src/dhcp-common.c (+339/-0)
src/dnsmasq.c (+49/-0)
src/dnsmasq.h (+44/-8)
src/lease.c (+11/-0)
src/netlink.c (+19/-0)
src/network.c (+45/-0)
src/option.c (+143/-0)
src/radv.c (+86/-0)
src/tftp.c (+15/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

26. By Simon Kelley on 2012-03-06

 * New upstream.
 * Provide "dump-stats" initscript method. (closes: #654656)
 * Add (empty) build-indep and build-arch rules targets.
 * Bump standards-version to 3.9.3
 * Add port option to example dnsmasq.conf (closes: #668386)

25. By Simon Kelley on 2012-03-23

Fix DHCPv4 segfault. (closes: #665008)

24. By Simon Kelley on 2011-12-01

Supply /etc/insserv.conf.d/dnsmasq (closes: #650540)

23. By Simon Kelley on 2011-11-26

Stop daemon at runlevels 0, 1 and 6. (closes: #647726)

22. By Simon Kelley on 2011-10-19

Fix reported version number.

21. By Simon Kelley on 2011-09-15

 * Fix resolvconf script location. (closes: #641717)
 * Update systemd service file. (closes: #640095)

20. By Dave Walker on 2011-09-19

 * New binary package, dnsmasq-utils - cherry picked from Debian's
   2.58-1 package. Contains dhcp_release and dhcp_lease_time from
   contrib/wrt. (LP: #853255)
   - contrib/wrt/(dhcp_release.1,dhcp_lease_time.1): Included manpages
     from 2.58-1 package.

19. By Simon Kelley on 2011-02-18

 * New upstream.
 * Fix typos in example config file. (closes: #606615)
 * Bump standards-version to 3.9.1
 * Add noidn DEB_BUILD_OPTIONS flag.
 * Don't complain about extra command line arguments if
   they are empty, as this breaks libvirt. (closes: #613915)

18. By Simon Kelley on 2010-09-19

Fix crash on double free. (closes: #597205)

17. By Simon Kelley on 2010-06-06

 * New upstream.
 * Fix crash when /etc/ethers in use. (closes: #584754)