lp:~barry/ubuntu/natty/python-numpy/bug-664276
- Get this branch:
- bzr branch lp:~barry/ubuntu/natty/python-numpy/bug-664276
Branch merges
- Colin Watson: Approve
-
Diff: 269 lines (+141/-40)7 files modifieddebian/changelog (+14/-0)
debian/control (+16/-16)
debian/patches/20_disable-plot-extension.patch (+81/-0)
debian/patches/series (+1/-0)
debian/rules (+5/-5)
doc/source/conf.py (+23/-18)
doc/sphinxext/tests/test_docscrape.py (+1/-1)
Related bugs
Bug #664276: python-numpy doc related build failure | High | Fix Released |
Related blueprints
Branch information
- Owner:
- Barry Warsaw
- Status:
- Merged
Recent revisions
- 18. By Barry Warsaw
-
- Re-enable documentation binary package. (LP: #664276)
* debian/patches/ 20_disable- plot-extension. patch
- Disable plot_directive extension, and catch ImportErrors when
matplotlib cannot be imported, which allows us to remove
python-matplotlib from dependencies. - 16. By Barry Warsaw
-
Disable plot_directive and matplotlib. This allows us to build the
documentation package without the dependency on python-matplotlib, which is in
universe. Awaiting sanity check from upstream. - 15. By Barry Warsaw
-
* debian/rules, debian/control:
- Re-enable documentation, sans plots. Plots require
python-matplotlib which is in universe. (LP: #664276)
* debian/control:
- Add python-sphinx to Build-Depends since it is required to build the
documentation. - 14. By Sameer Morar
-
* Merge from debian experimental (LP: #695005). Remaining changes:
- Drop build-depends on python-sphinx and python-matplotlib
- Comment python-numpy-doc out of debian/control
- Comment out doc specific elements of debian/rules - 13. By Barry Warsaw
-
Fix pymvpa crash caused by numpy incompatibility with Python 2.7.
This is a back port of the numpy upstream changeset:
http://projects. scipy.org/ numpy/changeset /8394
(LP: #685469) - 10. By Scott Kitterman
-
* Heartlessly rip docs package out of numpy until it's sorted out how to
deal with main/universe split (this is temporary - don't panic, barry will
fix this)
- Drop build-depends on python-sphinx and python-matplotlib
- Comment python-numpy-doc out of debian/control
- Comment out doc specific elements of debian/rules - 9. By Sandro Tosi
-
* debian/
patches/ 10_use_ local_python. org_object. inv_sphinx. diff
- fixed small typo in description
* debian/patches/ changeset_ r8364.diff
- fix memory corruption (double free); thanks to Joseph Barillari for the
report and to Michael Gilbert for pushing resolution; Closes: #581058
Branch metadata
- Branch format:
- Loom branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/natty/python-numpy