[pyfai] 05/19: * use cme fix dpkg
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Tue Aug 29 12:34:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository pyfai.
commit 1548dbcb4506d4e45579cd08733104e6f877c22b
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Mon Jul 31 13:35:40 2017 +0200
* use cme fix dpkg
---
debian/control | 12 ++++++------
debian/copyright | 30 +++++++++++++++---------------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/debian/control b/debian/control
index 40a9d8c..c4b8fe8 100644
--- a/debian/control
+++ b/debian/control
@@ -34,8 +34,8 @@ Build-Depends: cython,
python-tk-dbg,
python3-all-dev,
python3-all-dbg,
- python3-fabio (>= 0.4.0+dfsg-2~),
- python3-fabio-dbg (>= 0.4.0+dfsg-2~),
+ python3-fabio,
+ python3-fabio-dbg,
python3-lxml,
python3-lxml-dbg,
python3-matplotlib,
@@ -51,7 +51,7 @@ Build-Depends: cython,
python3-sphinxcontrib.programoutput,
python3-tk,
python3-tk-dbg
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/pyfai.git
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/pyfai.git
Homepage: https://github.com/silx-kit/pyFAI
@@ -159,7 +159,7 @@ Section: python
Depends: ${misc:Depends},
${python3:Depends},
${shlibs:Depends},
- python3-fabio (>= 0.3.0+dfsg-1~),
+ python3-fabio,
python3-pil,
python3-matplotlib,
python3-scipy
@@ -192,7 +192,7 @@ Depends: ${misc:Depends},
${python3:Depends},
${shlibs:Depends},
python3-pyfai (= ${binary:Version}),
- python3-fabio-dbg (>= 0.3.0+dfsg-1~),
+ python3-fabio-dbg,
python3-pil-dbg,
python3-matplotlib-dbg,
python3-scipy-dbg
@@ -225,7 +225,7 @@ Architecture: all
Section: doc
Depends: ${misc:Depends},
${sphinxdoc:Depends},
- libjs-mathjax,
+ libjs-mathjax
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
diff --git a/debian/copyright b/debian/copyright
index f113133..b0b034b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: pyfai
Source: https://github.com/silx-kit/pyFAI
Files-Excluded: pyFAI/third_party
@@ -6,13 +6,13 @@ Files-Excluded: pyFAI/third_party
Files: *
Copyright: 2011-2017 European Synchrotron Radiation Facility
-License: MIT/X11 (BSD like)
+License: Expat
Files: debian/*
Copyright: 2012-2014 Jerome Kieffer <jerome.kieffer at esrf.fr>
- 2013-2017 Picca Frédéric-Emmanuel <picca at debian.org>
- 2015-2016 European Synchrotron Radiation Facility
-License: MIT/X11 (BSD like)
+ 2013-2017 Picca Frédéric-Emmanuel <picca at debian.org>
+ 2015-2016 European Synchrotron Radiation Facility
+License: Expat
Files: pyFAI/resources/openCL/bitonic.cl
openCL/bsort.cl
@@ -21,18 +21,18 @@ License: public-domain
Files: pyFAI/ext/marchingsquares.pyx
Copyright: 2012, Almar Klein
- 2015-2016 European Synchrotron Radiation Facility
-License: BSD-3
+ 2015-2016 European Synchrotron Radiation Facility
+License: BSD-3-clause
Files: doc/source/mathjax.py
Copyright: 2007-2013 by the Sphinx team
-License: BSD-3
+License: BSD-3-clause
Files: pyFAI/gui/_pyside_dynamic.py
Copyright: Copyright (c) 2011 Sebastian Wiesner <lunaryorn at gmail.com>
-License: MIT
+License: Expat
-License: BSD-3
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -58,11 +58,7 @@ 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: public-domain
- You can use this free for any purpose. It's in the public domain. It
- has no warranty
-
-License: MIT/X11 (BSD like)
+License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
@@ -80,3 +76,7 @@ License: MIT/X11 (BSD like)
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
+License: public-domain
+ You can use this free for any purpose. It's in the public domain. It
+ has no warranty
--
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