debian/changelog cosmetic tweak.

.gitignore

@@ -7,8 +7,15 @@ src/.copts_*
 contrib/lease-tools/dhcp_lease_time
 contrib/lease-tools/dhcp_release
 contrib/lease-tools/dhcp_release6
+debian/.debhelper
+debian/auto-build
+debian/debhelper-build-stamp
 debian/files
-debian/substvars
+debian/*.substvars
-debian/utils-substvars
+debian/*.debhelper
-debian/trees/
+debian/*.log
-debian/build/
+debian/dnsmasq-base-lua/
+debian/dnsmasq-base/
+debian/dnsmasq-utils/
+debian/dnsmasq/
+debian/tmp

debian/changelog

@@ -1,22 +1,17 @@
-dnsmasq (2.90-1) unstable; urgency=low
+dnsmasq (2.90-1) experimental; urgency=medium
 
+  [ Simon Kelley ]
   * New upstream. (closes: #1033165)
-  * Bump LUA version to 5.4 (closes: #1050750)
+  [ Sven Geuer ]
-
+  * Introduce autokpgtests per d/tests/* (closes: #1034135).
- -- Simon Kelley <simon@thekelleys.org.uk>  Fri, 19 Jan 2024 22:35:01 +0000
+  * Switch to dpkg-source 3.0 (quilt) format (closes: #1007041).
-
-dnsmasq (2.89-1.1) UNRELEASED; urgency=medium
-
-  * Non-maintainer upload.
-  * Introduce autokpgtests per d/tests/* (Closes: #1034135).
-  * Switch to dpkg-source 3.0 (quilt) format (Closes: #1007041).
   * doc.html: Add patch to eliminate privacy breaches leaving the Donations
     paragraph as untouched as possible.
   * Prepend dnsmasq. to default, init, preinst, postinst, prerm, postrm.
   * Rename d/systemd.service to d/dnsmasq.service.
   * Rename d/systemd@.service to d/dnsmasq@.service.
   * Refactor d/rules to use the DH sequencer and fix major lintian issues
-    (Closes: #844989, #1040923).
+    (closes: #844989, #1040923).
     Modified files:
     - d/rules
         Complete rewrite making use of debhelper and its tools, fixes lintian
@@ -75,7 +70,7 @@ dnsmasq (2.89-1.1) UNRELEASED; urgency=medium
     Modified files:
     - d/control
     - d/dnsmasq.post{inst,rm}
-  * Refactor d/copyright to comply with DEP 5 (Closes: #966505).
+  * Refactor d/copyright to comply with DEP 5 (closes: #966505).
   * Remove trailing whitespace from various files under debian/.
   * Bump Standards-Version to 4.6.2.
   * Specify Rules-Requires-Root.
@@ -83,21 +78,18 @@ dnsmasq (2.89-1.1) UNRELEASED; urgency=medium
   * Introduce d/u/metadata.
   * Fix lintian issue duplicate-short-description.
   * Fix lintian issue capitalization-error-in-description.
-  * Bump Lua version to 5.4 (Closes: #1050750).
+  * Bump LUA version to 5.4 (closes: #1050750).
     Modified files:
     - d/control
     - d/t/functions.d/log.patterns
-    - d/p/series
-   New files:
-    - d/p/bump-lua-version.patch
 
- -- Sven Geuer <debmaint@g-e-u-e-r.de>  Fri, 12 Jan 2024 20:31:44 +0100
+ -- Simon Kelley <simon@thekelleys.org.uk>  Fri, 23 Jan 2024 22:52:01 +0000
 
 dnsmasq (2.89-1) unstable; urgency=low
 
    * New upstream.
 
- -- Simon Kelley <simon@thekelleys.org.uk>  Fri, 13 Jan 2023 21:57:01 +0000
+ -- Simon Kelley <simon@thekelleys.org.uk>  Tue, 13 Jan 2023 21:57:01 +0000
 
 dnsmasq (2.88-1) unstable; urgency=low
 

debian/copyright

@@ -14,7 +14,7 @@ Copyright: 2012-2024 Simon Kelley <simon@thekelleys.org.uk>
 Files: debian/*
 Copyright: 2004-2024 Simon Kelley <simon@thekelleys.org.uk>
            2012      Lars Bahner <bahner@debian.org>
-           2023      Sven Geuer <debmaint@g-e-u-e-r.de>
+           2024      Sven Geuer <debmaint@g-e-u-e-r.de>
 License: GPL-2 or GPL-3
 
 License: GPL-2

debian/dnsmasq.install

@@ -5,5 +5,4 @@ debian/init-system-common => /usr/share/dnsmasq/init-system-common
 debian/systemd-helper => /usr/share/dnsmasq/systemd-helper
 dnsmasq.conf.example => /etc/dnsmasq.conf
 debian/readme.dnsmasq.d => /etc/dnsmasq.d/README
-debian/tmpfiles.conf => /usr/lib/tmpfiles.d/dnsmasq.conf
 debian/insserv => /etc/insserv.conf.d/dnsmasq

man/dnsmasq.8

@@ -392,7 +392,7 @@ Remove records of the specified type(s) from answers.
 By default, dnsmasq caches A, AAAA, CNAME and SRV DNS record types.
 This option adds other record types to the cache. The RR-type can be given
 as a name such as TXT or MX or a decimal number. A single --cache-rr option
-can take a comma-separated list or RR-types and more than one --cache-rr option
+can take a comma-separated list of RR-types and more than one --cache-rr option
 is allowed. Use --cache-rr=ANY to enable caching for all RR-types.
 .TP
 .B \-r, --resolv-file=<file>