[Python-modules-commits] r3784 - in packages/numpy/trunk/debian (8 files)
kumanna-guest at users.alioth.debian.org
kumanna-guest at users.alioth.debian.org
Sat Dec 1 19:40:15 UTC 2007
Date: Saturday, December 1, 2007 @ 19:40:14
Author: kumanna-guest
Revision: 3784
* debian/control:
+ Don't build python-numpy-dev.
+ Build python-f2py.
+ python-numpy depends on python-f2py.
* debian/rules:
Move all f2py related installs to python-f2py.
Added:
packages/numpy/trunk/debian/python-f2py.install
packages/numpy/trunk/debian/python-f2py.manpages
(from rev 3780, packages/numpy/trunk/debian/python-numpy.manpages)
Modified:
packages/numpy/trunk/debian/changelog
packages/numpy/trunk/debian/control
packages/numpy/trunk/debian/python-numpy.install
packages/numpy/trunk/debian/rules
Deleted:
packages/numpy/trunk/debian/python-numpy-dev.install
packages/numpy/trunk/debian/python-numpy.manpages
Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog 2007-12-01 18:58:54 UTC (rev 3783)
+++ packages/numpy/trunk/debian/changelog 2007-12-01 19:40:14 UTC (rev 3784)
@@ -1,7 +1,13 @@
python-numpy (1:1.0.4-1) UNRELEASED; urgency=low
* New upstream release.
-
+ * debian/control:
+ + Don't build python-numpy-dev.
+ + Build python-f2py.
+ + python-numpy depends on python-f2py.
+ * debian/rules:
+ Move all f2py related installs to python-f2py.
+
-- Kumar Appaiah <akumar at ee.iitm.ac.in> Sun, 02 Dec 2007 00:02:58 +0530
python-numpy (1:1.0.3-2) unstable; urgency=low
Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control 2007-12-01 18:58:54 UTC (rev 3783)
+++ packages/numpy/trunk/debian/control 2007-12-01 19:40:14 UTC (rev 3784)
@@ -14,11 +14,11 @@
Package: python-numpy
Architecture: any
XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${shlibs:Depends}, python-numpy-dev (= ${binary:Version})
+Depends: ${python:Depends}, ${shlibs:Depends}, python-f2py
Suggests: python-numpy-doc, python-numpy-dbg
Replaces: python-f2py, python2.3-f2py, python2.4-f2py, python-numpy-ext (<< 1:1.0.1-1)
-Conflicts: python-f2py, python2.3-f2py, python2.4-f2py, python-scipy (<= 0.5.2-7+b1), python-matplotlib (<< 0.90.0-1)
-Provides: ${python:Provides}, python-numpy-ext
+Conflicts: python-f2py, python2.3-f2py, python2.4-f2py, python-scipy (<= 0.5.2-7+b1), python-matplotlib (<< 0.90.0-1), python-numpy-dev (<= 1:1.0.3-2)
+Provides: ${python:Provides}, python-numpy-ext, python-numpy-dev
Description: Numerical Python adds a fast array facility to the Python language
Numpy contains a powerful N-dimensional array object,
sophisticated (broadcasting) functions, tools for integrating C/C++
@@ -50,23 +50,6 @@
This package is a transitional package; it can safely be
removed after an upgrade.
-Package: python-numpy-dev
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
-Suggests: python-numpy-doc
-Replaces: python2.4-f2py
-Conflicts: python2.4-f2py
-Description: Numerical Python adds a fast array facility to the Python language
- Numpy contains a powerful N-dimensional array object,
- sophisticated (broadcasting) functions, tools for integrating C/C++
- and Fortran code, and useful linear algebra, Fourier transform, and
- random number capabilities. It derives from the old Numeric code
- base and can be used as a replacement for Numeric. It also adds the
- features introduced by numarray and can be used to replace numarray.
- Numeric users should find the transition very easy
- .
- This package contains development files to build python modules based on Numpy.
-
Package: python-numpy-doc
Section: doc
Architecture: any
@@ -80,3 +63,16 @@
Numeric users should find the transition very easy
.
This package contains documentation for f2py subpackage
+
+Package: python-f2py
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, python-numeric, python-scipy-core
+Recommends: g77 | fortran77-compiler
+Conflicts: python2.3-f2py, python-f2py-doc, python-f2py (<= 2.45.241+1926-5)
+Replaces: python2.3-f2py, python-f2py-doc
+Provides: python-f2py-doc
+Description: Fortran to Python interface generator
+ F2PY is a Python extension tool for creating Python C/API modules from
+ (handwritten or F2PY generated) signature files (or directly from Fortran
+ sources).
Added: packages/numpy/trunk/debian/python-f2py.install
===================================================================
--- packages/numpy/trunk/debian/python-f2py.install (rev 0)
+++ packages/numpy/trunk/debian/python-f2py.install 2007-12-01 19:40:14 UTC (rev 3784)
@@ -0,0 +1,3 @@
+usr/bin/f2py*
+usr/lib/python*/site-packages/numpy/f2py/*.py
+usr/lib/python*/site-packages/numpy/f2py/src
Copied: packages/numpy/trunk/debian/python-f2py.manpages (from rev 3780, packages/numpy/trunk/debian/python-numpy.manpages)
===================================================================
--- packages/numpy/trunk/debian/python-f2py.manpages (rev 0)
+++ packages/numpy/trunk/debian/python-f2py.manpages 2007-12-01 19:40:14 UTC (rev 3784)
@@ -0,0 +1 @@
+numpy/f2py/f2py.1
Deleted: packages/numpy/trunk/debian/python-numpy-dev.install
===================================================================
--- packages/numpy/trunk/debian/python-numpy-dev.install 2007-12-01 18:58:54 UTC (rev 3783)
+++ packages/numpy/trunk/debian/python-numpy-dev.install 2007-12-01 19:40:14 UTC (rev 3784)
@@ -1 +0,0 @@
-usr/lib/python*/site-packages/numpy/f2py/src
Modified: packages/numpy/trunk/debian/python-numpy.install
===================================================================
--- packages/numpy/trunk/debian/python-numpy.install 2007-12-01 18:58:54 UTC (rev 3783)
+++ packages/numpy/trunk/debian/python-numpy.install 2007-12-01 19:40:14 UTC (rev 3784)
@@ -1,8 +1,6 @@
-usr/bin/f2py*
usr/lib/python*/site-packages/numpy/*.py
usr/lib/python*/site-packages/numpy/core/
usr/lib/python*/site-packages/numpy/distutils/
-usr/lib/python*/site-packages/numpy/f2py/*.py
usr/lib/python*/site-packages/numpy/lib/
usr/lib/python*/site-packages/numpy/testing/
usr/lib/python*/site-packages/numpy/oldnumeric/
Deleted: packages/numpy/trunk/debian/python-numpy.manpages
===================================================================
--- packages/numpy/trunk/debian/python-numpy.manpages 2007-12-01 18:58:54 UTC (rev 3783)
+++ packages/numpy/trunk/debian/python-numpy.manpages 2007-12-01 19:40:14 UTC (rev 3784)
@@ -1 +0,0 @@
-numpy/f2py/f2py.1
Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules 2007-12-01 18:58:54 UTC (rev 3783)
+++ packages/numpy/trunk/debian/rules 2007-12-01 19:40:14 UTC (rev 3784)
@@ -13,7 +13,7 @@
DEB_DESTDIR=$(CURDIR)/debian/tmp
-DEB_INSTALL_MANPAGES_python-numpy := numpy/f2py/f2py.1
+DEB_INSTALL_MANPAGES_python-f2py := numpy/f2py/f2py.1
DEB_INSTALL_DOCS_python-numpy := DEV_README.txt THANKS.txt
DEB_PYTHON_PACKAGES_EXCLUDE=python-numpy-dbg
@@ -22,21 +22,11 @@
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-#cdbs_python_build_versions += 2.5
-
clean::
-rm -rf `find -name build -type d`
-rm -rf `find . -name "*.pyc" -type f`
-install/python-numpy::
- : # Adding documentation
- install -d $(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy
- cp -r $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/* \
- $(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/
- cp $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/README.txt \
- $(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/README.doc.txt
-
-
+install/python-f2py::
: # Adding links to manpages
mkdir -p debian/python-numpy/usr/share/man/man1
for v in $(PYVERS); do \
@@ -55,7 +45,6 @@
# debian/python-numpy/usr/lib/python$$v/site-packages/numpy/f2py/src/; \
# done
- : # Replace all '#!' calls to python with python
: # and make them executable
for i in `find debian/tmp -type f`; do \
sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
@@ -69,6 +58,27 @@
fi; \
done
+install/python-numpy::
+ : # Adding documentation
+ install -d $(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy
+ cp -r $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/* \
+ $(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/
+ cp $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/README.txt \
+ $(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/README.doc.txt
+
+ : # Make Python scripts executable
+ for i in `find debian/tmp -type f`; do \
+ sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
+ $$i > $$i.temp; \
+ if cmp --quiet $$i $$i.temp; then \
+ rm -f $$i.temp; \
+ else \
+ mv -f $$i.temp $$i; \
+ chmod 755 $$i; \
+ echo "fixed interpreter: $$i"; \
+ fi; \
+ done
+
binary-install/python-numpy-doc::
rst2html numpy/f2py/docs/usersguide/index.txt > $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/index.html
cp -r $(CURDIR)/numpy/f2py/docs/* $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
More information about the Python-modules-commits
mailing list