Browse Source

Updated version number to 2.1 and fixed some scripts to compile the Debian package.

Ovidio Peña Rodríguez 8 years ago
parent
commit
aab2afa40d
11 changed files with 18 additions and 14 deletions
  1. 2 1
      COPYING
  2. 2 0
      MANIFEST.in
  3. 1 1
      Makefile
  4. 1 1
      PKG-INFO
  5. 0 1
      README.md
  6. 1 1
      debian/changelog
  7. 1 1
      debian/copyright
  8. 2 0
      debian/rules
  9. 2 2
      scattnlay.pyx
  10. 3 3
      setup.py
  11. 3 3
      setup_cython.py

+ 2 - 1
COPYING

@@ -1,4 +1,5 @@
-    Copyright (C) 2009-2015 Ovidio Peña <ovidio@bytesfall.com>
+    Copyright (C) 2009-2017 Ovidio Peña <ovidio@bytesfall.com>
+    Copyright (C) 2013-2017 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

+ 2 - 0
MANIFEST.in

@@ -12,6 +12,8 @@ include examples/*
 include tests/python/*
 include tests/shell/*
 include debian/*
+include doc/*
+include utils/*
 
 include go.sh
 include push-to-github.sh

+ 1 - 1
Makefile

@@ -51,7 +51,7 @@ builddeb:
 	$(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../ --prune
 	rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
 	# build the package
-	export CFLAGS='-std=c++11' && dpkg-buildpackage -i -I -rfakeroot
+	dpkg-buildpackage -i -I -rfakeroot
 
 #builddebmp:
 	# build the source package in the parent directory

+ 1 - 1
PKG-INFO

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

+ 0 - 1
README.md

@@ -39,7 +39,6 @@ To compile the Debian package you also need the following packages:
  - **cdbs (>= 0.4.49)**
 
 Compilation options
-
  - **make source** - Create source package for Python extension
  - **make cython** - Convert Cython code to C++
  - **make python_ext** - Create Python extension using C++ code

+ 1 - 1
debian/changelog

@@ -1,4 +1,4 @@
-python-scattnlay (2.0-1) trusty; urgency=low
+python-scattnlay (2.1-1) trusty; urgency=low
 
   * Updated for Utopic Unicorn
 

+ 1 - 1
debian/copyright

@@ -9,7 +9,7 @@ Upstream Author:
 
 Copyright:
 
-    Copyright (C) 2009-2015 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
+    Copyright (C) 2009-2017 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
 
 License:
 

+ 2 - 0
debian/rules

@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export CFLAGS='-std=c++11' '-Wc++0x-compat'
+
 DEB_PYTHON_SYSTEM := pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk

+ 2 - 2
scattnlay.pyx

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

+ 3 - 3
setup.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
-#    Copyright (C) 2009-2015 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
-#    Copyright (C) 2013-2015 Konstantin Ladutenko <kostyfisik@gmail.com>
+#    Copyright (C) 2009-2017 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
+#    Copyright (C) 2013-2017 Konstantin Ladutenko <kostyfisik@gmail.com>
 #
 #    This file is part of python-scattnlay
 #
@@ -26,7 +26,7 @@
 #    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.0'
+__version__ = '2.1'
 __title__ = 'Calculation of the scattering of EM radiation by a multilayered sphere'
 __mod__ = 'python-scattnlay'
 __author__ = 'Ovidio Peña Rodríguez'

+ 3 - 3
setup_cython.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
-#    Copyright (C) 2009-2015 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
-#    Copyright (C) 2013-2015 Konstantin Ladutenko <kostyfisik@gmail.com>
+#    Copyright (C) 2009-2017 Ovidio Peña Rodríguez <ovidio@bytesfall.com>
+#    Copyright (C) 2013-2017 Konstantin Ladutenko <kostyfisik@gmail.com>
 #
 #    This file is part of scattnlay
 #
@@ -26,7 +26,7 @@
 #    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.0'
+__version__ = '2.1'
 __title__ = 'Calculation of the scattering of EM radiation by a multilayered sphere'
 __mod__ = 'python-scattnlay'
 __author__ = 'Ovidio Peña Rodríguez'