Ubuntu
cntlm package

Merge lp://staging/~pac72/ubuntu/natty/cntlm/devel into lp://staging/ubuntu/natty/cntlm

  1. Natty (11.04)
  2. devel
  3. Merge into natty
Proposed by Paolo Cancedda
Status: Merged
Merged at revision: 10
Proposed branch: lp://staging/~pac72/ubuntu/natty/cntlm/devel
Merge into: lp://staging/ubuntu/natty/cntlm
Diff against target: 29 lines (+13/-1)
2 files modified
debian/changelog (+7/-0)
debian/cntlm.if-up (+6/-1)
To merge this branch: bzr merge lp://staging/~pac72/ubuntu/natty/cntlm/devel
Reviewer Review Type Date Requested Status
Krzysztof Klimonda (community) Approve
Ubuntu branches Pending
Review via email: mp+53343@code.staging.launchpad.net

Description of the change

Fix for LP: #733537

To post a comment you must log in.
Revision history for this message
Krzysztof Klimonda (kklimonda) wrote :

Thanks, I'm going to merge and release it now.
Only two small things to remember in the future:
 - revision of the package, when targeted for the current development release should be a whole number. So instead of "0.91~rc6-0ubuntu1.2" it should be "0.91~rc6-0ubuntu2" - that's because the former versioning scheme is used for SRU/security fixes - if you use it in the development release, and the same version is used to fix something in the current stable release the package won't be updated on the system upgrade.
 - When requesting a merge with the full package branch please don't target the release in changelog, use the UNRELEASED instead. changing it to the release name (in this case natty) is left to the person who does the actual upload.

review: Approve

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