[Python-modules-commits] r27169 - in packages/numpy/trunk/debian (8 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Sat Jan 11 18:32:07 UTC 2014
Date: Saturday, January 11, 2014 @ 18:32:06
Author: jtaylor-guest
Revision: 27169
use dh_python2 instead of deprecated pysupport
Modified:
packages/numpy/trunk/debian/changelog
packages/numpy/trunk/debian/control
packages/numpy/trunk/debian/python-numpy-dbg.install
packages/numpy/trunk/debian/python-numpy.install
packages/numpy/trunk/debian/python3-numpy-dbg.install
packages/numpy/trunk/debian/python3-numpy.install
packages/numpy/trunk/debian/rules
Deleted:
packages/numpy/trunk/debian/python-numpy.links
Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog 2014-01-11 18:32:02 UTC (rev 27168)
+++ packages/numpy/trunk/debian/changelog 2014-01-11 18:32:06 UTC (rev 27169)
@@ -2,6 +2,7 @@
* add autopkgtests running testsuite with different BLAS and testing f2py
and distutils (Closes: #695881)
+ * use dh_python2 instead of deprecated pysupport
-- Julian Taylor <jtaylor.debian at googlemail.com> Sat, 11 Jan 2014 18:39:03 +0100
Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control 2014-01-11 18:32:02 UTC (rev 27168)
+++ packages/numpy/trunk/debian/control 2014-01-11 18:32:06 UTC (rev 27169)
@@ -15,7 +15,6 @@
python-nose,
python-numpydoc,
python-sphinx (>= 1.0.7+dfsg),
- python-support (>= 1),
python-tz,
python3-all-dbg,
python3-all-dev,
Modified: packages/numpy/trunk/debian/python-numpy-dbg.install
===================================================================
--- packages/numpy/trunk/debian/python-numpy-dbg.install 2014-01-11 18:32:02 UTC (rev 27168)
+++ packages/numpy/trunk/debian/python-numpy-dbg.install 2014-01-11 18:32:06 UTC (rev 27169)
@@ -1 +1,3 @@
+usr/bin/f2py-dbg
+usr/bin/f2py2.?-dbg
usr/lib/python2*/*-packages/*/*/*_d.so
Modified: packages/numpy/trunk/debian/python-numpy.install
===================================================================
--- packages/numpy/trunk/debian/python-numpy.install 2014-01-11 18:32:02 UTC (rev 27168)
+++ packages/numpy/trunk/debian/python-numpy.install 2014-01-11 18:32:06 UTC (rev 27169)
@@ -1,5 +1,7 @@
debian/dh_numpy usr/bin
debian/versions usr/share/numpy/
+usr/bin/f2py
+usr/bin/f2py2.?
usr/lib/python2*/*-packages/*.egg-info
usr/lib/python2*/*-packages/*/*.py
usr/lib/python2*/*-packages/*/*/*/libnpymath.a
@@ -20,3 +22,4 @@
usr/lib/python2*/*-packages/numpy/polynomial/
usr/lib/python2*/*-packages/numpy/random/
usr/lib/python2*/*-packages/numpy/testing/
+usr/lib/python2*/*-packages/numpy/tests/
Deleted: packages/numpy/trunk/debian/python-numpy.links
===================================================================
--- packages/numpy/trunk/debian/python-numpy.links 2014-01-11 18:32:02 UTC (rev 27168)
+++ packages/numpy/trunk/debian/python-numpy.links 2014-01-11 18:32:06 UTC (rev 27169)
@@ -1,7 +0,0 @@
-usr/share/pyshared/numpy/numarray/include/numpy/nummacro.h usr/share/pyshared/numpy/core/include/numpy/nummacro.h
-usr/share/pyshared/numpy/numarray/include/numpy/cfunc.h usr/share/pyshared/numpy/core/include/numpy/cfunc.h
-usr/share/pyshared/numpy/numarray/include/numpy/numcomplex.h usr/share/pyshared/numpy/core/include/numpy/numcomplex.h
-usr/share/pyshared/numpy/numarray/include/numpy/ieeespecial.h usr/share/pyshared/numpy/core/include/numpy/ieeespecial.h
-usr/share/pyshared/numpy/numarray/include/numpy/libnumarray.h usr/share/pyshared/numpy/core/include/numpy/libnumarray.h
-usr/share/pyshared/numpy/numarray/include/numpy/arraybase.h usr/share/pyshared/numpy/core/include/numpy/arraybase.h
-usr/share/pyshared/numpy/core/include/numpy usr/include/numpy
Modified: packages/numpy/trunk/debian/python3-numpy-dbg.install
===================================================================
--- packages/numpy/trunk/debian/python3-numpy-dbg.install 2014-01-11 18:32:02 UTC (rev 27168)
+++ packages/numpy/trunk/debian/python3-numpy-dbg.install 2014-01-11 18:32:06 UTC (rev 27169)
@@ -1 +1,3 @@
+usr/bin/f2py3-dbg
+usr/bin/f2py3.?-dbg
usr/lib/python3*/*-packages/*/*/*.cpython-*d*.so
Modified: packages/numpy/trunk/debian/python3-numpy.install
===================================================================
--- packages/numpy/trunk/debian/python3-numpy.install 2014-01-11 18:32:02 UTC (rev 27168)
+++ packages/numpy/trunk/debian/python3-numpy.install 2014-01-11 18:32:06 UTC (rev 27169)
@@ -1,4 +1,6 @@
debian/dh_numpy3 usr/bin
+usr/bin/f2py3
+usr/bin/f2py3.?
usr/lib/python3*/*-packages/*.egg-info
usr/lib/python3*/*-packages/*/*.py
usr/lib/python3*/*-packages/*/*/*.cpython-3?[!d]*.so
@@ -19,3 +21,4 @@
usr/lib/python3*/*-packages/numpy/polynomial/
usr/lib/python3*/*-packages/numpy/random/
usr/lib/python3*/*-packages/numpy/testing/
+usr/lib/python3*/*-packages/numpy/tests/
Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules 2014-01-11 18:32:02 UTC (rev 27168)
+++ packages/numpy/trunk/debian/rules 2014-01-11 18:32:06 UTC (rev 27169)
@@ -12,7 +12,7 @@
export ATLAS=None
%:
- dh $@ --with sphinxdoc,python3
+ dh $@ --with sphinxdoc,python2,python3
override_dh_auto_build:
dh_auto_build
@@ -25,8 +25,8 @@
dh_auto_clean
rm -rf `find -name build -type d`
rm -rf `find . -name "*.pyc" -type f`
- rm -rf debian/tmp2
rm -rf doc/fontList.cache numpy/f2py/docs/usersguide/index.html
+ rm -rf doc/source/reference/generated
override_dh_installman:
dh_installman -ppython-numpy numpy/f2py/f2py.1
@@ -63,39 +63,35 @@
cp -a debian/tmp/usr/bin/f2py$(PY3DEF)-dbg debian/tmp/usr/bin/f2py3-dbg
sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python3-dbg," debian/tmp/usr/bin/f2py3-dbg
- # moving those scripts away until after pysupport has run, to not
- # generate depends on pythonx.y
- mkdir debian/tmp2
- mv debian/tmp/usr/bin/* debian/tmp2
-
dh_install
# remove files installed from .install (that's due to the dir listed there)
find $(CURDIR)/debian/python-numpy/ -name "*_d.so" -delete
# create symlinks for .h files
+ dh_link -ppython-numpy usr/lib/python$(PYDEF)/dist-packages/numpy/core/include/numpy usr/include/numpy;
set -e; for i in $(PY2VERS); do \
[ -d $(CURDIR)/debian/python-numpy/usr/include/python$$i ] || \
mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$$i; \
- dh_link usr/lib/pymodules/python$$i/numpy/core/include/numpy usr/include/python$$i/numpy; \
+ dh_link -ppython-numpy usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$$i/numpy; \
done
set -e; for i in $(PY2VERS); do \
- [ -d $(CURDIR)/debian/python-numpy/usr/include/python$${i}_d ] || \
- mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$${i}_d; \
- dh_link -ppython-numpy-dbg usr/lib/pymodules/python$$i/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \
+ [ -d $(CURDIR)/debian/python-numpy-dbg/usr/include/python$${i}_d ] || \
+ mkdir -p $(CURDIR)/debian/python-numpy-dbg/usr/include/python$${i}_d; \
+ dh_link -ppython-numpy-dbg usr/lib/python$$i/dist-packages/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \
done
# Python 3
set -e; for i in $(PY3VERS); do \
ABITAG=`python$$i -c "import sys; print(sys.abiflags)"`; \
- [ -d $(CURDIR)/debian/python3-numpy/usr/include/python$${i}$$ABITAG ] || \
- mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$${i}$$ABITAG; \
- dh_link -ppython3-numpy usr/lib/python3/dist-packages/numpy/core/include/numpy usr/include/python$${i}$$ABITAG/numpy; \
+ [ -d $(CURDIR)/debian/python3-numpy/usr/include/python$$i$$ABITAG ] || \
+ mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$$i$$ABITAG; \
+ dh_link -ppython3-numpy usr/lib/python3/dist-packages/numpy/core/include/numpy usr/include/python$$i$$ABITAG/numpy; \
done
set -e; for i in $(PY3VERS); do \
ABITAG=`python$$i-dbg -c "import sys; print(sys.abiflags)"`; \
- [ -d $(CURDIR)/debian/python3-numpy/usr/include/python$${i}$$ABITAG ] || \
- mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$${i}$$ABITAG; \
- dh_link -ppython3-numpy usr/lib/python3/dist-packages/numpy/core/include/numpy/ usr/include/python$${i}$$ABITAG/numpy; \
+ [ -d $(CURDIR)/debian/python3-numpy-dbg/usr/include/python$${i}$$ABITAG ] || \
+ mkdir -p $(CURDIR)/debian/python3-numpy-dbg/usr/include/python$${i}$$ABITAG; \
+ dh_link -ppython3-numpy-dbg usr/lib/python3/dist-packages/numpy/core/include/numpy/ usr/include/python$${i}$$ABITAG/numpy; \
done
# share -dbg and normal package doc dirs
@@ -118,44 +114,19 @@
dh_strip -ppython3-numpy --dbg-package=python3-numpy-dbg
# dh_strip seemingly doesn't catch the PEP 3149-style debug names
rm debian/python3-numpy/usr/lib/python3*/*-packages/*/*/*.cpython-3?d*.so
-
- # fix python-debug-in-wrong-location lintian warning
- cd debian/python-numpy-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
endif
-override_dh_pysupport:
- dh_pysupport
+override_dh_python2:
+ dh_python2 -v -X libnpymath.a
- # copy back f2py* bin, in their ultimate location
- mv debian/tmp2/f2py2.? debian/tmp2/f2py debian/python-numpy/usr/bin/
- mkdir -p debian/python-numpy-dbg/usr/bin/
- mv debian/tmp2/f2py2.?-dbg debian/tmp2/f2py-dbg debian/python-numpy-dbg/usr/bin/
-
- mkdir -p debian/python3-numpy/usr/bin/
- mv debian/tmp2/f2py3.? debian/tmp2/f2py3 debian/python3-numpy/usr/bin/
- mkdir -p debian/python3-numpy-dbg/usr/bin/
- mv debian/tmp2/f2py3.?-dbg debian/tmp2/f2py3-dbg debian/python3-numpy-dbg/usr/bin/
-
- # GIGANTIC HACK - add back libnpymath.a
- # get the file names, generate the new location, create the dir if missing, copy
- # the file and then add it to the public list
- set -e; for file in ./debian/tmp/usr/lib/python2.*/*-packages/numpy/core/lib/libnpymath.a ; do \
- newfile=$$(echo $$file | sed 's|tmp|python-numpy|' | sed "s|lib/python|lib/pyshared/python|" | sed 's|[^/]*-packages/||') ;\
- mkdir -p $$(dirname $$newfile) ;\
- cp -a $$file $$newfile ;\
- installedfile=$$(echo $$newfile | sed 's|./debian/python-numpy||') ;\
- # add to public modules list ;\
- echo $$installedfile >> ./debian/python-numpy/usr/share/python-support/python-numpy.public ;\
- done
-
override_dh_sphinxdoc:
dh_sphinxdoc -i
build: build-arch build-indep ;
build-arch:
- dh build
+ dh build --with=python2,python3
build-indep:
More information about the Python-modules-commits
mailing list