Fold NMU into Debian packaging.

This commit is contained in:
Simon Kelley
2021-04-03 22:40:22 +01:00
parent 1bdbea2461
commit 7d3f3c9983
4 changed files with 16 additions and 3 deletions

10
debian/changelog vendored
View File

@@ -3,7 +3,15 @@ dnsmasq (2.85-1) unstable; urgency=low
* New upstream. * New upstream.
* Includes fix to CVE-2021-3448. * Includes fix to CVE-2021-3448.
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 30 Mar 2021 21:40:23 +0100 -- Simon Kelley <simon@thekelleys.org.uk> Sat, 03 Apr 2021 22:17:23 +0100
dnsmasq (2.84-1.2) unstable; urgency=medium
* Non-maintainer upload.
* Bump old-version in dpkg-maintscript-helper dir_to_symlink calls to also
clean up after upgrades to an earlier version in testing.
-- Andreas Beckmann <anbe@debian.org> Thu, 01 Apr 2021 16:01:51 +0200
dnsmasq (2.84-1.1) unstable; urgency=medium dnsmasq (2.84-1.1) unstable; urgency=medium

2
debian/postinst vendored
View File

@@ -2,7 +2,7 @@
set -e set -e
# /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282) # /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282)
dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.81-1~ dnsmasq -- "$@" dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.84-1.2~ dnsmasq -- "$@"
# Code copied from dh_systemd_enable ---------------------- # Code copied from dh_systemd_enable ----------------------
# This will only remove masks created by d-s-h on package removal. # This will only remove masks created by d-s-h on package removal.

2
debian/postrm vendored
View File

@@ -2,7 +2,7 @@
set -e set -e
# /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282) # /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282)
dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.81-1~ dnsmasq -- "$@" dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.84-1.2~ dnsmasq -- "$@"
if [ purge = "$1" ]; then if [ purge = "$1" ]; then
update-rc.d dnsmasq remove >/dev/null update-rc.d dnsmasq remove >/dev/null

5
debian/preinst vendored Normal file
View File

@@ -0,0 +1,5 @@
#!/bin/sh
set -e
# /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282)
dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.84-1.2~ dnsmasq -- "$@"