Updated copyright and prepared the code to add scattnlay to PyPI.

COPYING

@@ -1,5 +1,5 @@
-    Copyright (C) 2009-2017 Ovidio Peña <ovidio@bytesfall.com>
-    Copyright (C) 2013-2017 Konstantin Ladutenko <kostyfisik@gmail.com>
+    Copyright (C) 2009-2018 Ovidio Peña <ovidio@bytesfall.com>
+    Copyright (C) 2013-2018 Konstantin Ladutenko <kostyfisik@gmail.com>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

Makefile

@@ -2,7 +2,7 @@ PYTHON=`which python`
 CYTHON=`which cython`
 DESTDIR=/
 PROJECT=python-scattnlay
-VERSION=2.1
+VERSION=2.2
 BUILDIR=$(CURDIR)/debian/$(PROJECT)
 SRCDIR=$(CURDIR)/src
 MULTIPREC=100

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: python-scattnlay
-Version: 2.1
+Version: 2.2
 Summary: Calculation of the scattering of EM radiation by a multilayered sphere
 Home-page: http://scattering.sourceforge.net/
 Author: Ovidio Peña Rodríguez

debian/changelog

@@ -1,3 +1,8 @@
+python-scattnlay (2.2.0-1) xenial; urgency=low
+
+  * Updated for Xenial Xerus (2.2.0-1)
+ -- Ovidio Peña Rodríguez <ovidio@bytesfall.com>  Thu, 19 Feb 2017 11:44:00 +0100
+
 python-scattnlay (2.1.0-1) xenial; urgency=low
 
   * Updated for Xenial Xerus (2.1.0-1)

debian/copyright

@@ -1,5 +1,5 @@
 This package was debianized by Ovidio Peña Rodríguez
- on Wed, 16 Jan 2017 20:13:44 +0200.
+ on Wed, 19 Feb 2018 11:50:00 +0100.
 
 It was downloaded from https://github.com/ovidiopr/scattnlay
 
@@ -9,7 +9,8 @@ Upstream Author:
 
 Copyright:
 
-    Copyright (C) 2009-2017 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
+    Copyright (C) 2009-2018 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
+    Copyright (C) 2013-2018 Konstantin Ladutenko <kostyfisik@gmail.com>
 
 License:
 
@@ -29,6 +30,10 @@ License:
     [1] O. Peña and U. Pal, "Scattering of electromagnetic radiation by
         a multilayered sphere," Computer Physics Communications,
         vol. 180, Nov. 2009, pp. 2348-2354.
+    [2] K. Ladutenko, U. Pal, A. Rivera, and O. Peña-Rodríguez, "Mie
+        calculation of electromagnetic near-field for a multilayered
+        sphere," Computer Physics Communications, vol. 214, May 2017,
+        pp. 225-230.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

debian/watch

@@ -1,2 +1,2 @@
 version=3
-http://sourceforge.net/scattering/python-scattering-(+.+)\.tar\.gz
+https://github.com/ovidiopr/scattnlay/archive/v2\.2\.0\.tar\.gz

setup.cfg

@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md

setup.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
-#    Copyright (C) 2009-2017 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
-#    Copyright (C) 2013-2017 Konstantin Ladutenko <kostyfisik@gmail.com>
+#    Copyright (C) 2009-2018 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
+#    Copyright (C) 2013-2018 Konstantin Ladutenko <kostyfisik@gmail.com>
 #
 #    This file is part of scattnlay
 #
@@ -30,12 +30,13 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '2.1'
+__version__ = '2.2'
 __title__ = 'Calculation of the scattering of EM radiation by a multilayered sphere'
 __mod__ = 'python-scattnlay'
 __author__ = 'Ovidio Peña Rodríguez'
 __email__ = 'ovidio@bytesfall.com'
-__url__ = 'http://scattering.sourceforge.net/'
+__url__ = 'https://github.com/ovidiopr/scattnlay'
+__download_url__ = 'https://github.com/ovidiopr/scattnlay/archive/v2.2.0.tar.gz'
 
 from distutils.core import setup
 from distutils.extension import Extension
@@ -55,6 +56,7 @@ O. Pena, U. Pal, Comput. Phys. Commun. 180 (2009) 2348-2354.""",
       maintainer_email = __email__,
       keywords = ['Mie scattering', 'Multilayered sphere', 'Efficiency factors', 'Cross-sections'],
       url = __url__,
+      download_url = __download_url__,
       license = 'GPL',
       platforms = 'any',
       ext_modules = [Extension("scattnlay",

src/farfield.cc

@@ -1,6 +1,6 @@
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //

src/nearfield.cc

@@ -1,6 +1,6 @@
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //

src/nmie-applied-impl.hpp

@@ -1,29 +1,23 @@
 #ifndef SRC_NMIE_APPLIED_IMPL_HPP_
 #define SRC_NMIE_APPLIED_IMPL_HPP_
-///
-/// @file   nmie-applied-impl.hpp
-/// @author Ladutenko Konstantin <kostyfisik at gmail (.) com>
-/// @date   Tue Sep  3 00:38:27 2013
-/// @copyright 2013-2016 Ladutenko Konstantin
-///
-/// nmie 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.
-///
-/// nmie-wrapper 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 nmie-wrapper.  If not, see <http://www.gnu.org/licenses/>.
-///
-/// nmie uses nmie.c from scattnlay by Ovidio Pena
-/// <ovidio@bytesfall.com> . He has an additional condition to 
-/// his library:
-//    The only additional condition is that we expect that all publications         //
-//    describing  work using this software , or all commercial products             //
+//**********************************************************************************//
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//                                                                                  //
+//    This file is part of scattnlay                                                //
+//                                                                                  //
+//    This program 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 program 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.                                  //
+//                                                                                  //
+//    The only additional remark is that we expect that all publications            //
+//    describing work using this software, or all commercial products               //
 //    using it, cite at least one of the following references:                      //
 //    [1] O. Pena and U. Pal, "Scattering of electromagnetic radiation by           //
 //        a multilayered sphere," Computer Physics Communications,                  //
@@ -32,9 +26,13 @@
 //        calculation of electromagnetic near-field for a multilayered              //
 //        sphere," Computer Physics Communications, vol. 214, May 2017,             //
 //        pp. 225-230.                                                              //
-///
-/// @brief  Wrapper class around nMie function for ease of use
-///
+//                                                                                  //
+//    You should have received a copy of the GNU General Public License             //
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.         //
+//                                                                                  //
+//    @brief  Wrapper class around nMie function for ease of use                    //
+//                                                                                  //
+//**********************************************************************************//
 #include "nmie-applied.hpp"
 #include "nmie-precision.hpp"
 #include <array>

src/nmie-applied.cc

@@ -1,27 +1,21 @@
-///
-/// @file   nmie-applied.cc
-/// @author Ladutenko Konstantin <kostyfisik at gmail (.) com>
-/// @date   Tue Sep  3 00:38:27 2013
-/// @copyright 2013,2014,2015 Ladutenko Konstantin
-///
-/// nmie 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.
-///
-/// nmie-wrapper 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 nmie-wrapper.  If not, see <http://www.gnu.org/licenses/>.
-///
-/// nmie uses nmie.c from scattnlay by Ovidio Pena
-/// <ovidio@bytesfall.com> . He has an additional condition to 
-/// his library:
-//    The only additional condition is that we expect that all publications         //
-//    describing  work using this software , or all commercial products             //
+//**********************************************************************************//
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//                                                                                  //
+//    This file is part of scattnlay                                                //
+//                                                                                  //
+//    This program 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 program 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.                                  //
+//                                                                                  //
+//    The only additional remark is that we expect that all publications            //
+//    describing work using this software, or all commercial products               //
 //    using it, cite at least one of the following references:                      //
 //    [1] O. Pena and U. Pal, "Scattering of electromagnetic radiation by           //
 //        a multilayered sphere," Computer Physics Communications,                  //
@@ -30,9 +24,13 @@
 //        calculation of electromagnetic near-field for a multilayered              //
 //        sphere," Computer Physics Communications, vol. 214, May 2017,             //
 //        pp. 225-230.                                                              //
-///
-/// @brief  Wrapper class around nMie function for ease of use
-///
+//                                                                                  //
+//    You should have received a copy of the GNU General Public License             //
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.         //
+//                                                                                  //
+//    @brief  Wrapper class around nMie function for ease of use                    //
+//                                                                                  //
+//**********************************************************************************//
 #include "nmie-applied.hpp"
 #include "nmie-applied-impl.hpp"
 #include "nmie-precision.hpp"

src/nmie-applied.hpp

@@ -1,8 +1,8 @@
 #ifndef SRC_NMIE_APPLIED_HPP_
 #define SRC_NMIE_APPLIED_HPP_
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //

src/nmie-impl.hpp

@@ -1,8 +1,8 @@
 #ifndef SRC_NMIE_IMPL_HPP_
 #define SRC_NMIE_IMPL_HPP_
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //

src/nmie-precision.hpp

@@ -1,8 +1,8 @@
 #ifndef SRC_NMIE_PRECISION_H_
 #define SRC_NMIE_PRECISION_H_
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //

src/nmie.cc

@@ -1,6 +1,6 @@
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //

src/nmie.hpp

@@ -1,8 +1,8 @@
 #ifndef SRC_NMIE_HPP_
 #define SRC_NMIE_HPP_
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //
@@ -31,7 +31,7 @@
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.         //
 //**********************************************************************************//
 
-#define VERSION "2.0"
+#define VERSION "2.2"
 #include <array>
 #include <complex>
 #include <cstdlib>

src/py_nmie.cc

@@ -1,6 +1,6 @@
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //

src/py_nmie.h

@@ -1,6 +1,6 @@
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //

src/scattnlay.pyx

@@ -1,5 +1,5 @@
-#    Copyright (C) 2009-2017 Ovidio Pena <ovidio@bytesfall.com>
-#    Copyright (C) 2013-2017 Konstantin Ladutenko <kostyfisik@gmail.com>
+#    Copyright (C) 2009-2018 Ovidio Pena <ovidio@bytesfall.com>
+#    Copyright (C) 2013-2018 Konstantin Ladutenko <kostyfisik@gmail.com>
 #
 #    This file is part of scattnlay
 #

src/shell-generator.cc

@@ -1,6 +1,6 @@
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //

src/shell-generator.hpp

@@ -1,8 +1,8 @@
 #ifndef SRC_SHELL_GENERATOR_H_
 #define SRC_SHELL_GENERATOR_H_
 //**********************************************************************************//
-//    Copyright (C) 2009-2017  Ovidio Pena <ovidio@bytesfall.com>                   //
-//    Copyright (C) 2013-2017  Konstantin Ladutenko <kostyfisik@gmail.com>          //
+//    Copyright (C) 2009-2018  Ovidio Pena <ovidio@bytesfall.com>                   //
+//    Copyright (C) 2013-2018  Konstantin Ladutenko <kostyfisik@gmail.com>          //
 //                                                                                  //
 //    This file is part of scattnlay                                                //
 //                                                                                  //