Merge lp://qastaging/~smoser/ubuntu/precise/python-boto/merge-2.0.2 into lp://qastaging/ubuntu/precise/python-boto
Proposed by
Scott Moser
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 19 | ||||
| Proposed branch: | lp://qastaging/~smoser/ubuntu/precise/python-boto/merge-2.0.2 | ||||
| Merge into: | lp://qastaging/ubuntu/precise/python-boto | ||||
| Diff against target: |
155 lines (+59/-19) 5 files modified
boto.egg-info/SOURCES.txt (+1/-1) debian/TODO (+0/-2) debian/changelog (+46/-0) debian/control (+3/-3) debian/rules (+9/-13) |
||||
| To merge this branch: | bzr merge lp://qastaging/~smoser/ubuntu/precise/python-boto/merge-2.0.2 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Loïc Minier | Approve | ||
|
Review via email:
|
|||
Description of the change
Sync with debian 2.0.2, in anticipation of pulling pulling in 2.1.1 from upstream.
I wanted to get our delta down as small as possible, as we will have no upstream delta that I'm aware of for 2.1.1, and the only debian delta left is debian/watch.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looked good -- merged, thanks; NB: dch recognizes only "UNRELEASED" in debian/changelog, not the lower cased "unreleased".