control: tags -1 patch pending NMU ongoing, since this is blocking gdbm transition
thanks G. On Tue, 02 Jan 2018 20:45:33 -0800 Steve Langasek <steve.langa...@canonical.com> wrote: > 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/changelog avahi-0.7/debian/changelog --- avahi-0.7/debian/changelog 2017-09-18 23:25:27.000000000 +0200 +++ avahi-0.7/debian/changelog 2018-02-02 15:51:42.000000000 +0100 @@ -1,3 +1,12 @@ +avahi (0.7-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * d/p/no-systemd-also.patch: + - cherry-pick Ubuntu build fix for new systemd (Closes: #880036) + Thanks Steve Langasek for the patch + + -- Gianfranco Costamagna <locutusofb...@debian.org> Fri, 02 Feb 2018 15:51:42 +0100 + avahi (0.7-3) unstable; urgency=medium * Brown paper bag release. 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 1970-01-01 01:00:00.000000000 +0100 +++ avahi-0.7/debian/patches/no-systemd-also.patch 2018-02-02 15:51:29.000000000 +0100 @@ -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 23:25:27.000000000 +0200 +++ avahi-0.7/debian/patches/series 2018-02-02 15:51:29.000000000 +0100 @@ -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
signature.asc
Description: OpenPGP digital signature
