[pyfai] 05/22: update the copyright with the upstream one.

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to annotated tag debian/0.12.0+dfsg-1
in repository pyfai.

commit c71a844e78937a0f1db6e1cae7216ab584567642
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Tue Jun 7 11:39:28 2016 +0200

    update the copyright with the upstream one.
---
 debian/copyright | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 96 insertions(+), 5 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index d2c4f62..2b877f8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,13 +6,13 @@ Files-Excluded: third_party
                 doc/build
 
 Files: *
-Copyright: 2011-2014 European Synchrotron Radiation Facility
-           Jerome Kieffer (jerome.kieffer at esrf.fr)
+Copyright: 2011-2016 European Synchrotron Radiation Facility
 License: GPL-3.0+
 
 Files: debian/*
-Copyright: 2012 Jerome Kieffer <jerome.kieffer at esrf.fr>
-	   2013-2015 Picca Frédéric-Emmanuel <picca at debian.org>
+Copyright: 2012-2014 Jerome Kieffer <jerome.kieffer at esrf.fr>
+	       2013-2016 Picca Frédéric-Emmanuel <picca at debian.org>
+	       2015-2016 European Synchrotron Radiation Facility
 License: GPL-3.0+
 
 Files: openCL/bitonic.cl
@@ -22,9 +22,81 @@ License: public-domain
 
 Files: src/marchingsquares.pyx
 Copyright: 2012, Almar Klein
-	   2014, Jerome Kieffer
+	       2015-2016 European Synchrotron Radiation Facility
 License: BSD-3
 
+
+Files: doc/source/mathjax.py
+Copyright: 2007-2013 by the Sphinx team
+License: BSD-3
+
+Files:  version.py
+        pyFAI/io.py
+        pyFAI/diffmap_widget.py
+        pyFAI/diffmap.py
+        pyFAI/decorators.py
+        pyFAI/distortion.py
+        pyFAI/tree.py
+        pyFAI/orderedset.py
+        pyFAI/multi_geometry.py
+        pyFAI/ocl_sort.py
+        pyFAI/ext/splitPixelFull.pyx
+        pyFAI/ext/morphology.pyx
+        pyFAI/ext/_geometry.pyx
+        pyFAI/ext/_tree.pyx
+        pyFAI/ext/_convolution.pyx
+        pyFAI/ext/_distortion.pyx
+        pyFAI/ext/splitBBox.pyx
+        pyFAI/ext/fastcrc.pyx
+        pyFAI/ext/splitPixelFullLUT.pyx
+        pyFAI/ext/sparse_utils.pyx
+        pyFAI/ext/splitPixelFullLUT_double.pyx
+        pyFAI/ext/splitPixel.pyx
+        pyFAI/ext/reconstruct.pyx
+        pyFAI/ext/splitBBoxCSR.pyx
+        pyFAI/ext/bilinear.pyx
+        pyFAI/ext/splitPixelFullCSR.pyx
+        pyFAI/ext/histogram.pyx
+        pyFAI/ext/*.pxi
+        pyFAI/ext/src/*
+        pyFAI/benchmark/*
+        pyFAI/test/test_mask.py
+        pyFAI/test/test_integrate.py
+        pyFAI/test/test_dummy.py
+        pyFAI/test/test_openCL.py
+        pyFAI/test/test_distortion.py
+        pyFAI/test/test_multi_geometry.py
+        pyFAI/test/utilstest.py
+        pyFAI/test/test_sparse.py
+        pyFAI/test/__init__.py
+        pyFAI/test/test_split_pixel.py
+        pyFAI/test/test_polarization.py
+        pyFAI/test/test_all.py
+        pyFAI/test/test_utils.py
+        pyFAI/test/test_bug_regression.py
+        pyFAI/test/test_watershed.py
+        pyFAI/test/test_io.py
+        pyFAI/test/test_bispev.py
+        pyFAI/test/test_histogram.py
+        pyFAI/test/test_marchingsquares.py
+        pyFAI/test/test_ocl_sort.py
+        pyFAI/test/test_calibrant.py
+        pyFAI/test/test_bilinear.py
+        pyFAI/test/test_saxs.py
+        pyFAI/test/test_peak_picking.py
+        pyFAI/test/test_flat.py
+        pyFAI/test/test_geometry.py
+        pyFAI/test/test_csr.py
+        pyFAI/test/test_export.py
+        pyFAI/test/test_convolution.py
+        pyFAI/test/test_geometry_refinement.py
+        pyFAI/test/test_blob_detection.py
+        pyFAI/test/test_azimuthal_integrator.py
+        run_tests.py
+Copyright: 2015-2016 European Synchrotron Radiation Facility
+License: MIT/X11 (BSD like)
+
+
 License: BSD-3
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -71,3 +143,22 @@ License: GPL-3.0+
 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)
+ 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
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git