Package: avahi Followup-For: Bug #880036 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu bionic ubuntu-patch
Hello, I agree with the analysis given at <https://bugs.debian.org/878911#43>. The fix for this build failure is straightforward; just drop the Also= line, which is not needed and has wrong side-effects. The attached patch, which implements this, has been uploaded to Ubuntu. Please consider applying it to Debian as well. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru avahi-0.7/debian/patches/no-systemd-also.patch avahi-0.7/debian/patches/no-systemd-also.patch --- avahi-0.7/debian/patches/no-systemd-also.patch 1969-12-31 16:00:00.000000000 -0800 +++ avahi-0.7/debian/patches/no-systemd-also.patch 2018-01-02 17:27:56.000000000 -0800 @@ -0,0 +1,18 @@ +Description: Don't use 'Also=' in dnsconfd systemd unit + 'Also=avahi-daemon.socket' means that 'systemctl disable avahi-dnsconfd' + will also disable avahi-daemon.socket, which is definitely not what we + want, and it also causes debhelper to throw an error. Just drop this entry + from the configuration. +Author: Steve Langasek <steve.langa...@ubuntu.com> +Last-Modified: 2018-01-02 20:30:00 -0800 +Bug-Debian: https://bugs.debian.org/878911 + +Index: avahi-0.7-3ubuntu1/avahi-dnsconfd/avahi-dnsconfd.service.in +=================================================================== +--- avahi-0.7-3ubuntu1.orig/avahi-dnsconfd/avahi-dnsconfd.service.in ++++ avahi-0.7-3ubuntu1/avahi-dnsconfd/avahi-dnsconfd.service.in +@@ -26,4 +26,3 @@ + + [Install] + WantedBy=multi-user.target +-Also=avahi-daemon.socket diff -Nru avahi-0.7/debian/patches/series avahi-0.7/debian/patches/series --- avahi-0.7/debian/patches/series 2017-09-18 14:25:27.000000000 -0700 +++ avahi-0.7/debian/patches/series 2018-01-02 17:27:56.000000000 -0800 @@ -1,3 +1,4 @@ fix-manpage-install-conditions.patch man-add-missing-bshell.1-symlink.patch man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch +no-systemd-also.patch