Viewing all changes in revision 26.
- Committer: Package Import Robot
- Date: 2012-10-22 15:26:41 UTC
- mfrom: (7.1.12 experimental)
- Revision ID: package-import@ubuntu.com-20121022152641-j87bd9p003ii5qum
* Merge with Debian; remaining changes:
  - 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.  This is required because
     python-numpy is in main, while python-matplotlib is in universe.
  - Build using dh_python2
    add bin/f2py* to .install files
  - 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.  This is required because
     python-numpy is in main, while python-matplotlib is in universe.
  - Build using dh_python2
    add bin/f2py* to .install files
- files added:
- .pc/.quilt_patches
- debian/tmp2
- numpy/core/src/npysort
- files removed:
- .pc/20_sphinx_1.1.2.diff
- .pc/20_sphinx_1.1.2.diff/doc
- .pc/20_sphinx_1.1.2.diff/doc/source
- files modified:
- .pc/02_build_dotblas.patch/numpy/core/setup.py
expand all
collapse all
added
removed
