Source: nullmailer
Version: 2.2+10~g7ed88a0-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

your package installs a systemd service unit, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].

Attached you will find a patch to let debhelper pick the correct
path. This immediately works for unstable and for bookworm.

This patch basically boils down to:

  mv debian/systemd/nullmailer.service debian
  sed -e '/.service/d' -i'' debian/nullmailer.install

Later during the trixie cycle I expect this bug class to raise in
priority.

If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge

diff -Nru nullmailer-2.2+10~g7ed88a0/debian/changelog nullmailer-2.2+10~g7ed88a0/debian/changelog
--- nullmailer-2.2+10~g7ed88a0/debian/changelog	2023-04-24 14:48:25.000000000 +0200
+++ nullmailer-2.2+10~g7ed88a0/debian/changelog	2023-12-09 17:07:40.000000000 +0100
@@ -1,3 +1,10 @@
+nullmailer (1:2.2+10~g7ed88a0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Let debhelper place the systemd unit (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Sat, 09 Dec 2023 17:07:40 +0100
+
 nullmailer (1:2.2+10~g7ed88a0-1) unstable; urgency=medium
 
   * Update to new upstream version 2.2+10~g7ed88a0.
diff -Nru nullmailer-2.2+10~g7ed88a0/debian/nullmailer.install nullmailer-2.2+10~g7ed88a0/debian/nullmailer.install
--- nullmailer-2.2+10~g7ed88a0/debian/nullmailer.install	2023-04-24 14:48:25.000000000 +0200
+++ nullmailer-2.2+10~g7ed88a0/debian/nullmailer.install	2023-12-09 17:03:17.000000000 +0100
@@ -1,2 +1 @@
-debian/systemd/nullmailer.service lib/systemd/system/
 debian/logcheck etc
diff -Nru nullmailer-2.2+10~g7ed88a0/debian/nullmailer.service nullmailer-2.2+10~g7ed88a0/debian/nullmailer.service
--- nullmailer-2.2+10~g7ed88a0/debian/nullmailer.service	1970-01-01 01:00:00.000000000 +0100
+++ nullmailer-2.2+10~g7ed88a0/debian/nullmailer.service	2023-04-24 14:48:25.000000000 +0200
@@ -0,0 +1,17 @@
+[Unit]
+Description=Nullmailer relay-only MTA
+After=network.target
+RequiresMountsFor=/var/spool/nullmailer
+ConditionPathExists=/var/spool/nullmailer/queue
+Documentation=man:nullmailer(7)
+
+[Service]
+WorkingDirectory=/var/spool/nullmailer
+ExecStart=/usr/sbin/nullmailer-send
+User=mail
+Group=mail
+Restart=always
+SyslogFacility=mail
+
+[Install]
+WantedBy=multi-user.target
diff -Nru nullmailer-2.2+10~g7ed88a0/debian/systemd/nullmailer.service nullmailer-2.2+10~g7ed88a0/debian/systemd/nullmailer.service
--- nullmailer-2.2+10~g7ed88a0/debian/systemd/nullmailer.service	2023-04-24 14:48:25.000000000 +0200
+++ nullmailer-2.2+10~g7ed88a0/debian/systemd/nullmailer.service	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-[Unit]
-Description=Nullmailer relay-only MTA
-After=network.target
-RequiresMountsFor=/var/spool/nullmailer
-ConditionPathExists=/var/spool/nullmailer/queue
-Documentation=man:nullmailer(7)
-
-[Service]
-WorkingDirectory=/var/spool/nullmailer
-ExecStart=/usr/sbin/nullmailer-send
-User=mail
-Group=mail
-Restart=always
-SyslogFacility=mail
-
-[Install]
-WantedBy=multi-user.target

Reply via email to