Merge lp://qastaging/~mfisch/ubuntu/saucy/distribute/update-to-0.6.37-1 into lp://qastaging/ubuntu/saucy/distribute
Proposed by
Matt Fischer
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | Sebastien Bacher | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://qastaging/~mfisch/ubuntu/saucy/distribute/update-to-0.6.37-1 | ||||
| Merge into: | lp://qastaging/ubuntu/saucy/distribute | ||||
| Diff against target: |
2166 lines (+1020/-946) 15 files modified
CHANGES.txt (+10/-0) MANIFEST.in (+1/-1) PKG-INFO (+15/-4) README.txt (+3/-3) debian/changelog (+16/-1) distribute.egg-info/PKG-INFO (+894/-883) distribute.egg-info/SOURCES.txt (+1/-1) distribute.egg-info/entry_points.txt (+45/-46) distribute.egg-info/top_level.txt (+2/-2) distribute_setup.py (+1/-1) docs/conf.py (+2/-2) release.py (+1/-1) setup.py (+1/-1) setuptools/command/easy_install.py (+13/-0) setuptools/command/launcher manifest.xml (+15/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mfisch/ubuntu/saucy/distribute/update-to-0.6.37-1 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
New upstream version.
I also spoke with Logan and he said that his changelog for 0.6.36-1ubuntu1 is incorrect and should have said disabling 2.6, not 2.7. I fixed that and noted the fix in my CL, although I don't know what official policy is here.
I also have one additional question for the reviewer. I can find no evidence that Logan removed python3-sphinx as the changelog states. I see instead that he removed the dep on python3.3-dev, which is in main, and so I've left it for now.
Unless I'm reading his diffs wrong, perhaps that changelog line should also be fixed?
To post a comment you must log in.
Revision history for this message
| Sebastien Bacher (seb128) wrote | # |
Revision history for this message
| Dmitry Shachnev (mitya57) wrote | # |
Revision history for this message
| Matt Fischer (mfisch) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
thank you for the work