Merge lp://staging/~jelmer/bzr-builddeb/lucid-compatibility into lp://staging/bzr-builddeb

Proposed by Jelmer Vernooij
Status: Merged
Approved by: James Westby
Approved revision: 635
Merged at revision: 633
Proposed branch: lp://staging/~jelmer/bzr-builddeb/lucid-compatibility
Merge into: lp://staging/bzr-builddeb
Diff against target: 89 lines (+21/-6)
4 files modified
merge_changelog.py (+10/-3)
tests/test_import_dsc.py (+4/-2)
tests/test_merge_changelog.py (+6/-0)
tests/test_merge_upstream.py (+1/-1)
To merge this branch: bzr merge lp://staging/~jelmer/bzr-builddeb/lucid-compatibility
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+79323@code.staging.launchpad.net

Commit message

Various fixes to allow the testsuite to run on Lucid and Hardy.

Description of the change

Improve lucid and hardy compatibility:

 * allow dpkg-mergechangelogs to not be available
 * checksums can be plain strings
 * compare Version to Version, older versions of python-debian don't support comparing it with a string

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
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