Merge lp:~xnox/ubuntu/lucid/distribute/sync-to-sid-2 into lp:~xnox/ubuntu/lucid/distribute/lucid-snapshot
Proposed by
Dimitri John Ledkov
Status: | Work in progress |
---|---|
Proposed branch: | lp:~xnox/ubuntu/lucid/distribute/sync-to-sid-2 |
Merge into: | lp:~xnox/ubuntu/lucid/distribute/lucid-snapshot |
Prerequisite: | lp:~xnox/debian/sid/distribute/sid-snapshot |
Diff against target: |
105 lines (+26/-28) 4 files modified
debian/changelog (+19/-10) debian/control (+2/-2) debian/python-distribute.substvars (+0/-4) debian/rules (+5/-12) |
To merge this branch: | bzr merge lp:~xnox/ubuntu/lucid/distribute/sync-to-sid-2 |
Related bugs: |
To post a comment you must log in.
Unmerged revisions
- 11. By Barry Warsaw
-
* Merge from Debian Unstable. Remaining Ubuntu changes:
- Build only for Python 2.6, since 2.5 and earlier is not supported on
Lucid.
- Remove old setuptools.egg-info directories so that we can transition
to symlinks.
- When writing the debian/python- setuptools. substvars, only include
variable substitutions for building Python 2.6. - 10. By Barry Warsaw
-
Remove another reference to Python 2.5
- 9. By Barry Warsaw
-
Stop building for Python 2.5 as per discussion with ScottK.
- 8. By Barry Warsaw
-
changelog
- 7. By Barry Warsaw
-
* Merge with sid's new upstream version.