Merge lp://staging/~peter-pearse/ubuntu/natty/python2.7/prop003 into lp://staging/ubuntu/natty/python2.7

Proposed by Peter Pearse
Status: Needs review
Proposed branch: lp://staging/~peter-pearse/ubuntu/natty/python2.7/prop003
Merge into: lp://staging/ubuntu/natty/python2.7
Diff against target: 600 lines (+394/-16)
4 files modified
debian/changelog (+12/-0)
debian/patches/cross.diff (+252/-0)
debian/patches/series.in (+1/-0)
debian/rules (+129/-16)
To merge this branch: bzr merge lp://staging/~peter-pearse/ubuntu/natty/python2.7/prop003
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+56777@code.staging.launchpad.net

Description of the change

Changed to resemble python2.6 prop004

To post a comment you must log in.

Unmerged revisions

29. By Peter Pearse

  * Modules/Setup.dist - drop system paths for zlib.
  * Makefile.pre.in - Use BUILDPYTHON where applicable for cross builds.
  * setup.py - For cross builds, pass cross toolchain info in python
    environment.
  * debian/rules - Build a build host python for use during a cross
    build. Adjust the configuration files & make environment
    accordingly.

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: