Merge lp://staging/~mvo/pocket-lint/packaging into lp://staging/pocket-lint

Proposed by Michael Vogt
Status: Merged
Approved by: Curtis Hovey
Approved revision: 16
Merge reported by: Curtis Hovey
Merged at revision: not available
Proposed branch: lp://staging/~mvo/pocket-lint/packaging
Merge into: lp://staging/pocket-lint
Diff against target: 159 lines (+123/-0)
7 files modified
.bzr-builddeb/default.conf (+2/-0)
changelog (+52/-0)
control (+30/-0)
copyright (+30/-0)
pyversions (+1/-0)
rules (+6/-0)
watch (+2/-0)
To merge this branch: bzr merge lp://staging/~mvo/pocket-lint/packaging
Reviewer Review Type Date Requested Status
Curtis Hovey code Approve
Review via email: mp+41057@code.staging.launchpad.net

Description of the change

Updates the packaging branch and adds a watch file to easy incorporating the upstream tarball. With that branch a simple "bzr-buildpackage" will generate a deb and "bzr-buildpackage -S" a source tarball suitable for upload.

To post a comment you must log in.
16. By Michael Vogt

changelog: increment changelog version for the (not yet uploaded) upstream 0.5.5 tarball

Revision history for this message
Curtis Hovey (sinzui) wrote :

Thanks for taking the time to do this. I am reminded that +downloads cannot be relied on for projects that release from the non-development branch. That is not a problem in this case, but I really must provide +watch that will guarantee that debwatch does not fail.

review: Approve (code)
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for reviewing this. Do you think the use of "+downloads" is a blocker to get this branch merged?

Revision history for this message
Curtis Hovey (sinzui) wrote :

+downloads is not a blocker. It just reminds me that I really need to fix Launchpad's support for debwatch.

Revision history for this message
Curtis Hovey (sinzui) wrote :

I merged this on the 17th. Oh, I see what is wrong, the merge target is really ~sinzui/pocket-lint/packaging/ This too is something I think Launchpad needs to address. It was only at UDS that I realised that many of use maintain a packaging branch. Lp should let me state flag the packaging series and present it as a default merge target.

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks Curtis! I should have checked that myself, I thought I proposed a merge into the packaging branch, not into trunk. Great that its merged :)

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: