Merge lp:~jtaylor/ubuntu/precise/python-numpy/python3-numpy into lp:ubuntu/precise/python-numpy
- Precise (12.04)
- python3-numpy
- Merge into precise
Proposed by
Julian Taylor
Status: | Merged |
---|---|
Merge reported by: | Jamie Strandboge |
Merged at revision: | not available |
Proposed branch: | lp:~jtaylor/ubuntu/precise/python-numpy/python3-numpy |
Merge into: | lp:ubuntu/precise/python-numpy |
Diff against target: |
324 lines (+163/-34) 7 files modified
debian/changelog (+31/-0) debian/control (+38/-3) debian/python-numpy-dbg.install (+1/-1) debian/python-numpy.install (+20/-20) debian/python3-numpy-dbg.install (+2/-0) debian/python3-numpy.install (+21/-0) debian/rules (+50/-10) |
To merge this branch: | bzr merge lp:~jtaylor/ubuntu/precise/python-numpy/python3-numpy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+98257@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2012-03-19 06:50:35 +0000 | |||
3 | +++ debian/changelog 2012-03-19 18:48:19 +0000 | |||
4 | @@ -1,3 +1,34 @@ | |||
5 | 1 | python-numpy (1:1.6.1-6ubuntu1) precise; urgency=low | ||
6 | 2 | |||
7 | 3 | * Merge from Debian unstable, adds python3 package (LP: #795605, #959588) | ||
8 | 4 | Remaining changes: | ||
9 | 5 | - debian/patches/20_disable-plot-extension.patch | ||
10 | 6 | Disable plot_directive extension, and catch ImportErrors when | ||
11 | 7 | matplotlib cannot be imported, which allows us to remove | ||
12 | 8 | python-matplotlib from dependencies. This is required because | ||
13 | 9 | python-numpy is in main, while python-matplotlib is in universe. | ||
14 | 10 | - Build using dh_python2 | ||
15 | 11 | add bin/f2py* to .install files | ||
16 | 12 | - keep Replaces: python-numpy (<< 1:1.3.0-4) in python-numpy-dbg | ||
17 | 13 | for lucid upgrades | ||
18 | 14 | - debian/patches/search-multiarch-paths.patch: (LP: #818867) | ||
19 | 15 | add multiarch libdirs to numpy.distutils.system_info | ||
20 | 16 | |||
21 | 17 | -- Julian Taylor <jtaylor@ubuntu.com> Mon, 19 Mar 2012 19:38:13 +0100 | ||
22 | 18 | |||
23 | 19 | python-numpy (1:1.6.1-6) experimental; urgency=low | ||
24 | 20 | |||
25 | 21 | [ Thomas Kluyver ] | ||
26 | 22 | * Add package for Python 3; Closes: #601593 | ||
27 | 23 | |||
28 | 24 | [ Sandro Tosi ] | ||
29 | 25 | * Small fixes for python3 packaging | ||
30 | 26 | * debian/control | ||
31 | 27 | - bump Standards-Version to 3.9.3 (no changes needed) | ||
32 | 28 | - remove quild from b-d, not needed since using 3.0 (quilt) format | ||
33 | 29 | |||
34 | 30 | -- Sandro Tosi <morph@debian.org> Sat, 17 Mar 2012 13:05:04 +0100 | ||
35 | 31 | |||
36 | 1 | python-numpy (1:1.6.1-5ubuntu2) precise; urgency=low | 32 | python-numpy (1:1.6.1-5ubuntu2) precise; urgency=low |
37 | 2 | 33 | ||
38 | 3 | * update search-multiarch-paths.patch (LP: #956901) | 34 | * update search-multiarch-paths.patch (LP: #956901) |
39 | 4 | 35 | ||
40 | === modified file 'debian/control' | |||
41 | --- debian/control 2012-03-16 19:28:26 +0000 | |||
42 | +++ debian/control 2012-03-19 18:48:19 +0000 | |||
43 | @@ -4,9 +4,10 @@ | |||
44 | 4 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | 4 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
45 | 5 | XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> | 5 | XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> |
46 | 6 | Uploaders: Sandro Tosi <morph@debian.org> | 6 | Uploaders: Sandro Tosi <morph@debian.org> |
50 | 7 | Build-Depends: python-all-dev (>= 2.6.6-3~), python-all-dbg, gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], debhelper (>= 7.0.50~), patchutils, python-docutils, quilt, python-sphinx (>= 1.0.7+dfsg), python-nose | 7 | Build-Depends: python-all-dev (>= 2.6.6-3~), python-all-dbg, gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], debhelper (>= 7.0.50~), patchutils, python-docutils, python-sphinx (>= 1.0.7+dfsg), python-nose, python3-all-dev, python3-all-dbg, python3-nose |
51 | 8 | XS-Python-Version: >= 2.4 | 8 | X-Python-Version: >= 2.4 |
52 | 9 | Standards-Version: 3.9.2 | 9 | X-Python3-Version: >= 3.0 |
53 | 10 | Standards-Version: 3.9.3 | ||
54 | 10 | Vcs-Svn: svn://svn.debian.org/python-modules/packages/numpy/trunk | 11 | Vcs-Svn: svn://svn.debian.org/python-modules/packages/numpy/trunk |
55 | 11 | Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/numpy/trunk/ | 12 | Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/numpy/trunk/ |
56 | 12 | Homepage: http://numpy.scipy.org/ | 13 | Homepage: http://numpy.scipy.org/ |
57 | @@ -45,6 +46,40 @@ | |||
58 | 45 | . | 46 | . |
59 | 46 | This package contains the extension built for the Python debug interpreter. | 47 | This package contains the extension built for the Python debug interpreter. |
60 | 47 | 48 | ||
61 | 49 | Package: python3-numpy | ||
62 | 50 | Architecture: any | ||
63 | 51 | Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} | ||
64 | 52 | Suggests: python-numpy-doc, python3-numpy-dbg, python3-nose (>= 0.10.1), python3-dev, gfortran | ||
65 | 53 | Provides: ${python3:Provides}, ${numpy:Provides}, python3-numpy-dev, python3-f2py | ||
66 | 54 | Description: Numerical Python adds a fast array facility to the Python language | ||
67 | 55 | Numpy contains a powerful N-dimensional array object, sophisticated | ||
68 | 56 | (broadcasting) functions, tools for integrating C/C++ and Fortran | ||
69 | 57 | code, and useful linear algebra, Fourier transform, and random number | ||
70 | 58 | capabilities. | ||
71 | 59 | . | ||
72 | 60 | Numpy replaces the python-numeric and python-numarray modules which are | ||
73 | 61 | now deprecated and shouldn't be used except to support older | ||
74 | 62 | software. | ||
75 | 63 | . | ||
76 | 64 | This package contains Numpy for Python 3. | ||
77 | 65 | |||
78 | 66 | Package: python3-numpy-dbg | ||
79 | 67 | Priority: extra | ||
80 | 68 | Section: debug | ||
81 | 69 | Architecture: any | ||
82 | 70 | Depends: python3-numpy (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends} | ||
83 | 71 | Description: Fast array facility to the Python language (debug extension) | ||
84 | 72 | Numpy contains a powerful N-dimensional array object, sophisticated | ||
85 | 73 | (broadcasting) functions, tools for integrating C/C++ and Fortran | ||
86 | 74 | code, and useful linear algebra, Fourier transform, and random number | ||
87 | 75 | capabilities. | ||
88 | 76 | . | ||
89 | 77 | Numpy replaces the python-numeric and python-numarray modules which | ||
90 | 78 | are now deprecated and shouldn't be used except to support older | ||
91 | 79 | software. | ||
92 | 80 | . | ||
93 | 81 | This package contains the extension built for the Python 3 debug interpreter. | ||
94 | 82 | |||
95 | 48 | Package: python-numpy-doc | 83 | Package: python-numpy-doc |
96 | 49 | Depends: ${misc:Depends}, ${sphinxdoc:Depends} | 84 | Depends: ${misc:Depends}, ${sphinxdoc:Depends} |
97 | 50 | Section: doc | 85 | Section: doc |
98 | 51 | 86 | ||
99 | === modified file 'debian/python-numpy-dbg.install' | |||
100 | --- debian/python-numpy-dbg.install 2012-02-11 12:55:21 +0000 | |||
101 | +++ debian/python-numpy-dbg.install 2012-03-19 18:48:19 +0000 | |||
102 | @@ -1,3 +1,3 @@ | |||
103 | 1 | usr/bin/f2py-dbg | 1 | usr/bin/f2py-dbg |
104 | 2 | usr/bin/f2py2.?-dbg | 2 | usr/bin/f2py2.?-dbg |
106 | 3 | usr/lib/python*/*-packages/*/*/*_d.so | 3 | usr/lib/python2*/*-packages/*/*/*_d.so |
107 | 4 | 4 | ||
108 | === modified file 'debian/python-numpy.install' | |||
109 | --- debian/python-numpy.install 2012-02-11 12:55:21 +0000 | |||
110 | +++ debian/python-numpy.install 2012-03-19 18:48:19 +0000 | |||
111 | @@ -2,23 +2,23 @@ | |||
112 | 2 | usr/bin/f2py2.? | 2 | usr/bin/f2py2.? |
113 | 3 | debian/dh_numpy usr/bin | 3 | debian/dh_numpy usr/bin |
114 | 4 | debian/versions usr/share/numpy/ | 4 | debian/versions usr/share/numpy/ |
135 | 5 | usr/lib/python*/*-packages/*/*/*[!_][!_].so | 5 | usr/lib/python2*/*-packages/*/*/*[!_][!_].so |
136 | 6 | usr/lib/python*/*-packages/*/*/*/libnpymath.a | 6 | usr/lib/python2*/*-packages/*/*/*/libnpymath.a |
137 | 7 | usr/lib/python*/*-packages/*/*.py | 7 | usr/lib/python2*/*-packages/*/*.py |
138 | 8 | usr/lib/python*/*-packages/*.egg-info | 8 | usr/lib/python2*/*-packages/*.egg-info |
139 | 9 | usr/lib/python*/*-packages/numpy/*.py | 9 | usr/lib/python2*/*-packages/numpy/*.py |
140 | 10 | usr/lib/python*/*-packages/numpy/compat/ | 10 | usr/lib/python2*/*-packages/numpy/compat/ |
141 | 11 | usr/lib/python*/*-packages/numpy/core/ | 11 | usr/lib/python2*/*-packages/numpy/core/ |
142 | 12 | usr/lib/python*/*-packages/numpy/distutils/ | 12 | usr/lib/python2*/*-packages/numpy/distutils/ |
143 | 13 | usr/lib/python*/*-packages/numpy/f2py/*.py | 13 | usr/lib/python2*/*-packages/numpy/f2py/*.py |
144 | 14 | usr/lib/python*/*-packages/numpy/f2py/src | 14 | usr/lib/python2*/*-packages/numpy/f2py/src |
145 | 15 | usr/lib/python*/*-packages/numpy/fft/ | 15 | usr/lib/python2*/*-packages/numpy/fft/ |
146 | 16 | usr/lib/python*/*-packages/numpy/lib/ | 16 | usr/lib/python2*/*-packages/numpy/lib/ |
147 | 17 | usr/lib/python*/*-packages/numpy/linalg/ | 17 | usr/lib/python2*/*-packages/numpy/linalg/ |
148 | 18 | usr/lib/python*/*-packages/numpy/ma/ | 18 | usr/lib/python2*/*-packages/numpy/ma/ |
149 | 19 | usr/lib/python*/*-packages/numpy/matrixlib/ | 19 | usr/lib/python2*/*-packages/numpy/matrixlib/ |
150 | 20 | usr/lib/python*/*-packages/numpy/numarray/ | 20 | usr/lib/python2*/*-packages/numpy/numarray/ |
151 | 21 | usr/lib/python*/*-packages/numpy/oldnumeric/ | 21 | usr/lib/python2*/*-packages/numpy/oldnumeric/ |
152 | 22 | usr/lib/python*/*-packages/numpy/polynomial/ | 22 | usr/lib/python2*/*-packages/numpy/polynomial/ |
153 | 23 | usr/lib/python*/*-packages/numpy/random/ | 23 | usr/lib/python2*/*-packages/numpy/random/ |
154 | 24 | usr/lib/python*/*-packages/numpy/testing/ | 24 | usr/lib/python2*/*-packages/numpy/testing/ |
155 | 25 | 25 | ||
156 | === added file 'debian/python3-numpy-dbg.install' | |||
157 | --- debian/python3-numpy-dbg.install 1970-01-01 00:00:00 +0000 | |||
158 | +++ debian/python3-numpy-dbg.install 2012-03-19 18:48:19 +0000 | |||
159 | @@ -0,0 +1,2 @@ | |||
160 | 1 | usr/bin/f2py3.?-dbg | ||
161 | 2 | usr/lib/python3*/*-packages/*/*/*.cpython-*d*.so | ||
162 | 0 | 3 | ||
163 | === added file 'debian/python3-numpy.install' | |||
164 | --- debian/python3-numpy.install 1970-01-01 00:00:00 +0000 | |||
165 | +++ debian/python3-numpy.install 2012-03-19 18:48:19 +0000 | |||
166 | @@ -0,0 +1,21 @@ | |||
167 | 1 | usr/bin/f2py3.? | ||
168 | 2 | usr/lib/python3*/*-packages/*/*/*.cpython-3?[!d]*.so | ||
169 | 3 | usr/lib/python3*/*-packages/*/*/*/libnpymath.a | ||
170 | 4 | usr/lib/python3*/*-packages/*/*.py | ||
171 | 5 | usr/lib/python3*/*-packages/*.egg-info | ||
172 | 6 | usr/lib/python3*/*-packages/numpy/*.py | ||
173 | 7 | usr/lib/python3*/*-packages/numpy/compat/ | ||
174 | 8 | usr/lib/python3*/*-packages/numpy/core/ | ||
175 | 9 | usr/lib/python3*/*-packages/numpy/distutils/ | ||
176 | 10 | usr/lib/python3*/*-packages/numpy/f2py/*.py | ||
177 | 11 | usr/lib/python3*/*-packages/numpy/f2py/src | ||
178 | 12 | usr/lib/python3*/*-packages/numpy/fft/ | ||
179 | 13 | usr/lib/python3*/*-packages/numpy/lib/ | ||
180 | 14 | usr/lib/python3*/*-packages/numpy/linalg/ | ||
181 | 15 | usr/lib/python3*/*-packages/numpy/ma/ | ||
182 | 16 | usr/lib/python3*/*-packages/numpy/matrixlib/ | ||
183 | 17 | usr/lib/python3*/*-packages/numpy/numarray/ | ||
184 | 18 | usr/lib/python3*/*-packages/numpy/oldnumeric/ | ||
185 | 19 | usr/lib/python3*/*-packages/numpy/polynomial/ | ||
186 | 20 | usr/lib/python3*/*-packages/numpy/random/ | ||
187 | 21 | usr/lib/python3*/*-packages/numpy/testing/ | ||
188 | 0 | 22 | ||
189 | === modified file 'debian/rules' (properties changed: +x to -x) | |||
190 | --- debian/rules 2012-02-11 12:55:21 +0000 | |||
191 | +++ debian/rules 2012-03-19 18:48:19 +0000 | |||
192 | @@ -1,6 +1,7 @@ | |||
193 | 1 | #!/usr/bin/make -f | 1 | #!/usr/bin/make -f |
194 | 2 | 2 | ||
196 | 3 | PYVERS=$(shell pyversions -vr debian/control) | 3 | PY2VERS=$(shell pyversions -vr debian/control) |
197 | 4 | PY3VERS=$(shell py3versions -vr) | ||
198 | 4 | PYDEF=$(shell pyversions -dv) | 5 | PYDEF=$(shell pyversions -dv) |
199 | 5 | PYLIBPATH := $(shell python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_platlib") | 6 | PYLIBPATH := $(shell python -c "from distutils.command.build import build ; from distutils.core import Distribution ; b = build(Distribution()) ; b.finalize_options() ; print b.build_platlib") |
200 | 6 | 7 | ||
201 | @@ -10,26 +11,36 @@ | |||
202 | 10 | export ATLAS=None | 11 | export ATLAS=None |
203 | 11 | 12 | ||
204 | 12 | %: | 13 | %: |
206 | 13 | dh $@ --with sphinxdoc,python2 | 14 | dh $@ --with sphinxdoc,python2,python3 |
207 | 15 | |||
208 | 16 | override_dh_auto_build: | ||
209 | 17 | dh_auto_build | ||
210 | 18 | for v in $(PY3VERS); do \ | ||
211 | 19 | python$$v setup.py build; \ | ||
212 | 20 | python$$v-dbg setup.py build; \ | ||
213 | 21 | done | ||
214 | 14 | 22 | ||
215 | 15 | override_dh_auto_clean: | 23 | override_dh_auto_clean: |
216 | 16 | dh_auto_clean | 24 | dh_auto_clean |
217 | 17 | rm -rf `find -name build -type d` | 25 | rm -rf `find -name build -type d` |
218 | 18 | rm -rf `find . -name "*.pyc" -type f` | 26 | rm -rf `find . -name "*.pyc" -type f` |
219 | 19 | rm -rf debian/tmp2 | ||
220 | 20 | 27 | ||
221 | 21 | override_dh_installman: | 28 | override_dh_installman: |
222 | 22 | dh_installman numpy/f2py/f2py.1 | 29 | dh_installman numpy/f2py/f2py.1 |
223 | 23 | # link manpage for versioned and dbg incarnations of f2py | 30 | # link manpage for versioned and dbg incarnations of f2py |
225 | 24 | for v in $(PYVERS); do \ | 31 | for v in $(PY2VERS); do \ |
226 | 25 | dh_link /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v.1.gz; \ | 32 | dh_link /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v.1.gz; \ |
227 | 26 | dh_link -ppython-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v-dbg.1.gz; \ | 33 | dh_link -ppython-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v-dbg.1.gz; \ |
228 | 27 | done | 34 | done |
229 | 35 | for v in $(PY3VERS); do \ | ||
230 | 36 | dh_link -ppython3-numpy /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v.1.gz; \ | ||
231 | 37 | dh_link -ppython3-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v-dbg.1.gz; \ | ||
232 | 38 | done | ||
233 | 28 | dh_link -ppython-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py-dbg.1.gz; | 39 | dh_link -ppython-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py-dbg.1.gz; |
234 | 29 | 40 | ||
235 | 30 | override_dh_install: | 41 | override_dh_install: |
236 | 31 | # add shebang information to f2py script | 42 | # add shebang information to f2py script |
238 | 32 | for v in $(PYVERS); do \ | 43 | for v in $(PY2VERS) $(PY3VERS); do \ |
239 | 33 | sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v," debian/tmp/usr/bin/f2py$$v; \ | 44 | sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v," debian/tmp/usr/bin/f2py$$v; \ |
240 | 34 | cp -a debian/tmp/usr/bin/f2py$$v debian/tmp/usr/bin/f2py$$v-dbg ; \ | 45 | cp -a debian/tmp/usr/bin/f2py$$v debian/tmp/usr/bin/f2py$$v-dbg ; \ |
241 | 35 | sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v-dbg," debian/tmp/usr/bin/f2py$$v-dbg; \ | 46 | sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v-dbg," debian/tmp/usr/bin/f2py$$v-dbg; \ |
242 | @@ -40,27 +51,39 @@ | |||
243 | 40 | cp -a debian/tmp/usr/bin/f2py$(PYDEF)-dbg debian/tmp/usr/bin/f2py-dbg | 51 | cp -a debian/tmp/usr/bin/f2py$(PYDEF)-dbg debian/tmp/usr/bin/f2py-dbg |
244 | 41 | sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python-dbg," debian/tmp/usr/bin/f2py-dbg | 52 | sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python-dbg," debian/tmp/usr/bin/f2py-dbg |
245 | 42 | 53 | ||
246 | 43 | |||
247 | 44 | dh_install | 54 | dh_install |
248 | 45 | 55 | ||
249 | 46 | # remove files installed from .install (that's due to the dir listed there) | 56 | # remove files installed from .install (that's due to the dir listed there) |
250 | 47 | find $(CURDIR)/debian/python-numpy/ -name "*_d.so" -delete | 57 | find $(CURDIR)/debian/python-numpy/ -name "*_d.so" -delete |
251 | 48 | 58 | ||
252 | 49 | # create symlinks for .h files | 59 | # create symlinks for .h files |
254 | 50 | for i in $(PYVERS); do \ | 60 | for i in $(PY2VERS); do \ |
255 | 51 | [ -d $(CURDIR)/debian/python-numpy/usr/include/python$$i ] || \ | 61 | [ -d $(CURDIR)/debian/python-numpy/usr/include/python$$i ] || \ |
256 | 52 | mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$$i; \ | 62 | mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$$i; \ |
257 | 53 | dh_link usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$$i/numpy; \ | 63 | dh_link usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$$i/numpy; \ |
258 | 54 | done | 64 | done |
260 | 55 | for i in $(PYVERS); do \ | 65 | for i in $(PY2VERS); do \ |
261 | 56 | [ -d $(CURDIR)/debian/python-numpy/usr/include/python$${i}_d ] || \ | 66 | [ -d $(CURDIR)/debian/python-numpy/usr/include/python$${i}_d ] || \ |
262 | 57 | mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$${i}_d; \ | 67 | mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$${i}_d; \ |
263 | 58 | dh_link usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \ | 68 | dh_link usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \ |
264 | 59 | done | 69 | done |
265 | 70 | # Python 3 | ||
266 | 71 | for i in $(PY3VERS); do \ | ||
267 | 72 | [ -d $(CURDIR)/debian/python3-numpy/usr/include/python$$i ] || \ | ||
268 | 73 | mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$$i; \ | ||
269 | 74 | dh_link -ppython3-numpy usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$$i/numpy; \ | ||
270 | 75 | done | ||
271 | 76 | for i in $(PY3VERS); do \ | ||
272 | 77 | [ -d $(CURDIR)/debian/python3-numpy/usr/include/python$${i}_d ] || \ | ||
273 | 78 | mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$${i}_d; \ | ||
274 | 79 | dh_link -ppython3-numpy usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \ | ||
275 | 80 | done | ||
276 | 60 | 81 | ||
277 | 61 | # share -dbg and normal package doc dirs | 82 | # share -dbg and normal package doc dirs |
278 | 62 | rm -rf debian/python-numpy-dbg/usr/share/doc/python-numpy-dbg | 83 | rm -rf debian/python-numpy-dbg/usr/share/doc/python-numpy-dbg |
280 | 63 | dh_link usr/share/doc/python-numpy usr/share/doc/python-numpy-dbg | 84 | dh_link -ppython-numpy-dbg usr/share/doc/python-numpy usr/share/doc/python-numpy-dbg |
281 | 85 | rm -rf debian/python3-numpy-dbg/usr/share/doc/python3-numpy-dbg | ||
282 | 86 | dh_link -ppython3-numpy-dbg usr/share/doc/python3-numpy usr/share/doc/python3-numpy-dbg | ||
283 | 64 | 87 | ||
284 | 65 | override_dh_gencontrol: | 88 | override_dh_gencontrol: |
285 | 66 | python debian/versions.helper >> debian/python-numpy.substvars | 89 | python debian/versions.helper >> debian/python-numpy.substvars |
286 | @@ -72,6 +95,11 @@ | |||
287 | 72 | override_dh_strip: | 95 | override_dh_strip: |
288 | 73 | ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) | 96 | ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) |
289 | 74 | dh_strip -ppython-numpy --dbg-package=python-numpy-dbg | 97 | dh_strip -ppython-numpy --dbg-package=python-numpy-dbg |
290 | 98 | dh_strip -ppython3-numpy --dbg-package=python3-numpy-dbg | ||
291 | 99 | # dh_strip seemingly doesn't catch the PEP 3149-style debug names | ||
292 | 100 | rm debian/python3-numpy/usr/lib/python3*/*-packages/*/*/*.cpython-*d*.so | ||
293 | 101 | |||
294 | 102 | # fix python-debug-in-wrong-location lintian warning | ||
295 | 75 | endif | 103 | endif |
296 | 76 | 104 | ||
297 | 77 | 105 | ||
298 | @@ -105,13 +133,25 @@ | |||
299 | 105 | 133 | ||
300 | 106 | override_dh_auto_install: | 134 | override_dh_auto_install: |
301 | 107 | dh_auto_install | 135 | dh_auto_install |
302 | 136 | |||
303 | 137 | # Install for Python 3 | ||
304 | 138 | for v in $(PY3VERS); do \ | ||
305 | 139 | python$$v setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \ | ||
306 | 140 | python$$v-dbg setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \ | ||
307 | 141 | done | ||
308 | 142 | |||
309 | 108 | # yes, we need to run tests after install | 143 | # yes, we need to run tests after install |
310 | 109 | # The reason is that numpy tries hard to not let you run it from the | 144 | # The reason is that numpy tries hard to not let you run it from the |
311 | 110 | # source directory, so we need to mess with the import order so to | 145 | # source directory, so we need to mess with the import order so to |
312 | 111 | # select the code in the installation path | 146 | # select the code in the installation path |
313 | 112 | ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) | 147 | ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) |
315 | 113 | -for v in $(PYVERS) ; do \ | 148 | -for v in $(PY2VERS) ; do \ |
316 | 114 | python$$v -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python$$v/dist-packages/') ; import numpy; numpy.test()" ; \ | 149 | python$$v -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python$$v/dist-packages/') ; import numpy; numpy.test()" ; \ |
317 | 115 | python$$v-dbg -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python$$v/dist-packages/') ; import numpy; numpy.test()" ; \ | 150 | python$$v-dbg -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python$$v/dist-packages/') ; import numpy; numpy.test()" ; \ |
318 | 116 | done | 151 | done |
319 | 152 | # Python 3.2 maps to python3/ dir alone? bah | ||
320 | 153 | -for v in $(PY3VERS) ; do \ | ||
321 | 154 | python$$v -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/') ; import numpy; numpy.test()" ; \ | ||
322 | 155 | python$$v-dbg -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/') ; import numpy; numpy.test()" ; \ | ||
323 | 156 | done | ||
324 | 117 | endif | 157 | endif |
This is in precise now: 1:1.6.1-6ubuntu1