Merge lp:~jamesodhunt/ubuntu/precise/upstart/bugs-985755+984474 into lp:ubuntu/precise/upstart

[James Hunt]

* debian/upstart-job: Only attempt to handle disabled jobs if the running
  version of Upstart supports such a query (LP: #985755, #984474).

* debian/manpages/upstart-events.7: Fixed typo and corrected reference to
  'kill signal' stanza.

[Daniel Holbach (dholbach)]

Could you add some brief information based on https://wiki.ubuntu.com/StableReleaseUpdates#Procedure to the bug reports and change the debian/changelog entry from 'precise' to 'precise-proposed'?

review: Needs Information

[lp:~jamesodhunt/ubuntu/precise/upstart/bugs-985755+984474]

1393. By James Hunt on 2012-04-24

Changed release to precise-proposed.

[James Hunt (jamesodhunt)]

Hi Daniel - thanks for reviewing. changelog updated and bug 985755 updated wrt the stable release procedure.

[lp:~jamesodhunt/ubuntu/precise/upstart/bugs-985755+984474]

1394. By James Hunt on 2012-04-25

fixup changelog after version collision with slangasek's logrotate change.

[Steve Langasek (vorlon)]

since this is an active bzr branch, it's much better if you:

- run echo DEBCHANGE_RELEASE_HEURISTIC=changelog >> ~/.devscripts
- always use 'dch' by itself when updating the changelog
- leave the upload target as 'UNRELEASED' when proposing branches for merge

This branch shouldn't be incrementing the package version above the still-unreleased version in the trunk; when collaborating in a VCS with multiple changes in a single upload, marking the upload target should be the last step, to be handled by the uploader after merging. Using the above recipe facilitates this.

[James Hunt (jamesodhunt)]

Ok, thanks Steve!

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-20 04:06:59 +0000
+++ debian/changelog	2012-04-25 12:53:26 +0000
@@ -1,3 +1,12 @@
+upstart (1.5-0ubuntu7) precise-proposed; urgency=low
+
+  * debian/upstart-job: Only attempt to handle disabled jobs if the running
+    version of Upstart supports such a query (LP: #985755, #984474).
+  * debian/manpages/upstart-events.7: Fixed typo and corrected reference to
+    'kill signal' stanza. 
+
+ -- James Hunt <[e-mail]>  Wed, 25 Apr 2012 13:46:00 +0100
+
 upstart (1.5-0ubuntu6) UNRELEASED; urgency=low
 
   * debian/upstart.logrotate: don't create empty files after rotation;

=== modified file 'debian/manpages/upstart-events.7'
--- debian/manpages/upstart-events.7	2012-03-28 11:01:43 +0000
+++ debian/manpages/upstart-events.7	2012-04-25 12:53:26 +0000
@@ -322,7 +322,7 @@
 events are emitted with appropriate variables set denoting the error.
 .\"
 .IP \n+[step] 3
-Assuming the pre\-start did not fail or did not called "stop", the main
+Assuming the pre\-start did not fail or did not call "stop", the main
 process is spawned.
 .\"
 .IP \n+[step] 3
@@ -397,8 +397,8 @@
 .af step2 i
 .IP \n[step2] 3
 The signal specified by the
-.B kill
-stanza is sent to the process group of the main process.
+.B kill signal
+stanza is sent to the process group of the main process
 (such that all processes belonging to the jobs main process are killed).
 By default this signal is
 .BR SIGTERM "."

=== modified file 'debian/upstart-job'
--- debian/upstart-job	2012-04-10 08:25:51 +0000
+++ debian/upstart-job	2012-04-25 12:53:26 +0000
@@ -37,7 +37,26 @@
 $ECHO "Rather than invoking init scripts through /etc/init.d, use the service(8)"
 $ECHO "utility, e.g. service $INITSCRIPT $COMMAND"
 
-initctl show-config -e "$JOB"|grep -q '^  start on' || DISABLED=1
+# Only check if jobs are disabled if the currently _running_ version of
+# Upstart (which may be older than the latest _installed_ version)
+# supports such a query.
+#
+# This check is necessary to handle the scenario when upgrading from a
+# release without the 'show-config' command (introduced in
+# Upstart for Ubuntu version 0.9.7) since without this check, all
+# installed packages with associated Upstart jobs would be considered
+# disabled.
+#
+# Once Upstart can maintain state on re-exec, this change can be
+# dropped (since the currently running version of Upstart will always
+# match the latest installed version).
+
+UPSTART_VERSION_RUNNING=$(initctl version|awk '{print $3}'|tr -d ')')
+
+if dpkg --compare-versions "$UPSTART_VERSION_RUNNING" ge 0.9.7-1
+then
+    initctl show-config -e "$JOB"|grep -q '^  start on' || DISABLED=1
+fi
 
 case $COMMAND in
 status)