[pyfai] 02/04: Imported Debian patch 0.10.2-1
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Jan 2 14:15:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository pyfai.
commit 91cc0ded3429708381dc8149928802e0ee9bfa4c
Merge: f5c3704 bebe4e5
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Fri Oct 24 09:01:53 2014 +0100
Imported Debian patch 0.10.2-1
CHANGELOG.txt | 108 +-
MANIFEST.in | 62 +
PKG-INFO | 30 +
README.TXT | 64 -
README.txt | 163 +
TODO.txt | 28 +-
benchmark/Fairchild.poni | 9 +
benchmark/Frelon2k.poni | 10 +
benchmark/Mar3450.poni | 11 +
benchmark/Pilatus1M.poni | 10 +
benchmark/Pilatus6M.poni | 10 +
benchmark/benchmark.py | 567 +
benchmark/benchmark_distortion.py | 52 +
benchmark/benchmark_ocl_csr3.py | 428 +
benchmark/benchmark_split.py | 752 +
benchmark/frelon.spline | 111 +
benchmark/halfccd.poni | 10 +
benchmark/halfccd.spline | 29 +
build-deb.sh | 21 +-
calibration/AgBh.D | 10 +
calibration/Au.D | 18 +
calibration/C14H30O.D | 13 +
calibration/CeO2.D | 41 +
calibration/Cr2O3.D | 21 +
calibration/CrOx.D | 8 +
calibration/LaB6.D | 62 +
calibration/NaCl.D | 18 +
calibration/PBBA.D | 81 +
calibration/Si.D | 16 +
calibration/alpha_Al2O3.D | 32 +
calibration/ref-sample.ods | Bin 33537 -> 0 bytes
debian/changelog | 17 +-
debian/compat | 2 +-
debian/control | 48 +-
debian/control.new | 75 +
debian/copyright | 72 +-
debian/gbp.conf | 2 +
debian/manpages | 3 -
...tream-histogram-build-when-.c-file-is-mis.patch | 34 +
...r-upstream-skip-test-if-QT4-not-available.patch | 38 +
debian/patches/series | 2 +
debian/pyFAI-calib.1 | 20 -
debian/pyFAI-saxs.1 | 72 -
debian/pyFAI-waxs.1 | 27 -
debian/pyfai.install.new | 2 +
debian/pyfai.manpages | 1 +
debian/python-pyfai.install.new | 1 +
debian/rules | 38 +-
debian/watch | 2 +-
doc/MX-calibrate.1 | 157 +
doc/MX-calibrate.pdf | Bin 0 -> 7268 bytes
doc/check_calib.1 | 50 +
doc/check_calib.pdf | Bin 0 -> 4435 bytes
doc/detector2nexus.1 | 56 +
doc/detector2nexus.pdf | Bin 0 -> 4273 bytes
doc/diff_tomo.1 | 74 +
doc/diff_tomo.pdf | Bin 0 -> 4990 bytes
doc/drawMask_pymca.1 | 27 +
doc/drawMask_pymca.pdf | Bin 0 -> 3989 bytes
doc/pyFAI-average.1 | 47 +
doc/pyFAI-average.pdf | Bin 0 -> 4479 bytes
doc/pyFAI-calib.1 | 187 +
doc/pyFAI-calib.pdf | Bin 0 -> 8635 bytes
doc/pyFAI-integrate.1 | 50 +
doc/pyFAI-integrate.pdf | Bin 0 -> 4551 bytes
doc/pyFAI-recalib.1 | 188 +
doc/pyFAI-recalib.pdf | Bin 0 -> 9054 bytes
doc/pyFAI-saxs.1 | 65 +
doc/pyFAI-saxs.pdf | Bin 0 -> 4728 bytes
doc/pyFAI-waxs.1 | 76 +
doc/pyFAI-waxs.pdf | Bin 0 -> 5667 bytes
doc/pyFAI.pdf | Bin 0 -> 1062868 bytes
doc/refine_wavelength.1 | 10 +
doc/refine_wavelength.pdf | Bin 0 -> 3586 bytes
doc/source/api/modules.rst | 15 +
doc/source/api/pyFAI.rst | 188 +
doc/source/biblio.rst | 72 +
doc/source/calibration.rst | 132 +
doc/source/conf.py | 269 +
doc/source/img/2Dhistogram.png | Bin 0 -> 172906 bytes
doc/source/img/2DwithSplit.png | Bin 0 -> 165756 bytes
doc/source/img/benchmark.png | Bin 0 -> 94791 bytes
doc/source/img/drawMask.png | Bin 0 -> 214148 bytes
doc/source/img/integrate.png | Bin 0 -> 84137 bytes
doc/source/img/notebook.png | Bin 0 -> 87995 bytes
doc/source/img/pyFAI.png | Bin 0 -> 299245 bytes
doc/source/index.rst | 37 +
doc/source/man/MX-calibrate.rst | 90 +
doc/source/man/check_calib.rst | 37 +
doc/source/man/diff_tomo.rst | 52 +
doc/source/man/drawMask_pymca.rst | 29 +
doc/source/man/pyFAI-average.rst | 33 +
doc/source/man/pyFAI-calib.rst | 155 +
doc/source/man/pyFAI-integrate.rst | 38 +
doc/source/man/pyFAI-recalib.rst | 123 +
doc/source/man/pyFAI-saxs.rst | 44 +
doc/source/man/pyFAI-waxs.rst | 51 +
doc/source/man/scripts.rst | 39 +
doc/source/mathjax.py | 69 +
doc/source/project.rst | 181 +
doc/source/pyFAI.rst | 261 +
gui/integration.ui | 834 +
gui/refine-6param.ui | 361 +
openCL/ocl_azim_CSR.cl | 424 +
openCL/ocl_azim_LUT.cl | 131 +
openCL/ocl_azim_kernel2d_2.cl | 338 +
openCL/ocl_azim_kernel_2.cl | 354 +
openCL/ocl_bispev.cl | 211 +
openCL/ocl_hist_pixelsplit.cl | 397 +
openCL/ocl_lut_pixelsplit.cl | 629 +
openCL/ocl_lut_pixelsplit2.cl | 628 +
openCL/ocl_lut_pixelsplit3.cl | 645 +
openCL/ocl_lut_pixelsplit_test.cl | 629 +
openCL/preprocess.cl | 232 +
openCL/reduction_test.cl | 117 +
openCL/reduction_test4.cl | 130 +
pyFAI-src/__init__.py | 28 +-
pyFAI-src/argparse.py | 2353 ++
pyFAI-src/azimuthalIntegrator.py | 4030 +-
pyFAI-src/blob_detection.py | 894 +
pyFAI-src/calibrant.py | 298 +
pyFAI-src/calibration.py | 1894 +
pyFAI-src/detectors.py | 1898 +
pyFAI-src/directories.py | 47 +
pyFAI-src/distortion.py | 724 +
pyFAI-src/geometry.py | 1555 +-
pyFAI-src/geometryRefinement.py | 456 +-
pyFAI-src/gui_utils.py | 145 +
pyFAI-src/histogram_ocl.py | 0
pyFAI-src/integrate_widget.py | 738 +
pyFAI-src/io.py | 747 +
pyFAI-src/massif.py | 291 +
pyFAI-src/ocl_azim.py | 746 +
pyFAI-src/ocl_azim_csr.py | 352 +
pyFAI-src/ocl_azim_csr_dis.py | 383 +
pyFAI-src/ocl_azim_kernel.cl | 331 -
pyFAI-src/ocl_azim_lut.py | 342 +
pyFAI-src/ocl_hist_pixelsplit.py | 354 +
pyFAI-src/opencl.py | 375 +
pyFAI-src/peakPicker.py | 637 -
pyFAI-src/peak_picker.py | 1072 +
pyFAI-src/processor.py | 254 +
pyFAI-src/refinment2D.py | 260 +
pyFAI-src/spline.py | 745 +-
pyFAI-src/units.py | 98 +
pyFAI-src/utils.py | 1094 +-
pyFAI-src/worker.py | 587 +
scripts/MX-calibrate | 63 +
scripts/check_calib | 56 +
scripts/detector2nexus | 152 +
scripts/diff_tomo | 306 +
scripts/drawMask_pymca | 96 +
scripts/pyFAI-average | 115 +
scripts/pyFAI-calib | 222 +-
scripts/pyFAI-integrate | 118 +
scripts/pyFAI-recalib | 62 +
scripts/pyFAI-saxs | 215 +-
scripts/pyFAI-waxs | 219 +-
scripts/refine_wavelength | 188 +
setup.cfg | 13 +-
setup.py | 653 +-
src/_bispev.c | 20381 +++++++++
src/_bispev.pyx | 240 +
src/_blob.c | 20493 ++++++++++
src/_blob.pyx | 115 +
src/_convolution.c | 20217 +++++++++
src/_convolution.pyx | 166 +
src/_distortion.c | 40827 +++++++++++++++++++
src/_distortion.pyx | 1206 +
src/_distortionCSR.c | 28990 +++++++++++++
src/_distortionCSR.pyx | 533 +
src/_geometry.c | 20766 ++++++++++
src/_geometry.pyx | 221 +
src/bilinear.c | 29006 +++++++++++--
src/bilinear.html | 808 -
src/bilinear.pyx | 307 +-
src/crc32.c | 145 +
src/crc32.h | 4 +
src/crc32.pxd | 6 +
src/{bilinear.c => fastcrc.c} | 4086 +-
src/fastcrc.pyx | 46 +
src/histogram.c | 21331 +++++++---
src/histogram.html | 4426 --
src/histogram.pyx | 405 +-
src/histogram_nomp.c | 21067 ++++++++++
src/histogram_nomp.pyx | 203 +
src/histogram_omp.c | 21652 ++++++++++
src/histogram_omp.pyx | 237 +
src/marchingsquares.c | 21817 ++++++++++
src/marchingsquares.pyx | 218 +
src/morphology.c | 19418 +++++++++
src/morphology.pyx | 109 +
src/paraSplitBBox.pyx | 464 +
src/reconstruct.c | 19756 +++++++++
src/reconstruct.pyx | 142 +
src/relabel.c | 16956 +++++++-
src/relabel.html | 949 -
src/relabel.pyx | 83 +-
src/sparse_csr.c | 19214 +++++++++
src/sparse_csr.pyx | 65 +
src/splitBBox.c | 27111 +++++++++---
src/splitBBox.html | 4968 ---
src/splitBBox.pyx | 528 +-
src/splitBBoxCSR.c | 37871 +++++++++++++++++
src/splitBBoxCSR.pyx | 1313 +
src/splitBBoxLUT.c | 38566 ++++++++++++++++++
src/splitBBoxLUT.pyx | 1268 +
src/splitBBoxLUT_vector.c | 34351 ++++++++++++++++
src/splitBBoxLUT_vector.pyx | 1118 +
src/splitPixel.c | 28602 ++++++++++---
src/splitPixel.html | 5369 ---
src/splitPixel.pyx | 715 +-
src/splitPixelFull.c | 21992 ++++++++++
src/splitPixelFull.pyx | 295 +
src/splitPixelFullCSR.c | 25557 ++++++++++++
src/splitPixelFullCSR.pyx | 1012 +
src/splitPixelFullLUT.c | 25613 ++++++++++++
src/splitPixelFullLUT.pyx | 494 +
src/splitPixelFullLUT_b.c | 25612 ++++++++++++
src/splitPixelFullLUT_b.pyx | 986 +
src/splitPixelFullLUT_double.c | 27529 +++++++++++++
src/splitPixelFullLUT_double.pyx | 547 +
src/splitPixelFullLUT_float32_b.c | 25620 ++++++++++++
src/splitPixelFullLUT_float32_b.pyx | 1028 +
src/xutils.c | 3926 +-
src/xutils.html | 1792 -
src/xutils.pyx | 52 +-
stdeb.cfg | 9 +-
test/__init__.py | 0
test/moke.poni | 10 +
test/testHistogram.py | 241 -
test/testPeakPicking.py | 138 -
test/test_all.py | 101 +-
...lIntegrator.py => test_azimuthal_integrator.py} | 149 +-
test/test_bilinear.py | 115 +
test/test_bispev.py | 111 +
test/test_blob_detection.py | 91 +
test/test_calibrant.py | 136 +
test/test_convolution.py | 85 +
test/test_csr.py | 151 +
test/test_detector.py | 212 +
test/test_distortion.py | 106 +
test/test_export.py | 141 +
test/test_flat.py | 162 +
test/test_geometry.py | 237 +
...ryRefinement.py => test_geometry_refinement.py} | 95 +-
test/test_histogram.py | 313 +
test/test_integrate.py | 186 +
test/test_io.py | 153 +
test/test_marchingsquares.py | 71 +
test/test_mask.py | 229 +
test/test_ocl_lut.py | 110 +
test/test_openCL.py | 184 +
test/test_peak_picking.py | 142 +
test/test_polarization.py | 102 +
test/test_saxs.py | 145 +
test/test_sparse.py | 84 +
test/test_split_pixel.py | 121 +
test/test_utils.py | 155 +
test/testimages/Fairchild.edf | 200 +
test/testimages/Frelon2k.edf | Bin 0 -> 8389632 bytes
test/testimages/Frelon2k.poni | 10 +
test/testimages/LaB6.poni | 10 +
test/testimages/LaB6_0020.edf | Bin 0 -> 4198400 bytes
test/testimages/LaB6_260210.mar3450 | Bin 0 -> 7473209 bytes
test/testimages/Pilatus1M.edf | Bin 0 -> 4093756 bytes
test/testimages/Pilatus1M.poni | 10 +
test/testimages/Pilatus6M.cbf | Bin 0 -> 6230840 bytes
test/testimages/Pilatus6M.poni | 10 +
test/testimages/fit2d.dat | 1155 +
test/testimages/frelon.spline | 111 +
test/testimages/halfccd.edf | Bin 0 -> 4198400 bytes
test/testimages/halfccd.fit2d.edf | Bin 0 -> 8389632 bytes
test/testimages/halfccd.poni | 10 +
test/testimages/halfccd.spline | 29 +
test/testimages/moke.tif | Bin 0 -> 300356 bytes
test/testimages/powder_200_2_0001.cbf | Bin 0 -> 6240756 bytes
test/testimages/powder_200_2_0001.chi | 1770 +
test/testimages/testMask.edf | Bin 0 -> 4093244 bytes
test/utilstest.py | 335 +-
280 files changed, 698382 insertions(+), 48882 deletions(-)
diff --cc debian/changelog
index 24e5865,0000000..06887eb
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,20 @@@
++pyfai (0.10.2-1) unstable; urgency=medium
++
++ * Import new upstream version (0.10.2)
++ * debian/control
++ - Bump Standrad-Version 3.9.6 (nothing to do)
++ - fix Build-Depends/Depends with cme
++ - prepare for Debian-Science team maintenance.
++ * debian/copyright
++ - use copyright-format/1.0
++ * debian/rules
++ - cythonize files during the build
++ - use dh_numpy for better binary dependency.
++
++ -- Picca Frédéric-Emmanuel <picca at debian.org> Fri, 24 Oct 2014 09:01: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 --cc debian/compat
index 45a4fb7,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 8
++9
diff --cc debian/control
index 65f331e,0000000..70e99d4
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,31 -1,0 +1,53 @@@
+Source: pyfai
- Maintainer: Jerome Kieffer <jerome.kieffer at esrf.fr>
++Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
++Uploaders: Jerome Kieffer <jerome.kieffer at esrf.fr>,
++ Picca Frédéric-Emmanuel <picca at debian.org>
+Section: science
+Priority: extra
- Build-Depends: python-setuptools, python-all-dev (>= 2.5), debhelper (>= 8), python-numpy
- Standards-Version: 3.9.2
++Build-Depends: cython,
++ debhelper (>= 9),
++ python-all-dev,
++ python-fabio,
++ python-fftw,
++ python-lxml,
++ python-matplotlib,
++ python-numpy,
++ python-scipy,
++ python-tk
++Standards-Version: 3.9.6
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pyfai.git
++Vcs-Git: git://anonscm.debian.org/debian-science/packages/pyfai.git
+Homepage: http://forge.epn-campus.eu/projects/azimuthal
- XS-Python-Version: >= 2.6
++X-Python-Version: >= 2.6
+
+Package: pyfai
+Architecture: any
- Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python-imaging, python-numpy, python-matplotlib, python-scipy, python-fabio
- Recommends: python-numpy-ext, python-fftw
- Suggests: pymca, python-rfoo
- Description: python library for Fast Azimuthal Integration
++Depends: ${misc:Depends},
++ ${python:Depends},
++ ${shlibs:Depends},
++ python-fabio,
++ python-imaging,
++ python-matplotlib,
++ python-scipy
++Recommends: python-fftw,
++ python-h5py,
++ python-pyopencl,
++ python-qt4 | python-pyside
++Suggests: pymca,
++ python-rfoo
++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
++ 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 --cc debian/control.new
index 0000000,0000000..82ef69a
new file mode 100644
--- /dev/null
+++ b/debian/control.new
@@@ -1,0 -1,0 +1,75 @@@
++Source: pyfai
++Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
++Uploaders: Jerome Kieffer <jerome.kieffer at esrf.fr>,
++ Picca Frédéric-Emmanuel <picca at debian.org>
++Section: science
++Priority: extra
++Build-Depends: cython,
++ debhelper (>= 9),
++ python-all-dev,
++ python-fabio,
++ python-fftw,
++ python-lxml,
++ python-matplotlib,
++ python-numpy,
++ python-scipy,
++ python-tk
++Standards-Version: 3.9.5
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pyfai.git
++Vcs-Git: git://anonscm.debian.org/debian-science/packages/pyfai.git
++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},
++ python-fabio,
++ python-imaging,
++ python-matplotlib,
++ python-scipy
++Recommends: python-fftw
++Suggests: pymca,
++ python-rfoo
++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
++ 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.
diff --cc debian/copyright
index 18b75be,0000000..0d783a6
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,74 -1,0 +1,118 @@@
- Format: http://dep.debian.net/deps/dep5
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: pyfai
- Source: https://forge.epn-campus.eu/projects/azimuthal/files
++Source: https://github.com/kif/pyFAI
+
+Files: *
- Copyright: 2011-2012 European Synchrotron Radiation Facility
++Copyright: 2011-2014 European Synchrotron Radiation Facility
+ Jerome Kieffer (jerome.kieffer at esrf.fr)
+License: GPL-3.0+
+
- Files: test/utilstest.py
- Copyright: 2011-2012 European Synchrotron Radiation Facility
- Jerome Kieffer (jerome.kieffer at esrf.fr)
- License: LGPL-3.0+
-
- Files: pyFAI-src/ocl_azim_kernel.cl
- Copyright: 2011 European Synchrotron Radiation Facility
- Dimitris Karkoulis (karkouli at esrf.fr)
- License: LGPL-3.0+
-
+Files: debian/*
+Copyright: 2012 Jerome Kieffer <jerome.kieffer at esrf.fr>
++ 2013-2014 Picca Frédéric-Emmanuel <picca at debian.org>
+License: GPL-2.0+
+
++Files: pyFAI-src/argparse.py
++Copyright: 2006-2009 Steven J. Bethard <steven.bethard at gmail.com>.
++License: Apache 2.0
++
++Files: src/marchingsquares.pyx
++Copyright: 2012, Almar Klein
++ 2014, Jerome Kieffer
++License: BSD-3
++
++License: Apache 2.0
++ Licensed to the Apache Software Foundation (ASF) under one or more
++ contributor license agreements. See the NOTICE file distributed with
++ this work for additional information regarding copyright ownership.
++ The ASF licenses this file to You under the Apache License, Version 2.0
++ (the "License"); you may not use this file except in compliance with
++ the License. You may obtain a copy of the License at
++ .
++ http://www.apache.org/licenses/LICENSE-2.0
++ .
++ Unless required by applicable law or agreed to in writing, software
++ distributed under the License is distributed on an "AS IS" BASIS,
++ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ See the License for the specific language governing permissions and
++ limitations under the License.
++ .
++ On Debian systems, the full text of the Apache Software License version 2 can
++ be found in the file `/usr/share/common-licenses/Apache-2.0'.
++
++License: BSD-3
++ Redistribution and use in source and binary forms, with or without
++ modification, are permitted provided that the following conditions
++ are met:
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++ * Redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the following
++ disclaimer in the documentation and/or other materials provided
++ with the distribution.
++ * Neither the name of the <organization> nor the names of its
++ contributors may be used to endorse or promote products derived
++ from this software without specific prior written permission.
++.
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT
++ HOLDER> BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
++ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
+License: GPL-2.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-3.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: LGPL-3.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
-
diff --cc debian/gbp.conf
index 0000000,0000000..f68d262
new file mode 100644
--- /dev/null
+++ b/debian/gbp.conf
@@@ -1,0 -1,0 +1,2 @@@
++[DEFAULT]
++debian-branch = master
diff --cc debian/patches/0001-fix-for-upstream-histogram-build-when-.c-file-is-mis.patch
index 0000000,0000000..05a2524
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-fix-for-upstream-histogram-build-when-.c-file-is-mis.patch
@@@ -1,0 -1,0 +1,34 @@@
++From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?=
++ <picca at synchrotron-soleil.fr>
++Date: Fri, 17 Oct 2014 14:17:50 +0200
++Subject: fix for upstream histogram build when .c file is missing
++
++---
++ setup.py | 13 ++++++++-----
++ 1 file changed, 8 insertions(+), 5 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 5d64589..43e5121 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -52,12 +52,15 @@ def copy(infile, outfile, folder=None):
++ if folder:
++ infile = os.path.join(folder, infile)
++ outfile = os.path.join(folder, outfile)
++- if os.path.exists(outfile):
++- os.unlink(outfile)
++- if "link" in dir(os):
++- os.link(infile, outfile)
+++ if os.path.exists(infile):
+++ if os.path.exists(outfile):
+++ os.unlink(outfile)
+++ if "link" in dir(os):
+++ os.link(infile, outfile)
+++ else:
+++ shutil.copy(infile, outfile)
++ else:
++- shutil.copy(infile, outfile)
+++ print("Skipping copy of %s -> %s which is missing" % (infile, outfile))
++
++
++ cmdclass = {}
diff --cc debian/patches/0002-fix-for-upstream-skip-test-if-QT4-not-available.patch
index 0000000,0000000..f33602c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-fix-for-upstream-skip-test-if-QT4-not-available.patch
@@@ -1,0 -1,0 +1,38 @@@
++From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?=
++ <picca at synchrotron-soleil.fr>
++Date: Mon, 20 Oct 2014 16:44:30 +0200
++Subject: fix for upstream skip test if QT4 not available
++
++---
++ test/test_peak_picking.py | 11 +++++++++--
++ 1 file changed, 9 insertions(+), 2 deletions(-)
++
++diff --git a/test/test_peak_picking.py b/test/test_peak_picking.py
++index 59e635f..f075c9b 100755
++--- a/test/test_peak_picking.py
+++++ b/test/test_peak_picking.py
++@@ -41,15 +41,22 @@ import fabio
++ from utilstest import UtilsTest, Rwp, getLogger
++ logger = getLogger(__file__)
++ pyFAI = sys.modules["pyFAI"]
++-import pyFAI.peak_picker
+++
+++NO_PEAK_PICKER = False
+++try:
+++ import pyFAI.peak_picker
+++ from pyFAI.peak_picker import PeakPicker
+++except ImportError:
+++ NO_PEAK_PICKER = True
+++
++ import pyFAI.geometryRefinement
++-from pyFAI.peak_picker import PeakPicker
++ from pyFAI.calibrant import Calibrant
++ from pyFAI.geometryRefinement import GeometryRefinement
++ if logger.getEffectiveLevel() <= logging.INFO:
++ import pylab
++
++
+++ at unittest.skipIf(NO_PEAK_PICKER, "cannot import peak_peaker")
++ class test_peak_picking(unittest.TestCase):
++ """basic test"""
++ calibFile = "1788/moke.tif"
diff --cc debian/patches/series
index 0000000,0000000..589bb7c
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-fix-for-upstream-histogram-build-when-.c-file-is-mis.patch
++0002-fix-for-upstream-skip-test-if-QT4-not-available.patch
diff --cc debian/pyfai.install.new
index 0000000,0000000..74c5069
new file mode 100644
--- /dev/null
+++ b/debian/pyfai.install.new
@@@ -1,0 -1,0 +1,2 @@@
++usr/bin
++
diff --cc debian/pyfai.manpages
index 0000000,0000000..43e261f
new file mode 100644
--- /dev/null
+++ b/debian/pyfai.manpages
@@@ -1,0 -1,0 +1,1 @@@
++doc/*.1
diff --cc debian/python-pyfai.install.new
index 0000000,0000000..6845771
new file mode 100644
--- /dev/null
+++ b/debian/python-pyfai.install.new
@@@ -1,0 -1,0 +1,1 @@@
++usr/lib
diff --cc debian/rules
index bcebae9,0000000..bf4eb23
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,0 +1,40 @@@
+#!/usr/bin/make -f
+
- %:
- dh $@ --with python2 --buildsystem=python_distutils
++export DH_VERBOSE=1
++
++PYVERS=$(shell pyversions -vs)
++
++# do not remove the histogram.c file this code is there
++# beacuse git-buildpackage is run without eh patch applyed. It
++# will be possible to get rid of this once the patch applyed
++# upstream.
++override_dh_auto_clean:
++ 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
++
++#override_dh_auto_test:
++# dh_auto_test
++#ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
++# set -e -x; \
++# for py in $(PYVERS); do \
++# env http_proxy='localhost' python$$py setup.py test;\
++# done
++#endif
++
++#skip tests
++override_dh_auto_test:
++
++%:
++ dh $@ --with python2
diff --cc debian/watch
index 610dba1,0000000..3977308
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
+version=3
- https://forge.epn-campus.eu/attachments/download/.*/pyFAI-(.+)\.tar\.gz
++http://forge.epn-campus.eu/projects/azimuthal/files .*pyFAI-(.+)_full\.tar\.gz
--
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