Merge lp:~vorlon/ubuntu/precise/cups/udevtrigger-optimization into lp:ubuntu/precise/cups

[Steve Langasek]

Hi guys, could I ask you to review this proposed change to the cups upstart
job before I land it, and check my reasoning (given in the changelog)?

I'm reasonably sure that we don't need to wait for udevtrigger, but would
like a second opinion before I push such a change at this point in the
cycle.

The reason I'm looking at this is because the udevtrigger upstart job has
regressed a bit this cycle performance-wise, now using a script where before
it was a simple exec; to fix that while making cups container-compatible, we
need to either drop the reference to udevtrigger in cups, or add an 'or
container'.

[Martin Pitt (pitti)]

LGTM, thanks! I committed that to the Debian packaging bzr, so we can sync the next time again. But feel free to upload this in the meantime.

review: Approve

[lp:~vorlon/ubuntu/precise/cups/udevtrigger-optimization]

98. By Steve Langasek on 2012-04-09

run update-maintainer

99. By Steve Langasek on 2012-04-09

releasing version 1.5.2-9ubuntu1

Unmerged revisions

99. By Steve Langasek on 2012-04-09

releasing version 1.5.2-9ubuntu1

98. By Steve Langasek on 2012-04-09

run update-maintainer

97. By Steve Langasek on 2012-04-05

Don't wait on udevtrigger before starting cups; the only reason this
is here is to let '/lib/udev/udev-configure-printer enumerate' work, but
if cups does start before we've cold-plugged everything, the udev rule
will call '/lib/udev/udev-configure-printer add' for each device it
discovers anyway, so this is redundant.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-30 08:44:35 +0000
+++ debian/changelog	2012-04-09 15:33:31 +0000
@@ -1,3 +1,13 @@
+cups (1.5.2-9ubuntu1) precise; urgency=low
+
+  * Don't wait on udevtrigger before starting cups; the only reason this
+    is here is to let '/lib/udev/udev-configure-printer enumerate' work, but
+    if cups does start before we've cold-plugged everything, the udev rule
+    will call '/lib/udev/udev-configure-printer add' for each device it
+    discovers anyway, so this is redundant.
+
+ -- Steve Langasek <[e-mail]>  Mon, 09 Apr 2012 08:24:48 -0700
+
 cups (1.5.2-9) unstable; urgency=low
 
   [ Till Kamppeter ]

=== modified file 'debian/control'
--- debian/control	2012-03-30 08:44:35 +0000
+++ debian/control	2012-04-09 15:33:31 +0000
@@ -2,7 +2,8 @@
 Standards-Version: 3.9.3
 Priority: optional
 Section: net
-Maintainer: Debian CUPS Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian CUPS Maintainers <[e-mail]>
 Uploaders: 
  Masayuki Hatta (mhatta) <[e-mail]>,
  Till Kamppeter <[e-mail]>,

=== modified file 'debian/local/cups.upstart'
--- debian/local/cups.upstart	2011-09-21 08:04:56 +0000
+++ debian/local/cups.upstart	2012-04-09 15:33:31 +0000
@@ -4,8 +4,7 @@
 author          "Michael Sweet <[e-mail]>"
 
 start on (filesystem
-          and (started dbus or runlevel [2345])
-          and stopped udevtrigger)
+          and (started dbus or runlevel [2345]))
 stop on runlevel [016]
 
 respawn