Package: dnsmasq Version: 2.89-1 Tags: patch User: helm...@debian.org Usertags: dep17m2
Hi, we want to finalize the /usr-merge transition by moving aliased files from / to /usr via DEP17. dnsmasq is involved, because it contains aliased systemd units. I'm attaching a patch, because dnsmasq cannot use dh-sequence-movetousr as it does not use debhelper. Note that this patch must not be uploaded to bookworm-backports or earlier. Helmut
diff -u dnsmasq-2.89/debian/changelog dnsmasq-2.89/debian/changelog --- dnsmasq-2.89/debian/changelog +++ dnsmasq-2.89/debian/changelog @@ -1,3 +1,10 @@ +dnsmasq (2.89-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Move systemd units to /usr for DEP17. (closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Fri, 09 Feb 2024 15:01:03 +0100 + dnsmasq (2.89-1) unstable; urgency=low * New upstream. diff -u dnsmasq-2.89/debian/rules dnsmasq-2.89/debian/rules --- dnsmasq-2.89/debian/rules +++ dnsmasq-2.89/debian/rules @@ -176,7 +176,7 @@ -d debian/trees/daemon/usr/share/dnsmasq \ -d debian/trees/daemon/usr/share/doc/dnsmasq \ -d debian/trees/daemon/etc/default \ - -d debian/trees/daemon/lib/systemd/system \ + -d debian/trees/daemon/usr/lib/systemd/system \ -d debian/trees/daemon/usr/lib/tmpfiles.d \ -d debian/trees/daemon/etc/insserv.conf.d install -m 644 debian/conffiles debian/trees/daemon/DEBIAN @@ -195,8 +195,8 @@ install -m 644 debian/default debian/trees/daemon/etc/default/dnsmasq install -m 644 dnsmasq.conf.example debian/trees/daemon/etc/dnsmasq.conf install -m 644 debian/readme.dnsmasq.d debian/trees/daemon/etc/dnsmasq.d/README - install -m 644 debian/systemd.service debian/trees/daemon/lib/systemd/system/dnsmasq.service - install -m 644 debian/systemd@.service debian/trees/daemon/lib/systemd/system/dnsmasq@.service + install -m 644 debian/systemd.service debian/trees/daemon/usr/lib/systemd/system/dnsmasq.service + install -m 644 debian/systemd@.service debian/trees/daemon/usr/lib/systemd/system/dnsmasq@.service install -m 644 debian/tmpfiles.conf debian/trees/daemon/usr/lib/tmpfiles.d/dnsmasq.conf install -m 644 debian/insserv debian/trees/daemon/etc/insserv.conf.d/dnsmasq install -m 644 debian/copyright debian/trees/daemon/usr/share/doc/dnsmasq/copyright