[iapws] 02/02: Debian 1.1-1 from jessie
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jun 16 11:28:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian_1.1-1
in repository iapws.
commit 9e85c024f8c08cbbc2164665458ad24d3db7fce3
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri May 1 12:10:47 2015 +0100
Debian 1.1-1 from jessie
---
debian/changelog | 44 ++++++++++++++++++++++
debian/compat | 1 +
debian/control | 29 ++++++++++++++
debian/copyright | 7 ++++
debian/patches/python3.patch | 83 +++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/patches/setup-utf8.patch | 22 +++++++++++
debian/python-iapws.install | 1 +
debian/python3-iapws.install | 1 +
debian/rules | 28 ++++++++++++++
debian/source/format | 1 +
debian/watch | 2 +
12 files changed, 221 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..f166c77
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,44 @@
+iapws (1.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 19 Oct 2014 09:06:34 +0100
+
+iapws (1.0.5-2) unstable; urgency=medium
+
+ * Include setuptools, python-scipy. Closes: #764977, #765068.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 13 Oct 2014 20:10:33 +0100
+
+iapws (1.0.5-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Remove setup patch; fixed upstream.
+ * Need new python3 patch to install and work with python3.
+ * Now at Standards-Version: 3.9.6
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 10 Oct 2014 07:57:23 +0100
+
+iapws (1.0.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Use 'xz' compression.
+ * python3.patch disabled; not needed.
+ * Minor patch needed for setup.py as README.rst is missing.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 08 Sep 2014 09:21:10 +0100
+
+iapws (1.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Move to DH_COMPAT=9, change debhelper depends version.
+ * Move to Standards-Version: 3.9.5
+ * Minor patch for python3 now needed.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 26 Feb 2014 08:50:51 +0000
+
+iapws (1.0.2-1) unstable; urgency=low
+
+ * Initial release. (Closes: #693829)
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 19 May 2013 19:12:21 +0000
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..aa6422e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,29 @@
+Source: iapws
+Section: python
+Priority: extra
+Maintainer: Alastair McKinstry <mckinstry at debian.org>
+Build-Depends: debhelper (>= 9), python-all, python3-all, python-setuptools, python3-setuptools, python-scipy, python3-scipy
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
+Homepage: http://pypi.python.org/pypi/iapws
+
+Package: python-iapws
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-scipy
+Provides: ${python:Provides}
+Description: Python implementation of the international APWS-IF97 steam tables
+ This is a Python class to model a state for liquid water or steam
+ with the Industrial Formulation IAPWS-IF97.
+ .
+ Further information on the standard is available at http://www.iapws.org
+
+Package: python3-iapws
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}, python3-scipy
+Description: Python3 implementation of the international APWS-IF97 steam tables
+ This is a Python3 class to model a state for liquid water or steam
+ with the Industrial Formulation IAPWS-IF97.
+ .
+ Further information on the standard is available at http://www.iapws.org
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..781c3f0
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,7 @@
+Copyright (C) 2012 jjgomera <jjgomera at gmail.com>
+
+Licensed under the GNU General Public License, Version 3.
+The texts of the license can be found in /usr/share/common-licenses/GPL-3
+
+The Debian packaging is Copyright (C) 2013, Alastair McKinstry <mckinstry at debian.org>,
+is licensed under the terms of the GNU GPL version 3.
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
new file mode 100644
index 0000000..473c6b9
--- /dev/null
+++ b/debian/patches/python3.patch
@@ -0,0 +1,83 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Minor patch required for python3 compatability
+Last-Updated: 2014-10-19
+Forwarded: no
+
+Index: iapws-1.1/iapws/__init__.py
+===================================================================
+--- iapws-1.1.orig/iapws/__init__.py
++++ iapws-1.1/iapws/__init__.py
+@@ -5,8 +5,8 @@ __version__ = "1.1"
+
+ import unittest
+
+-from iapws97 import IAPWS97
+-from iapws97 import (_Region1, _Region2, _Region3, _Region5,
++from .iapws97 import IAPWS97
++from .iapws97 import (_Region1, _Region2, _Region3, _Region5,
+ _Backward1_T_Ph, _Backward1_T_Ps, _Backward1_P_hs,
+ _Backward2_T_Ph, _Backward2_T_Ps, _Backward2_P_hs,
+ _h_3ab, _Backward3_T_Ph, _Backward3_v_Ph, _Backward3_T_Ps,
+@@ -14,9 +14,9 @@ from iapws97 import (_Region1, _Region2,
+ _h3a_s, _h2ab_s, _h2c3b_s, _PSat_T, _TSat_P, _h13_s,
+ _t_hs, _Backward4_T_hs, _tab_P, _top_P, _twx_P, _tef_P,
+ _txx_P, _Backward3_v_PT)
+-from iapws95 import IAPWS95, D2O
+-from iapws08 import SeaWater
+-from _iapws import (_Ice, _Sublimation_Pressure, _Melting_Pressure,
++from .iapws95 import IAPWS95, D2O
++from .iapws08 import SeaWater
++from ._iapws import (_Ice, _Sublimation_Pressure, _Melting_Pressure,
+ _Viscosity, _ThCond)
+
+
+Index: iapws-1.1/iapws/iapws95.py
+===================================================================
+--- iapws-1.1.orig/iapws/iapws95.py
++++ iapws-1.1/iapws/iapws95.py
+@@ -8,13 +8,13 @@
+ # o Heavy water formulation 2005
+ ###############################################################################
+
+-
++from __future__ import print_function
+ from scipy import exp, log
+ from scipy.optimize import fsolve
+
+-from _iapws import _fase
+-from _iapws import _Viscosity, _ThCond, _Dielectric, _Refractive
+-from iapws97 import _TSat_P
++from ._iapws import _fase
++from ._iapws import _Viscosity, _ThCond, _Dielectric, _Refractive
++from .iapws97 import _TSat_P
+
+
+ class MEoS(_fase):
+Index: iapws-1.1/iapws/iapws97.py
+===================================================================
+--- iapws-1.1.orig/iapws/iapws97.py
++++ iapws-1.1/iapws/iapws97.py
+@@ -8,8 +8,8 @@ from math import sqrt, log, exp
+
+ from scipy.optimize import fsolve
+
+-from _iapws import M, R, Tc, Pc, rhoc, Tt, Pt, Tb, Dipole, f_acent, _fase
+-from _iapws import _Viscosity, _ThCond, _Tension, _Dielectric, _Refractive
++from ._iapws import M, R, Tc, Pc, rhoc, Tt, Pt, Tb, Dipole, f_acent, _fase
++from ._iapws import _Viscosity, _ThCond, _Tension, _Dielectric, _Refractive
+
+
+ sc = 4.41202148223476 # Critic entropy
+Index: iapws-1.1/iapws/iapws08.py
+===================================================================
+--- iapws-1.1.orig/iapws/iapws08.py
++++ iapws-1.1/iapws/iapws08.py
+@@ -8,7 +8,7 @@
+ from __future__ import division
+ from math import log
+
+-from iapws95 import IAPWS95
++from .iapws95 import IAPWS95
+
+
+ # Constants
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..912e4bf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+python3.patch
+setup-utf8.patch
diff --git a/debian/patches/setup-utf8.patch b/debian/patches/setup-utf8.patch
new file mode 100644
index 0000000..cca8317
--- /dev/null
+++ b/debian/patches/setup-utf8.patch
@@ -0,0 +1,22 @@
+Index: iapws-1.1/setup.py
+===================================================================
+--- iapws-1.1.orig/setup.py
++++ iapws-1.1/setup.py
+@@ -1,10 +1,13 @@
+ from setuptools import setup
+-
++import sys
+ from iapws import __version__
+
+-
+-with open('README.rst') as file:
+- long_description = file.read()
++if sys.version_info[0] < 3:
++ with open('README.rst') as file:
++ long_description = file.read()
++else:
++ with open('README.rst', encoding='utf8') as file:
++ long_description = file.read()
+
+ setup(
+ name='iapws',
diff --git a/debian/python-iapws.install b/debian/python-iapws.install
new file mode 100644
index 0000000..dbdb301
--- /dev/null
+++ b/debian/python-iapws.install
@@ -0,0 +1 @@
+/usr/lib/python2*
diff --git a/debian/python3-iapws.install b/debian/python3-iapws.install
new file mode 100644
index 0000000..fef6392
--- /dev/null
+++ b/debian/python3-iapws.install
@@ -0,0 +1 @@
+/usr/lib/python3*
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..c43f306
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+PYTHON2=$(shell pyversions -vr)
+PYTHON3=$(shell py3versions -vr)
+
+# magic debhelper rule
+%:
+ dh $@ --with python2,python3
+
+build-python%:
+ python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+ dh_auto_build
+
+install-python%:
+ python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
+ dh_auto_install
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf build
+ rm -rf *.egg-info
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..d8a3caf
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pypi.python.org/packages/source/i/iapws/iapws-(.+).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/iapws.git
More information about the debian-science-commits
mailing list