Ubuntu
upstart package

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

  1. Precise (12.04)
  2. bugs-985755+984474
  3. Merge into precise
Proposed by James Hunt
Status: Merged
Merged at revision: 1393
Proposed branch: lp://qastaging/~jamesodhunt/ubuntu/precise/upstart/bugs-985755+984474
Merge into: lp://qastaging/ubuntu/precise/upstart
Diff against target: 72 lines (+32/-4)
3 files modified
debian/changelog (+9/-0)
debian/manpages/upstart-events.7 (+3/-3)
debian/upstart-job (+20/-1)
To merge this branch: bzr merge lp://qastaging/~jamesodhunt/ubuntu/precise/upstart/bugs-985755+984474
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Needs Information
Ubuntu branches Pending
Review via email: mp+102805@code.qastaging.launchpad.net

Description of the change

* 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.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

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://qastaging/~jamesodhunt/ubuntu/precise/upstart/bugs-985755+984474 updated
1393. By James Hunt

Changed release to precise-proposed.

Revision history for this message
James Hunt (jamesodhunt) wrote :

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

lp://qastaging/~jamesodhunt/ubuntu/precise/upstart/bugs-985755+984474 updated
1394. By James Hunt

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

Revision history for this message
Steve Langasek (vorlon) wrote :

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.

Revision history for this message
James Hunt (jamesodhunt) wrote :

Ok, thanks Steve!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: