Bug#742666: cups-daemon: No Upstart support

Hi Cameron, and thanks for your bugreport and patches, Le dimanche, 30 mars 2014, 04.49:27 Cameron Norman a écrit :

I have attached another revision.

Please coordinate this effort with the Ubuntu maintainers of CUPS and in particular those behind the effort to make CUPS socket-activated when run under upstart namely Till Kamppeter and Dimitri Ledkov (CC'ed). To make it clear: I'm interested in getting a full-blown Upstart integration in Debian's CUPS iff that reduces the Ubuntu patch and eases the shared maintenance over time, but I will not test it or take responsibility for it. My interest lies in reducing the overall maintenance work for all involved parties.

Now, some comments on your current patch:

diff -Nru cups-1.7.1/debian/changelog cups-1.7.1/debian/changelog --- cups-1.7.1/debian/changelog 2014-03-20 14:06:33.000000000 -0700 +++ cups-1.7.1/debian/changelog 2014-03-29 21:45:03.000000000 -0700 @@ -1,3 +1,10 @@ +cups (1.7.1-10.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Added Upstart support + + -- Cameron Norman <cameron@cameron-probook> Tue, 25 Mar 2014

Please use a full email address in changelog stanzas, although I would have used your @gmail.com address as patch author though..

cups-1.7.1/debian/cups-daemon.cups.upstart --- cups-1.7.1/debian/cups-daemon.cups.upstart 1969-12-31 16:00:00.000000000 -0800 +++ cups-1.7.1/debian/cups-daemon.cups.upstart 2014-03-29 21:45:03.000000000 -0700 @@ -0,0 +1,30 @@ + (...) +pre-start script + [ -x /usr/sbin/cupsd ] || { stop; exit 0; } + + # load modules for parallel port support + [ -r /etc/default/cups ] && . /etc/default/cups || true + if [ "$LOAD_LP_MODULE" = "yes" -a \ + -f /usr/lib/cups/backend/parallel -a \ + -f /proc/modules -a \ + -x /sbin/modprobe ]; then + modprobe -q -b lp || true + modprobe -q -b ppdev || true + modprobe -q -b parport_pc || true + fi

This code has moved away from src:cups to src:cups-filters in src:cups' 1.7.1-6 and must not be reintroduced in src:cups.

diff -Nru cups-1.7.1/debian/rules cups-1.7.1/debian/rules --- cups-1.7.1/debian/rules 2014-03-12 03:55:18.000000000 -0700 +++ cups-1.7.1/debian/rules 2014-03-29 21:45:03.000000000 -0700 @@ -71,8 +71,8 @@ override_dh_install: ifeq ($(derives_from_ubuntu),yes) - # Use upstart script on Ubuntu; we need to hide it away for Debian - # builds, as dh_installinit does not have a --sysvinit-only + # Delete Debian's Upstart jobs and copy Ubuntu's over + rm -f debian/*.upstart

Why is that change needed given the …

cp debian/local/*.upstart debian

… just after it?

- dh_installinit --name=cups + # avahi-reload-cups used by Upstart to avoid waiting for Avahi before starting + dh_installinit --name=cups --name=avahi-reload-cups

Are multiple --name allowed by dh_installinit?