Control: tags 1054485 + patch Control: tags 1054485 + pending Dear maintainer,
I've prepared an NMU for postfix (versioned as 3.8.2-1.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Better, upload yourself in the meantime. Best, Chris
diff -Nru postfix-3.8.2/debian/changelog postfix-3.8.2/debian/changelog --- postfix-3.8.2/debian/changelog 2023-09-14 20:08:10.000000000 +0200 +++ postfix-3.8.2/debian/changelog 2023-12-19 01:24:10.000000000 +0100 @@ -1,3 +1,13 @@ +postfix (3.8.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + + [Helmut Grohne] + + * Install units using dh_installsystemd only. (Closes: #1054485) + + -- Chris Hofstaedtler <z...@debian.org> Tue, 19 Dec 2023 01:24:10 +0100 + postfix (3.8.2-1) unstable; urgency=medium [Scott Kitterman] diff -Nru postfix-3.8.2/debian/postfix.dirs postfix-3.8.2/debian/postfix.dirs --- postfix-3.8.2/debian/postfix.dirs 2023-09-14 19:53:19.000000000 +0200 +++ postfix-3.8.2/debian/postfix.dirs 2023-12-19 01:23:16.000000000 +0100 @@ -34,5 +34,4 @@ var/spool/postfix/usr/lib/sasl2 var/log var/lib/postfix -lib/systemd/system lib/systemd/system-generators diff -Nru postfix-3.8.2/debian/postfix.postfix-resolvconf.path postfix-3.8.2/debian/postfix.postfix-resolvconf.path --- postfix-3.8.2/debian/postfix.postfix-resolvconf.path 1970-01-01 01:00:00.000000000 +0100 +++ postfix-3.8.2/debian/postfix.postfix-resolvconf.path 2023-12-19 01:23:16.000000000 +0100 @@ -0,0 +1,11 @@ +[Unit] +Description=Watch for resolv.conf updates and restart postfix +ConditionPathExists=/etc/resolv.conf + +[Path] +PathChanged=/etc/resolv.conf +Unit=postfix-resolvconf.service + +[Install] +WantedBy=multi-user.target + diff -Nru postfix-3.8.2/debian/postfix.postfix-resolvconf.service postfix-3.8.2/debian/postfix.postfix-resolvconf.service --- postfix-3.8.2/debian/postfix.postfix-resolvconf.service 1970-01-01 01:00:00.000000000 +0100 +++ postfix-3.8.2/debian/postfix.postfix-resolvconf.service 2023-12-19 01:23:16.000000000 +0100 @@ -0,0 +1,9 @@ +[Unit] +Description=Copies updated resolv.conf to postfix chroot and restarts postfix. + +[Service] +Type=simple +ExecStart=/etc/resolvconf/update-libc.d/postfix + +[Install] +WantedBy=multi-user.target diff -Nru postfix-3.8.2/debian/postfix-resolvconf.path postfix-3.8.2/debian/postfix-resolvconf.path --- postfix-3.8.2/debian/postfix-resolvconf.path 2023-09-14 19:53:19.000000000 +0200 +++ postfix-3.8.2/debian/postfix-resolvconf.path 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -[Unit] -Description=Watch for resolv.conf updates and restart postfix -ConditionPathExists=/etc/resolv.conf - -[Path] -PathChanged=/etc/resolv.conf -Unit=postfix-resolvconf.service - -[Install] -WantedBy=multi-user.target - diff -Nru postfix-3.8.2/debian/postfix-resolvconf.service postfix-3.8.2/debian/postfix-resolvconf.service --- postfix-3.8.2/debian/postfix-resolvconf.service 2023-09-14 19:53:19.000000000 +0200 +++ postfix-3.8.2/debian/postfix-resolvconf.service 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -[Unit] -Description=Copies updated resolv.conf to postfix chroot and restarts postfix. - -[Service] -Type=simple -ExecStart=/etc/resolvconf/update-libc.d/postfix - -[Install] -WantedBy=multi-user.target diff -Nru postfix-3.8.2/debian/rules postfix-3.8.2/debian/rules --- postfix-3.8.2/debian/rules 2023-09-14 19:53:19.000000000 +0200 +++ postfix-3.8.2/debian/rules 2023-12-19 01:23:16.000000000 +0100 @@ -193,8 +193,6 @@ install debian/configure-instance.sh $(libdir) install debian/postfix-instance-generator ${base}/lib/systemd/system-generators/ - install -m 644 debian/postfix@.service ${base}/lib/systemd/system/ - install -m 644 debian/postfix-resolvconf.* ${base}/lib/systemd/system/ install debian/ip-up.d ${base}/etc/ppp/ip-up.d/postfix install debian/ip-down.d ${base}/etc/ppp/ip-down.d/postfix install debian/ip-up.d ${base}/etc/network/if-up.d/postfix @@ -209,8 +207,7 @@ fi override_dh_installsystemd: - dh_installsystemd -p postfix --no-enable --no-start postfix-resolvconf.path - dh_installsystemd -p postfix --no-enable --no-start postfix-resolvconf.service + dh_installsystemd -p postfix --no-enable --no-start --name postfix-resolvconf dh_installsystemd -p postfix --no-restart-after-upgrade postfix.service execute_before_dh_gencontrol: