[pyfai] 01/01: split package and add python3 modules
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Sep 11 12:19:37 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 7f31faf130c7a3516fabfae8f7cce08e65017ad9
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Tue Jul 28 16:27:21 2015 +0200
split package and add python3 modules
---
debian/changelog | 8 ++
debian/control | 198 ++++++++++++++++++++++++++++++++++++++-
debian/control.new | 75 ---------------
debian/copyright | 19 +---
debian/pyfai.install.new | 2 -
debian/pyfai.manpages | 1 -
debian/python-pyfai-doc.doc-base | 9 ++
debian/python-pyfai.install.new | 1 -
debian/rules | 31 +++++-
9 files changed, 239 insertions(+), 105 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cd0142c..28257bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pyfai (0.11.0+dfsg-2) unstable; urgency=medium
+
+ * Split pyfai package to follow the Debian modules name policy.
+ * Added python-pyfai, python-pyfai-dbg, python3-pyfai,
+ python3-pyfai-dbg, python-pyfai-doc
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 27 Jul 2015 16:18:27 +0200
+
pyfai (0.11.0+dfsg-1) unstable; urgency=medium
* Imported Upstream version 0.11.0+dfsg
diff --git a/debian/control b/debian/control
index b92a96a..3100567 100644
--- a/debian/control
+++ b/debian/control
@@ -5,29 +5,85 @@ Uploaders: Jerome Kieffer <jerome.kieffer at esrf.fr>,
Section: science
Priority: extra
Build-Depends: cython,
+ cython-dbg,
+ cython3,
+ cython3-dbg,
debhelper (>= 9),
dh-python,
python-all-dev,
+ python-all-dbg,
python-fabio (>= 0.2.2+dfsg~),
+ python-fabio-dbg (>= 0.2.2+dfsg~),
python-fftw,
python-h5py,
python-lxml,
+ python-lxml-dbg,
python-matplotlib,
+ python-matplotlib-dbg,
python-numpy,
+ python-numpy-dbg,
python-qt4,
+ python-qt4-dbg,
python-scipy,
- python-tk
+ python-scipy-dbg,
+ python-sphinx,
+ python-sphinxcontrib.programoutput,
+ python-tk,
+ python-tk-dbg,
+ python3-all-dev,
+ python3-all-dbg,
+ python3-fabio (>= 0.2.2+dfsg~),
+ python3-fabio-dbg (>= 0.2.2+dfsg~),
+ python3-lxml,
+ python3-lxml-dbg,
+ python3-matplotlib,
+ python3-matplotlib-dbg,
+ python3-numpy,
+ python3-numpy-dbg,
+ python3-pyqt4,
+ python3-pyqt4-dbg,
+ python3-scipy,
+ python3-scipy-dbg,
+ python3-sphinx,
+ python3-sphinxcontrib.programoutput,
+ python3-tk,
+ python3-tk-dbg
Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pyfai.git
+Vcs-Browser: https://anonscm.debian.org/cgit/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
+X-Python3-Version: >= 3.2
Package: pyfai
+Architecture: all
+Depends: ${misc:Depends},
+ ${python:Depends},
+ ${shlibs: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 (>= 0.2.2+dfsg~),
python-imaging,
python-matplotlib,
@@ -38,7 +94,10 @@ Recommends: python-fftw,
python-qt4 | python-pyside
Suggests: pymca,
python-rfoo
-Description: Fast Azimuthal Integration scripts
+Breaks: ${python:Breaks},
+ pyfai (<< 0.11.0+dfsg-2)
+Replaces: pyfai (<< 0.11.0+dfsg-2)
+Description: Fast Azimuthal Integration scripts - Python2
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
@@ -54,3 +113,134 @@ Description: Fast Azimuthal Integration scripts
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.
+ .
+ This is the Python 2 version of the package.
+
+Package: python-pyfai-dbg
+Architecture: any
+Section: debug
+Depends: ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends},
+ python-pyfai (= ${binary:Version}),
+ python-fabio-dbg (>= 0.2.2+dfsg~),
+ python-imaging-dbg,
+ python-matplotlib-dbg,
+ python-scipy-dbg
+Recommends: python-dbg,
+ python-pyopencl-dbg,
+ python-qt4-dbg
+Suggests: python-fftw-dbg,
+ python-h5py-dbg
+Description: Fast Azimuthal Integration scripts - Python2 debug
+ 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.
+ .
+ This package contains the extension built for the Python 2 debug
+ interpreter.
+
+Package: python3-pyfai
+Architecture: any
+Section: python
+Depends: ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends},
+ python3-fabio (>= 0.2.2+dfsg~),
+ python3-pil,
+ python3-matplotlib,
+ python3-scipy
+Recommends: python3-pyopencl,
+ python3-pyqt4 | python3-pyside
+Suggests: python3-fftw,
+ python3-h5py
+Description: Fast Azimuthal Integration scripts - Python3
+ 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.
+ .
+ This is the Python 3 version of the package.
+
+Package: python3-pyfai-dbg
+Architecture: any
+Section: debug
+Depends: ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends},
+ python3-pyfai (= ${binary:Version}),
+ python3-fabio-dbg (>= 0.2.2+dfsg~),
+ python3-pil-dbg,
+ python3-matplotlib-dbg,
+ python3-scipy-dbg
+Recommends: python3-dbg,
+ python3-pyopencl-dbg,
+ python3-pyqt4-dbg | python3-pyside-dbg
+Suggests: python3-fftw-dbg,
+ python3-h5py-dbg
+Description: Fast Azimuthal Integration scripts - Python3 debug
+ 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.
+ .
+ This package contains the extension built for the Python 3 debug
+ interpreter.
+
+Package: python-pyfai-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends},
+ ${sphinxdoc:Depends}
+Description: Fast Azimuthal Integration scripts - Documentation
+ 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.
+ .
+ This is the common documentation package.
diff --git a/debian/control.new b/debian/control.new
deleted file mode 100644
index 82ef69a..0000000
--- a/debian/control.new
+++ /dev/null
@@ -1,75 +0,0 @@
-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 --git a/debian/copyright b/debian/copyright
index 6ea9735..67081b5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ License: GPL-3.0+
Files: debian/*
Copyright: 2012 Jerome Kieffer <jerome.kieffer at esrf.fr>
- 2013-2014 Picca Frédéric-Emmanuel <picca at debian.org>
+ 2013-2015 Picca Frédéric-Emmanuel <picca at debian.org>
License: GPL-3.0+
Files: openCL/bitonic.cl
@@ -50,23 +50,6 @@ License: BSD-3
(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
diff --git a/debian/pyfai.install.new b/debian/pyfai.install.new
deleted file mode 100644
index 74c5069..0000000
--- a/debian/pyfai.install.new
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-
diff --git a/debian/pyfai.manpages b/debian/pyfai.manpages
deleted file mode 100644
index 43e261f..0000000
--- a/debian/pyfai.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doc/*.1
diff --git a/debian/python-pyfai-doc.doc-base b/debian/python-pyfai-doc.doc-base
new file mode 100644
index 0000000..179dd51
--- /dev/null
+++ b/debian/python-pyfai-doc.doc-base
@@ -0,0 +1,9 @@
+Document: pyfai-manual
+Title: pyFAI documentation manual
+Author: Jérôme Kieffer <kieffer at esrf.eu>
+Abstract: Fast Azimuthal Integration for images produced by 2D X-ray detector
+Section: Science/Data Analysis
+
+Format: HTML
+Index: /usr/share/doc/python-pyfai-doc/html/index.html
+Files: /usr/share/doc/python-pyfai-doc/html/*
diff --git a/debian/python-pyfai.install.new b/debian/python-pyfai.install.new
deleted file mode 100644
index 6845771..0000000
--- a/debian/python-pyfai.install.new
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/rules b/debian/rules
index d0b4777..f6c197a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,40 @@
#!/usr/bin/make -f
+export PYBUILD_NAME=pyfai
+
%:
- dh $@ --with python2 --buildsystem=pybuild
+ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
override_dh_clean:
dh_clean
- # remove the cython generated file to force rebuild
+# remove the cython generated file to force rebuild
rm -f $(patsubst %.pyx,%.c,$(wildcard src/*.pyx))
+ rm -rf build/html
+ rm -rf *.egg-info
+override_dh_auto_build:
+ dh_auto_build
+ PYBUILD_SYSTEM=custom \
+ PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} http_proxy='localhost' sphinx-build -N -bhtml doc/source build/html" dh_auto_build # H
-override_dh_auto_install:
- dh_auto_install
+override_dh_install:
dh_numpy
+ dh_numpy3
+ dh_install
+# move the scripts into fabio-viewer
+ dh_install -p pyfai debian/python-pyfai/usr/bin usr/
+# remove all scripts installed by pybuild
+ rm -rf debian/python-pyfai/usr/bin
+ rm -rf debian/python-pyfai-dbg/usr/bin
+ rm -rf debian/python3-pyfai/usr/bin
+ rm -rf debian/python3-pyfai-dbg/usr/bin
override_dh_auto_test:
# dh_auto_test -- -s custom --test-args="env PYTHONPATH={build_dir} {interpreter} test/test_all.py"
+
+override_dh_installman:
+ dh_installman -p pyfai doc/*.1
+
+override_dh_installdocs:
+ dh_installdocs "build/html" -p python-pyfai-doc
+ dh_installdocs
--
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