lp:~barry/ubuntu/lucid/distribute/sync-to-sid

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/lucid/distribute

Scott Kitterman: Needs Fixing on 2010-01-18

Ubuntu branches: Pending requested 2010-01-14

Diff: 2722 lines (+539/-1442)

37 files modified

CHANGES.txt (+35/-0)
CONTRIBUTORS.txt (+2/-0)
PKG-INFO (+68/-21)
README.txt (+41/-29)
debian/changelog (+20/-0)
debian/control (+2/-2)
debian/python-distribute.substvars (+1/-1)
debian/rules (+6/-8)
distribute.egg-info/PKG-INFO (+68/-21)
distribute.egg-info/SOURCES.txt (+3/-4)
distribute.egg-info/entry_points.txt (+1/-1)
distribute_setup.py (+34/-16)
distribute_setup_dev.py (+0/-458)
docs/_templates/indexsidebar.html (+8/-0)
docs/build/html/_sources/easy_install.txt (+5/-2)
docs/build/html/_sources/index.txt (+17/-1)
docs/build/html/_sources/pkg_resources.txt (+4/-3)
docs/build/html/_sources/roadmap.txt (+2/-2)
docs/conf.py (+4/-3)
docs/easy_install.txt (+5/-2)
docs/index.txt (+17/-1)
docs/pkg_resources.txt (+4/-3)
docs/roadmap.txt (+2/-2)
ll.txt (+0/-37)
ok.txt (+0/-804)
pkg_resources.py (+22/-3)
setup.py (+4/-2)
setuptools/command/__init__.py (+3/-0)
setuptools/command/easy_install.py (+7/-1)
setuptools/command/install_scripts.py (+4/-1)
setuptools/command/upload_docs.py (+1/-1)
setuptools/sandbox.py (+6/-2)
setuptools/tests/test_develop.py (+1/-1)
setuptools/tests/test_easy_install.py (+39/-1)
setuptools/tests/test_resources.py (+10/-9)
setuptools/tests/test_sandbox.py (+28/-0)
setuptools/tests/test_upload_docs.py (+65/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

11. By Barry Warsaw on 2010-01-19

* 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 on 2010-01-18

Remove another reference to Python 2.5

9. By Barry Warsaw on 2010-01-18

Stop building for Python 2.5 as per discussion with ScottK.

8. By Barry Warsaw on 2010-01-14

changelog

7. By Barry Warsaw on 2010-01-14

* Merge with sid's new upstream version.

6. By Michael Bienia on 2009-12-05

python-setuptools.preinst (lp: #490731):
Remove old .egg-info directories so we can transition to symlinks.

5. By Matthias Klose on 2009-11-12

Build for python2.5 and python2.6.

4. By Matthias Klose on 2009-11-12

New upstream version.

3. By Matthias Klose on 2009-10-24

* New upstream version.
* Don't build python-distribute (yet). Move the egg-info into
  python-setuptools. Closes: #552154.

2. By Matthias Klose on 2009-10-20

Build python-setuptools from the `distribute' fork.