--- Begin Message ---
Package: cups-daemonVersion: 1.7.1-10
Attached is a debdiff that provides two Upstart jobs (one to start cups, another to reload it when avahi is started) and makes the necessary changes to the init script, rules file (the upstart jobs in debian/ were being deleted), as well as the control file (to bump the lsb dependency to a version with "init_is_upstart").
Thank you for considering the patch,
--
Cameron Norman
diff -Nru cups-1.7.1/debian/changelog cups-1.7.1/debian/changelog
--- cups-1.7.1/debian/changelog 2014-03-25 18:45:37.000000000 -0700
+++ cups-1.7.1/debian/changelog 2014-03-25 19:41:34.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 19:06:28 -0700
+
cups (1.7.1-10) unstable; urgency=medium
[ Till Kamppeter ]
diff -Nru cups-1.7.1/debian/control cups-1.7.1/debian/control
--- cups-1.7.1/debian/control 2014-03-25 18:45:37.000000000 -0700
+++ cups-1.7.1/debian/control 2014-03-25 19:41:34.000000000 -0700
@@ -203,7 +203,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
procps,
- lsb-base (>= 3),
+ lsb-base (>= 4.1+Debian3),
libcups2 (= ${binary:Version}),
ssl-cert (>= 1.0.11),
adduser,
diff -Nru cups-1.7.1/debian/cups-daemon.avahi-reload-cups.upstart cups-1.7.1/debian/cups-daemon.avahi-reload-cups.upstart
--- cups-1.7.1/debian/cups-daemon.avahi-reload-cups.upstart 1969-12-31 16:00:00.000000000 -0800
+++ cups-1.7.1/debian/cups-daemon.avahi-reload-cups.upstart 2014-03-25 19:41:34.000000000 -0700
@@ -0,0 +1,8 @@
+description "Reload CUPS to ensure remote queues are populated"
+author "Dimitri John Ledkov <dimitrijs.ledkovs@canonicol.com>"
+
+start on started avahi-daemon
+
+task
+
+exec reload cups
diff -Nru cups-1.7.1/debian/cups-daemon.cups.init cups-1.7.1/debian/cups-daemon.cups.init
--- cups-1.7.1/debian/cups-daemon.cups.init 2014-03-25 18:45:37.000000000 -0700
+++ cups-1.7.1/debian/cups-daemon.cups.init 2014-03-25 19:41:34.000000000 -0700
@@ -53,6 +53,17 @@
fi
}
+if init_is_upstart; then
+ case "$1" in
+ stop)
+ exit 0
+ ;;
+ *)
+ exit 1
+ ;;
+ esac
+fi
+
case "$1" in
start)
log_daemon_msg "Starting $DESC" "$NAME"
diff -Nru cups-1.7.1/debian/cups-daemon.cups.upstart 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-25 19:41:34.000000000 -0700
@@ -0,0 +1,19 @@
+description "CUPS - Common Unix Printing Service"
+
+start on remote-filesystems
+stop on runlevel [016]
+
+expect fork
+respawn
+
+pre-start script
+ [ -x cupsd ] || { stop; exit 0; }
+
+ mkdir -p /var/run/cups/certs
+
+ if [ -x /lib/init/apparmor-profile-load ]; then
+ /lib/init/apparmor-profile-load usr.sbin.cupsd
+ fi
+end script
+
+exec cupsd
diff -Nru cups-1.7.1/debian/rules cups-1.7.1/debian/rules
--- cups-1.7.1/debian/rules 2014-03-25 18:45:37.000000000 -0700
+++ cups-1.7.1/debian/rules 2014-03-25 19:41:34.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
cp debian/local/*.upstart debian
endif
dh_install
@@ -133,7 +133,8 @@
ifeq ($(derives_from_ubuntu),yes)
dh_installinit --name=cups --upstart-only
else
- 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
endif
override_dh_fixperms:
@@ -164,7 +165,6 @@
rm -f man/client.conf.man packaging/cups.list
rm -f conf/mime.convs conf/snmp.conf init/org.cups.cups-lpd.plist
[ ! -f Makedefs ] || make distclean
- rm -f debian/*.upstart # master copy is in debian/local
override_dh_installdocs:
dh_installdocs -plibcupsimage2-dev --link-doc=libcupsimage2
--- End Message ---
--- Begin Message ---
Source: cups
Source-Version: 1.7.2-2
We believe that the bug you reported is fixed in the latest version of
cups, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 742666@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Didier Raboud <odyx@debian.org> (supplier of updated cups package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Fri, 02 May 2014 15:54:20 +0200
Source: cups
Binary: libcups2 libcupsimage2 libcupscgi1 libcupsmime1 libcupsppdc1 cups cups-core-drivers cups-daemon cups-client libcups2-dev libcupsimage2-dev libcupscgi1-dev libcupsmime1-dev libcupsppdc1-dev cups-bsd cups-common cups-server-common cups-ppdc cups-dbg
Architecture: source amd64 all
Version: 1.7.2-2
Distribution: unstable
Urgency: low
Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
Changed-By: Didier Raboud <odyx@debian.org>
Description:
cups - Common UNIX Printing System(tm) - PPD/driver support, web interfa
cups-bsd - Common UNIX Printing System(tm) - BSD commands
cups-client - Common UNIX Printing System(tm) - client programs (SysV)
cups-common - Common UNIX Printing System(tm) - common files
cups-core-drivers - Common UNIX Printing System(tm) - PPD-less printing
cups-daemon - Common UNIX Printing System(tm) - daemon
cups-dbg - Common UNIX Printing System(tm) - debugging symbols
cups-ppdc - Common UNIX Printing System(tm) - PPD manipulation utilities
cups-server-common - Common UNIX Printing System(tm) - server common files
libcups2 - Common UNIX Printing System(tm) - Core library
libcups2-dev - Common UNIX Printing System(tm) - Development files CUPS library
libcupscgi1 - Common UNIX Printing System(tm) - CGI library
libcupscgi1-dev - Common UNIX Printing System(tm) - Development files for CGI libra
libcupsimage2 - Common UNIX Printing System(tm) - Raster image library
libcupsimage2-dev - Common UNIX Printing System(tm) - Development files CUPS image li
libcupsmime1 - Common UNIX Printing System(tm) - MIME library
libcupsmime1-dev - Common UNIX Printing System(tm) - Development files MIME library
libcupsppdc1 - Common UNIX Printing System(tm) - PPD manipulation library
libcupsppdc1-dev - Common UNIX Printing System(tm) - Development files PPD library
Closes: 742666
Changes:
cups (1.7.2-2) unstable; urgency=low
.
[ Helge Kreutzmann ]
* Update German man page (1526t)
.
[ Till Kamppeter ]
* Removed Ubuntu difference in the dependency of cups-deamon on avahi-daemon:
avahi-daemon is a Recommends for both now; remove "on started avahi-daemon"
from the "start on ..." rule in /etc/init/cups.conf upstart script
(LP: #1242185, #1178172)
* Add two patches for Upstart socket-triggered activation:
- allow starting cupsd socket-triggered through Upstart, for on-demand
starting to save resources (especially on mobile devices)
- let cupsd stop after 30 seconds idle time in when started by Upstart
socket-activation (if timeout is not explicitly set to another time)
(Closes: #742666, LP: #1276713)
Checksums-Sha1:
6a2a7163d44e944b1caaf290b84778f8fc777569 3527 cups_1.7.2-2.dsc
eec6e5deb7e46268d3e77b426810523026ffd960 293548 cups_1.7.2-2.debian.tar.xz
a01d1d0085b7d94f76ebb27880828afa4becb779 276438 libcups2_1.7.2-2_amd64.deb
33ee51a4fe555bdca54a6b9400487c0ac2f3c5ab 112638 libcupsimage2_1.7.2-2_amd64.deb
61b321107bb4fca2a843e476038188a517c54aa4 123930 libcupscgi1_1.7.2-2_amd64.deb
e0a0ee577186c4e8cda3915982b12fc51336d09d 109628 libcupsmime1_1.7.2-2_amd64.deb
e135c6a77f3dc220c6b240514a09f6e3ab777b82 141954 libcupsppdc1_1.7.2-2_amd64.deb
9c7ff671957234ca734bdfba2d5e8af7dc6a1b2d 284756 cups_1.7.2-2_amd64.deb
29bd422e44c121d2625aa9ea0ec4cc02ae863d47 122732 cups-core-drivers_1.7.2-2_amd64.deb
8c6d30a8c224332cdc42b33d25178aaf0772b737 364150 cups-daemon_1.7.2-2_amd64.deb
6d018a7d2122d824a1af11d828e5ef7d2a520ab7 292348 cups-client_1.7.2-2_amd64.deb
ead3731ec9dffa8f9aca94da53b42f49a4305c6e 313928 libcups2-dev_1.7.2-2_amd64.deb
73c577723918ac6894a963b9788c5be98bf29a7c 18052 libcupsimage2-dev_1.7.2-2_amd64.deb
e339b96fe88671d3ebe7242911c5602706c6ca08 126238 libcupscgi1-dev_1.7.2-2_amd64.deb
dc1de3dd5713bc3cc16b1b9e7f5f1b3d487c8423 110202 libcupsmime1-dev_1.7.2-2_amd64.deb
c66e0f3224056185305bdf753c52e4c3c56464c9 146572 libcupsppdc1-dev_1.7.2-2_amd64.deb
dc95f4dd51563f3835f403526f22ec7623a7d70d 35020 cups-bsd_1.7.2-2_amd64.deb
0782e2d557c78fc4066312c73578cd7042e8c60b 254834 cups-common_1.7.2-2_all.deb
66a641544d66abf7d9c69ae53db8340f1bb61c8c 606090 cups-server-common_1.7.2-2_all.deb
3dd59af948a0258da108b27f03572d7e3021c115 122770 cups-ppdc_1.7.2-2_amd64.deb
0434f946b68479e091e36cd174bf70ea53f60e7d 2123382 cups-dbg_1.7.2-2_amd64.deb
Checksums-Sha256:
c3554ca966aa744351afe62471b57aece12eccd08f7f121bff1da734d34d0acd 3527 cups_1.7.2-2.dsc
9af0b3958850809aa32b1ba2588e570979ed7145c6166f2bc062c14059dee50e 293548 cups_1.7.2-2.debian.tar.xz
4159f43b95fb995dc16206d729324af9ca739202aa06d7b772358f5bc645d775 276438 libcups2_1.7.2-2_amd64.deb
24d749efe043b8fd1ee2800b1b4e59271619af5a8ccefe3e80312a5115e04a0c 112638 libcupsimage2_1.7.2-2_amd64.deb
ec1adcc504d7b5650c7e0a765165a2c59c94446643f2c09c5692437ed1359f25 123930 libcupscgi1_1.7.2-2_amd64.deb
f7f153ba7ce712d731e9b567d5e1508690aabdcab7b926b1e1efe0a7d28d0b38 109628 libcupsmime1_1.7.2-2_amd64.deb
90bb188a66362f6572ba25ab33165b99b1c30e0c8aaf3b18f20f1077643fada8 141954 libcupsppdc1_1.7.2-2_amd64.deb
900eab1dc65c31c15ba557000fbcd0d150a2f24e52399784cbbe70fc4877324d 284756 cups_1.7.2-2_amd64.deb
8c52dcacc23393062f18713637a5dec6c67e575658eb3988d9df3ba88e62b312 122732 cups-core-drivers_1.7.2-2_amd64.deb
2c13bd60b6fc9d1cddd3b13706967876377a38c1a1e3b7a91227ffa9a7daac2a 364150 cups-daemon_1.7.2-2_amd64.deb
97e725d0916110ddf096e1ae410cb650f9ce6db02c3c98d67e55dc76bd5a5648 292348 cups-client_1.7.2-2_amd64.deb
bd8d8d8f121f9a05ceb3e4838bcb2cc8ba690479171cdccb9c99a55d04b30535 313928 libcups2-dev_1.7.2-2_amd64.deb
d6bb9b6d5d12764dd4df27f2b3823ef5242bad7daa33959b10fb6bc04dd97e34 18052 libcupsimage2-dev_1.7.2-2_amd64.deb
809beaa800da00e1444b281b6234b7732ce9b3f6fabfbc1a575cb8bf477a4132 126238 libcupscgi1-dev_1.7.2-2_amd64.deb
43604cddfcf03cc5b10741953164935ab0aafa2cc33e30fd61cbbae0d2837a9d 110202 libcupsmime1-dev_1.7.2-2_amd64.deb
a95352a3db4421ecae4db7021e6267661a84a9097575fe31a8bd46bfea015808 146572 libcupsppdc1-dev_1.7.2-2_amd64.deb
679e18b76284b9e285591c26ca17bbc19cb028b7701e2d13f22be6560e08e2ab 35020 cups-bsd_1.7.2-2_amd64.deb
0d1e65e7c711713fcbabdd4a1923de0bada7a2df334523cc0a354d817da8c897 254834 cups-common_1.7.2-2_all.deb
9c3f1e3300a07e66a830bc3f875eebb49e72b484001cc957a6a052e0dc65c88f 606090 cups-server-common_1.7.2-2_all.deb
6092d9b42b2bf6cb4f918fcedcfcec8df0ee149c9181d301f49b120f7a2a5bad 122770 cups-ppdc_1.7.2-2_amd64.deb
2fc6fd754e07bec07e831845742887264b618e50b6a73d114565e91ab3efc5f3 2123382 cups-dbg_1.7.2-2_amd64.deb
Files:
7595ce4b8d3ffebf6f620cc93fb7577e 276438 libs optional libcups2_1.7.2-2_amd64.deb
88b8066a669ee3259f4f816bccbf2149 112638 libs optional libcupsimage2_1.7.2-2_amd64.deb
2be3e2c6246e51235d6876252b493497 123930 libs optional libcupscgi1_1.7.2-2_amd64.deb
afb49b362a840eab7b90dfacdf8115d8 109628 libs optional libcupsmime1_1.7.2-2_amd64.deb
a9723ea098bf1b96e3574647d9a3aed6 141954 libs optional libcupsppdc1_1.7.2-2_amd64.deb
b147e17aa69941644686c714148165e3 284756 net optional cups_1.7.2-2_amd64.deb
447c21560d4fbda601928bc8ada8f421 122732 net optional cups-core-drivers_1.7.2-2_amd64.deb
cbef4b87d9a633f339ea0b6e4f10d386 364150 net optional cups-daemon_1.7.2-2_amd64.deb
89e8b3a26f19e86dcb77fe13145e3926 292348 net optional cups-client_1.7.2-2_amd64.deb
9c3e329b5e070ffd15d46b0f1edbe9ec 313928 libdevel optional libcups2-dev_1.7.2-2_amd64.deb
354898867ed1302f72af9c4a4bfa4b64 18052 libdevel optional libcupsimage2-dev_1.7.2-2_amd64.deb
1ab67fd91fa60be872e5fd161f6ee9ba 126238 libdevel optional libcupscgi1-dev_1.7.2-2_amd64.deb
e07adf332ca4c3d4248c0196f1138bca 110202 libdevel optional libcupsmime1-dev_1.7.2-2_amd64.deb
29de2740d21a5343582a8382d0211719 146572 libdevel optional libcupsppdc1-dev_1.7.2-2_amd64.deb
ec829961733aedc680894837dd0236dc 35020 net extra cups-bsd_1.7.2-2_amd64.deb
83ba0c61dcfc3830e002539b671de4e4 254834 net optional cups-common_1.7.2-2_all.deb
cd048c5fd5869fe2a87505a7f2e97c77 606090 net optional cups-server-common_1.7.2-2_all.deb
9fb344fbb77bc3cd009b184761ba3456 122770 utils optional cups-ppdc_1.7.2-2_amd64.deb
02e6ce0967869eee443492cf26199301 2123382 debug extra cups-dbg_1.7.2-2_amd64.deb
bd9fbb01a0c9944bc3079aaaa9b50120 3527 net optional cups_1.7.2-2.dsc
fe3526944918d3bd128241012beaabca 293548 net optional cups_1.7.2-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQGcBAEBCAAGBQJTY68ZAAoJEIvPpx7KFjRVUVUL/3EloG+qF34ry5za/amzfwzW
7xzLKf0o13Xdy0TJZ5NC33xeaIcw675xCrBTh80OcC+H835f7aJ6yCplLcG8/JjZ
2kcqnIZPSJomOEnau6kT0I1yeBhHnjbq7giOaILI1zvkdAlfZEWIiLxwC6ylSB0A
7DgLbdC0wtVgnaV4GEtuAd6ihx/v+lppkH7AT/nU2lojBecEycqZQhp63X2JGmge
Z1GH795JxH/+tPwguZkfQen4CBEwprtwk2mjkT35lXc3i+2B7Og+wk1WHUfm+7xA
0+tWGbIHLU0ROD0zaFtg0VaSAJhOD8D9ttEm8f6hmPUOERmridIbPuJZWitrx3wb
PIvaMBdGVno8hfs6XbtD/UyXq010uTPsPlKC2i4NDbu/Iez0CAeJvrP6ucOXXNil
zHlOFIQvXBQALDknDrnk+CG0cxZ1X2Yevn8zfaElEFoofTh52QJx+Q0po5zIdCGo
+qaDatrbfj1VRhE0CtmDeY63M0Td6oFguRRU3Lmt6A==
=s4oQ
-----END PGP SIGNATURE-----
--- End Message ---