diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2021-04-03 22:40:22 +0100 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2021-04-03 22:43:14 +0100 |
| commit | 7d3f3c998334f0ddba5197fa49f7649b502c1920 (patch) | |
| tree | 7ecc532d035faa2c35137c82eb461037c3c08fca | |
| parent | 1bdbea2461b522c680feb6516fc06615510ad4a0 (diff) | |
| download | dnsmasq-7d3f3c998334f0ddba5197fa49f7649b502c1920.tar.gz | |
Fold NMU into Debian packaging.
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/postinst | 2 | ||||
| -rw-r--r-- | debian/postrm | 2 | ||||
| -rw-r--r-- | debian/preinst | 5 |
4 files changed, 16 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 06d768c..2eacac1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,15 @@ dnsmasq (2.85-1) unstable; urgency=low * New upstream. * 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 diff --git a/debian/postinst b/debian/postinst index a987c43..8c93160 100644 --- a/debian/postinst +++ b/debian/postinst @@ -2,7 +2,7 @@ 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.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 ---------------------- # This will only remove masks created by d-s-h on package removal. diff --git a/debian/postrm b/debian/postrm index 65079a7..69d6de1 100644 --- a/debian/postrm +++ b/debian/postrm @@ -2,7 +2,7 @@ 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.81-1~ dnsmasq -- "$@" +dpkg-maintscript-helper symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.84-1.2~ dnsmasq -- "$@" if [ purge = "$1" ]; then update-rc.d dnsmasq remove >/dev/null diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..7493043 --- /dev/null +++ b/debian/preinst @@ -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 -- "$@" |