Updated copyright

2 files changed, 90 insertions, 100 deletions

diff --git a/debian/changelog b/debian/changelog
index 4cbcca5..63eb867 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ pymca (5.4.0+dfsg-1) UNRELEASED; urgency=medium
   * New upstream version 5.4.0+dfsg
   * d/control
     + python[3]-fisx[-dbg] (>= 1.1.4 -> 1.1.6)
-
+  * d/copyright Updated with upstream informations.
   * d/tests
     - Moves all tests inside control.
 
diff --git a/debian/copyright b/debian/copyright
index b441644..4dc74fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,19 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: PyMCA
+Upstream-Name: PyMca5
 Upstream-Contact: V. Armando Sole <sole@esrf.fr>
 Files-Excluded: PyMca5/PyMcaMath/sift third-party/qhull third-party/fisx
  third-party/khronos_headers
 
 Files: *
-Copyright: 2004-2017, European Synchrotron Radiation Facility
+Copyright: 2004-2018 European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/*
-Copyright: 1995-2017, European Synchrotron Radiation Facility
+Copyright: 2002, 2004-2018, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/Object3D/*
-Copyright: 2004-2017, V.A. Sole, European Synchrotron Radiation Facility
+Copyright: 2004-2018 European Synchrotron Radiation Facility
 License: LGPL-2+
 
 Files: PyMca5/Object3D/Object3DCTools/*
@@ -22,47 +22,31 @@ License: Expat
 
 Files: PyMca5/Object3D/Object3DCTools/Object3DCTools.c
   PyMca5/Object3D/Object3DCTools/setup.py
-Copyright: 2004-2017, V.A. Sole, European Synchrotron Radiation Facility
+Copyright: 2004-2015, V.A. Sole, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/Object3D/Object3DQhull/*
-Copyright: 1995-2017, European Synchrotron Radiation Facility
+Copyright: 2004-2014 European Synchrotron Radiation Facility (ESRF)
 License: Expat
 
 Files: PyMca5/Object3D/Object3DQhull/Object3DQhull.c
-Copyright: 2004-2017, V.A. Sole, European Synchrotron Radiation Facility
-License: LGPL-2+
-
-Files: PyMca5/Object3D/Object3DQhull/_qhull/*
-Copyright: 2004-2014, European Synchrotron Radiation Facility (ESRF)
-License: Expat
-
-Files: PyMca5/Object3D/qtconffile
-Copyright: 2004-2013, European Synchrotron Radiation Facility
+Copyright: 2004-2015, V.A. Sole, European Synchrotron Radiation Facility
 License: LGPL-2+
 
 Files: PyMca5/Object3D/scripts/*
 Copyright: 2002, 2004-2015, European Synchrotron Radiation Facility
 License: Expat
 
-Files: PyMca5/Object3D/scripts/object3d_win_post_install.py
-Copyright: 1995-2017, European Synchrotron Radiation Facility
-License: Expat
-
 Files: PyMca5/PyMca/*
-Copyright: 2004-2017, V.A. Sole, European Synchrotron Radiation Facility
+Copyright: 2004-2015, V.A. Sole, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaCore/XiaCorrect.py
-Copyright: 2004-2015, E. Papillon, European Synchrotron Radiation Facility
+Copyright: 2004-2014, E. Papillon, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaData/*
-Copyright: 2004-2014, European Synchrotron Radiation Facility (ESRF)
-License: Expat
-
-Files: PyMca5/PyMcaGraph/ctools/_ctools/cython/_ctools.c
-Copyright: 2002, 2004-2015, European Synchrotron Radiation Facility
+Copyright: 2004-2018 European Synchrotron Radiation Facility (ESRF)
 License: Expat
 
 Files: PyMca5/PyMcaGraph/ctools/_ctools/include/InsidePolygonWithBounds.h
@@ -74,80 +58,81 @@ Copyright: Paul Bourke
 License: Expat
 
 Files: PyMca5/PyMcaGui/*
-Copyright: 2004-2017, V.A. Sole, European Synchrotron Radiation Facility
+Copyright: 2004-2018 European Synchrotron Radiation Facility (ESRF)
 License: Expat
 
 Files: PyMca5/PyMcaGui/io/QEdfFileWidget.py
-  PyMca5/PyMcaGui/io/QSpecFileWidget.py
   PyMca5/PyMcaGui/io/QSpsWidget.py
   PyMca5/PyMcaGui/io/SpecFileCntTable.py
   PyMca5/PyMcaGui/io/SpecFileMcaTable.py
-Copyright: 2004-2017, E. Papillon, V.A. Sole, European Synchrotron Radiation Facility
+Copyright: 2004-2015, E. Papillon, V.A. Sole, European Synchrotron Radiation Facility
 License: Expat
 
-Files: PyMca5/PyMcaGui/io/hdf5/HDF5Widget.py
-Copyright: 2004-2017, V.A. Sole, ESRF - D. Dale CHESS
+Files: PyMca5/PyMcaGui/io/QSpecFileWidget.py
+Copyright: 2004-2014, E. Papillon, V.A. Sole, European Synchrotron Radiation Facility / < other.text)
 License: Expat
 
-Files: PyMca5/PyMcaGui/math/fitting/RateLawWindow.py
-Copyright: 1995-2017, European Synchrotron Radiation Facility
+Files: PyMca5/PyMcaGui/io/hdf5/HDF5Widget.py
+Copyright: 2004-2018, V.A. Sole, ESRF - D. Dale CHESS
 License: Expat
 
-Files: PyMca5/PyMcaGui/misc/TableWidget.py
-Copyright: 1995-2017, European Synchrotron Radiation Facility
+Files: PyMca5/PyMcaGui/misc/QIPythonWidget.py
+Copyright: 2004-2018 European Synchrotron Radiation Facility (ESRF)
 License: Expat
 
 Files: PyMca5/PyMcaGui/physics/*
-Copyright: 1995-2017, European Synchrotron Radiation Facility
+Copyright: 2002, 2004-2018, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaGui/plotting/ImageView.py
-  PyMca5/PyMcaGui/plotting/Toolbars.py
   PyMca5/PyMcaGui/plotting/_ImageProfile.py
-Copyright: 1995-2017, European Synchrotron Radiation Facility
+Copyright: 2002, 2004-2015, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaGui/pymca/PyMca_help.py
-Copyright: 2004-2017, E. Papillon, V.A. Sole, European Synchrotron Radiation Facility
+Copyright: 2004-2015, E. Papillon, V.A. Sole, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaGui/pymca/StackROIBatchWindow.py
   PyMca5/PyMcaGui/pymca/StackXASBatchWindow.py
-Copyright: 1995-2017, European Synchrotron Radiation Facility
+Copyright: 2002, 2004-2015, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaGui/pymca/SumRulesTool.py
   PyMca5/PyMcaGui/pymca/XMCDWindow.py
-Copyright: 2004-2017, T. Rueter, European Synchrotron Radiation Facility
+Copyright: 2004-2015, T. Rueter, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaGui/pymca/XiaCorrectWizard.py
-Copyright: 2004-2015, E. Papillon, European Synchrotron Radiation Facility
+Copyright: 2004-2014, E. Papillon, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaIO/MEDFile.py
 Copyright: 2010, Matthew Newville, The University of Chicago
 License: Expat
 
-Files: PyMca5/PyMcaIO/NumpyStack.py
-Copyright: 2016, Diamond Light Source
+Files: PyMca5/PyMcaIO/PyMcaIOHelper/*
+Copyright: 2004-2015, V.A. Sole, European Synchrotron Radiation Facility
 License: Expat
 
-Files: PyMca5/PyMcaIO/PyMcaIOHelper/*
-Copyright: 2004-2017, V.A. Sole, European Synchrotron Radiation Facility
+Files: PyMca5/PyMcaIO/specfile/*
+Copyright: 2004-2018 European Synchrotron Radiation Facility
 License: Expat
 
-Files: PyMca5/PyMcaIO/specfile/MANIFEST.in
-Copyright: 2004-2013, European Synchrotron Radiation Facility
-License: LGPL-2+
+Files: PyMca5/PyMcaIO/specfile/include/locale_management.h
+Copyright: 2004-2018, European Synchrotron Radiation Facility
+License: Expat
 
-Files: PyMca5/PyMcaIO/specfile/src/specfile_py.c
-  PyMca5/PyMcaIO/specfile/src/specfile_py3.c
-Copyright: 2004-2015, European Synchrotron Radiation Facility
-License: LGPL-2+
+Files: PyMca5/PyMcaIO/specfile/setup.py
+Copyright: 2002, 2004-2015, European Synchrotron Radiation Facility
+License: Expat
+
+Files: PyMca5/PyMcaIO/specfile/src/*
+Copyright: 2004-2018, European Synchrotron Radiation Facility
+License: Expat
 
 Files: PyMca5/PyMcaIO/sps/Include/*
-Copyright: 1998-2017, European Synchrotron Radiation Facility (ESRF)
+Copyright: 1998-2015, European Synchrotron Radiation Facility (ESRF)
 License: Expat
 
 Files: PyMca5/PyMcaIO/sps/Include/spec_shm.h
@@ -156,35 +141,50 @@ License: Expat
 
 Files: PyMca5/PyMcaIO/sps/Include/sps.h
 Copyright: 1998-2013, Certified Scientific Software (CSS)
-  1998-2010, European Synchrotron Radiation Facility (ESRF)
+  1998-2011, European Synchrotron Radiation Facility (ESRF)
 License: Expat
 
 Files: PyMca5/PyMcaIO/sps/Include/sps_lut.h
-Copyright: 2004-2009, European Synchrotron Radiation Facility
-License: GPL-2+
-
-Files: PyMca5/PyMcaIO/sps/MANIFEST.in
-Copyright: 2002, 2004-2015, European Synchrotron Radiation Facility
+Copyright: 2004-2018, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaIO/sps/Src/sps.c
-Copyright: 1998-2016, European Synchrotron Radiation Facility (ESRF)
-  1998-2016, Certified Scientific Software (CSS)
+Copyright: 1998-2013, Certified Scientific Software (CSS)
+  1998-2011, European Synchrotron Radiation Facility (ESRF)
 License: Expat
 
 Files: PyMca5/PyMcaIO/sps/Src/sps_py.c
-Copyright: 1998-2017, European Synchrotron Radiation Facility (ESRF)
+Copyright: 1998-2015, European Synchrotron Radiation Facility (ESRF)
 License: Expat
 
 Files: PyMca5/PyMcaMath/PyMcaSciPy/*
-Copyright: 2005, Travis Oliphant
-  2003-2009, SciPy Developers.
-  2001, 2002, Enthought, Inc.
+Copyright: 1999-2005 Travis Oliphant
+ 2001-2002 Enthought, Inc.
+ 2002 Eric Jones
+ 2002 Patrick J. Miller
+ 2002-2003 Jochen Kuepper
+ 2002-2004 Pearu Peterson
+ 2002-2005 Jean-Sebastien Roy
+ 2003-2005 Peter J. Verveer
+ 2003-2006 Ed Schofield
+ 2003-2012 SciPy Developers.
+ 2004 David M. Cooke
+ 2006 Bart Vandereycken
+ 2006 BasSw
+ 2006 Johannes Loehnert
+ 2007 Andrew D Straw
+ 2007 John Travers, Robert Hetland
+ 2007-2008 Damian Eads
+ 2008 Tiziano Zito
+ Gary Strangman
+ 2010 Pauli Virtanen
+ 2010, 2011 Pim Schellart
+ 2009 Yosef Meller
 License: BSD-3-clause
 
 Files: PyMca5/PyMcaMath/PyMcaSciPy/signal/__init__.py
   PyMca5/PyMcaMath/PyMcaSciPy/signal/median.py
-Copyright: 1995-2017, European Synchrotron Radiation Facility
+Copyright: 2002, 2004-2015, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaMath/SGModule.py
@@ -196,23 +196,16 @@ Copyright: 2008, 2009, Uwe Schmitt, uschmitt@mineway.de
 License: BSD-3-clause
 
 Files: PyMca5/PyMcaMath/mva/py_nnma/*
-Copyright: 2008, 2009, Uwe Schmitt, uschmitt@mineway.de
+Copyright: 2008 Uwe Schmitt, uschmitt@mineway.de,
+ 2007 D. Kim, S.  Sra and I. S. Dhillon
 License: BSD-3-clause
 
-Files: PyMca5/PyMcaPhysics/xas/_xas/cython/*
-Copyright: 2002, 2004-2015, European Synchrotron Radiation Facility
-License: Expat
-
-Files: PyMca5/PyMcaPhysics/xas/_xas/cython/_xas.pyx
-Copyright: 1995-2017, European Synchrotron Radiation Facility
-License: Expat
-
 Files: PyMca5/PyMcaPlugins/*
-Copyright: 2004-2017, V.A. Sole, European Synchrotron Radiation Facility
+Copyright: 2004-2018, V.A. Sole, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaPlugins/AdvancedAlignmentScanPlugin.py
-Copyright: 2004-2015, T. Rueter, V.A. Sole, European Synchrotron Radiation Facility
+Copyright: 2004-2014, T. Rueter, V.A. Sole, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaPlugins/MedianFilterScanDeglitchPlugin.py
@@ -222,46 +215,34 @@ License: Expat
 Files: PyMca5/PyMcaPlugins/MotorInfoPlugin.py
   PyMca5/PyMcaPlugins/MotorInfoWindow.py
   PyMca5/PyMcaPlugins/XMCDPlugin.py
-Copyright: 2004-2017, T. Rueter, European Synchrotron Radiation Facility
+Copyright: 2004-2015, T. Rueter, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaPlugins/MultipleScanToMeshPlugin.py
-Copyright: 2004-2016, M. Rovezzi, V.A. Sole European Synchrotron Radiation Facility
+Copyright: 2004-2014, M. Rovezzi, V.A. Sole European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/PyMcaPlugins/optional/*
-Copyright: 2004-2015, V.A. Sole, T. Coutinho, European Synchrotron Radiation Facility
+Copyright: 2002, 2004-2015, European Synchrotron Radiation Facility
 License: Expat
 
-Files: PyMca5/PyMcaPlugins/optional/JsonRpc1DPlugin.py
-Copyright: 1995-2017, European Synchrotron Radiation Facility
+Files: PyMca5/PyMcaPlugins/optional/TaurusPlugin1D.py
+Copyright: 2004-2015, V.A. Sole, T. Coutinho, European Synchrotron Radiation Facility
 License: Expat
 
 Files: PyMca5/__init__.py
-Copyright: 2004-2017, V.A. Sole, European Synchrotron Radiation Facility
-License: Expat
-
-Files: PyMca5/scripts/*
-Copyright: 2002, 2004-2015, European Synchrotron Radiation Facility
-License: Expat
-
-Files: build-deb.sh
-Copyright: 2015-2017, European Synchrotron Radiation Facility, Grenoble, France
+Copyright: 2004-2015, V.A. Sole, European Synchrotron Radiation Facility
 License: Expat
 
 Files: debian/*
-Copyright: 2010-2015, Picca Frederic-Emmanuel <picca@debian.org>
-  2009, 2010, Teemu Ikonen <tpikonen@gmail.com>
-License: Expat
+Copyright: 2009-2010 Teemu Ikonen <tpikonen@gmail.com>
+           2010-2015 Picca Frederic-Emmanuel <picca@debian.org>
+License: GPL-2+
 
 Files: scripts/*
 Copyright: 2004-2013, V. Armando Sole - ESRF
 License: Expat
 
-Files: version.py
-Copyright: 1995-2017, European Synchrotron Radiation Facility
-License: Expat
-
 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:
@@ -308,6 +289,15 @@ License: Expat
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
+License: GPL-2+
+ This toolkit 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.
+ .
+ In Debian systems, the GNU General Public License version 2 can be found
+ at /usr/share/common-licenses/GPL-2
+
 License: LGPL-2+
  This toolkit is free software; you can redistribute
  it and/or modify it under the terms of the GNU Lesser General Public