diff -Nru /tmp/btW7ZAJ51M/avahi-0.6.20/debian/avahi-daemon.postinst /tmp/hi6O9ww6iG/avahi-0.6.20/debian/avahi-daemon.postinst --- /tmp/btW7ZAJ51M/avahi-0.6.20/debian/avahi-daemon.postinst 2008-01-17 09:18:13.000000000 +0100 +++ /tmp/hi6O9ww6iG/avahi-0.6.20/debian/avahi-daemon.postinst 2008-01-17 09:18:14.000000000 +0100 @@ -36,13 +36,13 @@ invoke-rc.d dbus force-reload || true fi - # Update the links to the init script to use the new sequence number - # 18 (to be started before CUPS) - if dpkg --compare-versions "$2" lt "0.6.20-2ubuntu3.1"; then + # Temporarily revert the avahi fix for LP #173470 by updating the links + # to the init script to use the old sequence number 24 + if dpkg --compare-versions "$2" eq "0.6.20-2ubuntu3.1"; then echo "Fixing up startup script priorities..." for l in 2 3 4 5; do - old=/etc/rc$l.d/S24avahi-daemon - new=/etc/rc$l.d/S18avahi-daemon + old=/etc/rc$l.d/S18avahi-daemon + new=/etc/rc$l.d/S24avahi-daemon if [ -e $old ] && ! [ -e $new ]; then mv $old $new fi diff -Nru /tmp/btW7ZAJ51M/avahi-0.6.20/debian/changelog /tmp/hi6O9ww6iG/avahi-0.6.20/debian/changelog --- /tmp/btW7ZAJ51M/avahi-0.6.20/debian/changelog 2008-01-17 09:18:13.000000000 +0100 +++ /tmp/hi6O9ww6iG/avahi-0.6.20/debian/changelog 2008-01-17 09:18:14.000000000 +0100 @@ -1,3 +1,11 @@ +avahi (0.6.20-2ubuntu3.2) gutsy-proposed; urgency=low + + * debian/rules, debian/avahi-daemon.postinst: Urgency fix temporarily reverting the + startup changes of the previous update that may prevent CUPS from starting on some + configurations (LP: #183652) + + -- Hugues Fournier Thu, 17 Jan 2008 09:06:30 +0100 + avahi (0.6.20-2ubuntu3.1) gutsy-proposed; urgency=low * debian/rules, debian/avahi-daemon.postinst: Start the avahi-daemon before diff -Nru /tmp/btW7ZAJ51M/avahi-0.6.20/debian/rules /tmp/hi6O9ww6iG/avahi-0.6.20/debian/rules --- /tmp/btW7ZAJ51M/avahi-0.6.20/debian/rules 2008-01-17 09:18:13.000000000 +0100 +++ /tmp/hi6O9ww6iG/avahi-0.6.20/debian/rules 2008-01-17 09:18:14.000000000 +0100 @@ -22,7 +22,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-stack-protector endif -DEB_DH_INSTALLINIT_ARGS := -- start 18 2 3 4 5 . stop 20 0 1 6 . +DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 20 0 1 6 . ifneq (linux,$(DEB_HOST_ARCH_OS)) DEB_CONFIGURE_EXTRA_FLAGS += --disable-autoipd