[pyfai] 05/06: update the packaging to build 0.10.0
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Oct 17 12:41:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch experimental
in repository pyfai.
commit 18440fe6dccccbde862e24984cc9d7e149bf8d86
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Fri Oct 17 14:14:20 2014 +0200
update the packaging to build 0.10.0
---
debian/changelog | 10 +++---
debian/control | 42 ++++++----------------
debian/{control => control.new} | 4 +--
debian/{pyfai.install => pyfai.install.new} | 0
...thon-pyfai.install => python-pyfai.install.new} | 0
debian/rules | 10 ++++--
6 files changed, 25 insertions(+), 41 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e28a488..1163941 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,21 @@
-pyfai (0.9.0-1) UNRELEASED; urgency=low
+pyfai (0.10.0-1) experimental; urgency=medium
- * Import new upstream version
+ * Import new upstream version (0.10.0)
* debian/control
- Bump Standrad-Version 3.9.5 (nothing to do)
- fix Build-Depends/Depends with cme
- prepare for Debian-Science team maintenance.
- - add binary package python-pyfai
* debian/copyright
- use copyright-format/1.0
* debian/rules
+ - cythonize files during the build
- use dh_numpy for better binary dependency.
- add the unittests during the build
- -- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 12 Nov 2012 15:34:53 +0100
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Fri, 17 Oct 2014 11:24:53 +0100
pyfai (0.3.5-1) unstable; urgency=low
- * Initial release (Closes: #656633)
+ * Initial release (Closes: #656633)
-- Jerome Kieffer <jerome.kieffer at esrf.fr> Fri, 20 Jan 2012 22:00:20 +0100
diff --git a/debian/control b/debian/control
index f261c9e..d09cc84 100644
--- a/debian/control
+++ b/debian/control
@@ -21,43 +21,21 @@ Homepage: http://forge.epn-campus.eu/projects/azimuthal
X-Python-Version: >= 2.6
Package: pyfai
-Architecture: all
-Depends: ${misc:Depends},
- ${python:Depends},
- python-pyfai (>= ${source:Version})
-Description: Fast Azimuthal Integration scripts
- PyFAI is a Python library for azimuthal integration; it allows the conversion
- of diffraction images taken with 2D detectors like CCD cameras into X-Ray
- powder patterns that can be used by other software like Rietveld refinement
- tools (i.e. FullProf), phase analysis or texture analysis.
- .
- As PyFAI is a library, its main goal is to be integrated in other tools like
- PyMca, LiMa or EDNA. To perform online data analysis, the precise description
- of the experimental setup has to be known. This is the reason why PyFAI
- includes geometry optimization code working on "powder rings" of reference
- samples. Alternatively, PyFAI can also import geometries fitted with other
- tools like Fit2D.
- .
- PyFAI has been designed to work with any kind of detector with any geometry
- (transmission, reflection, off-axis, ...). It uses the Python library FabIO
- to read most images taken by diffractometer.
-
-Package: python-pyfai
Architecture: any
-Section: python
Depends: ${misc:Depends},
${python:Depends},
- ${shlibs:Depends},
+ ${shlibs:Depends},
python-fabio,
python-imaging,
python-matplotlib,
python-scipy
-Recommends: python-fftw
+Recommends: python-fftw,
+ python-h5py,
+ python-pyopencl,
+ python-qt4 | python-pyside
Suggests: pymca,
python-rfoo
-Breaks: ${python:Breaks}, pyfai (<< 0.3.5-2),
-Replaces: pyfai (<< 0.3.5-2)
-Description: python library for Fast Azimuthal Integration
+Description: Fast Azimuthal Integration scripts
PyFAI is a Python library for azimuthal integration; it allows the conversion
of diffraction images taken with 2D detectors like CCD cameras into X-Ray
powder patterns that can be used by other software like Rietveld refinement
@@ -65,11 +43,11 @@ Description: python library for Fast Azimuthal Integration
.
As PyFAI is a library, its main goal is to be integrated in other tools like
PyMca, LiMa or EDNA. To perform online data analysis, the precise description
- of the experimental setup has to be known. This is the reason why PyFAI
- includes geometry optimization code working on "powder rings" of reference
- samples. Alternatively, PyFAI can also import geometries fitted with other
+ of the experimental setup has to be known. This is the reason why PyFAI
+ includes geometry optimization code working on "powder rings" of reference
+ samples. Alternatively, PyFAI can also import geometries fitted with other
tools like Fit2D.
.
PyFAI has been designed to work with any kind of detector with any geometry
- (transmission, reflection, off-axis, ...). It uses the Python library FabIO
+ (transmission, reflection, off-axis, ...). It uses the Python library FabIO
to read most images taken by diffractometer.
diff --git a/debian/control b/debian/control.new
similarity index 97%
copy from debian/control
copy to debian/control.new
index f261c9e..82ef69a 100644
--- a/debian/control
+++ b/debian/control.new
@@ -55,8 +55,8 @@ Depends: ${misc:Depends},
Recommends: python-fftw
Suggests: pymca,
python-rfoo
-Breaks: ${python:Breaks}, pyfai (<< 0.3.5-2),
-Replaces: pyfai (<< 0.3.5-2)
+Breaks: ${python:Breaks}, pyfai (<< 0.10.0-1),
+Replaces: pyfai (<< 0.10.0-1)
Description: python library for Fast Azimuthal Integration
PyFAI is a Python library for azimuthal integration; it allows the conversion
of diffraction images taken with 2D detectors like CCD cameras into X-Ray
diff --git a/debian/pyfai.install b/debian/pyfai.install.new
similarity index 100%
rename from debian/pyfai.install
rename to debian/pyfai.install.new
diff --git a/debian/python-pyfai.install b/debian/python-pyfai.install.new
similarity index 100%
rename from debian/python-pyfai.install
rename to debian/python-pyfai.install.new
diff --git a/debian/rules b/debian/rules
index e8bc872..3eab17c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,19 @@ export DH_VERBOSE=1
PYVERS=$(shell pyversions -vs)
+override_dh_auto_clean:
+ # do not remove the histogram.c file
+ touch src/histogram_omp.c
+
+ dh_auto_clean
+
override_dh_clean:
dh_clean
# remove the cython generated file to force rebuild
rm -f $(patsubst %.pyx,%.c,$(wildcard src/*.pyx))
+
override_dh_auto_install:
dh_auto_install
dh_numpy
@@ -24,5 +31,4 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
endif
%:
- dh $@ --with python2 --buildsystem=python_distutils
-
+ dh $@ --with python2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git
More information about the debian-science-commits
mailing list