[iapws] 08/16: Merge tag 'upstream/1.1.3' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository iapws.

commit 7cf32b91dfaea394ea323dc46683b9397c0be738
Merge: 034d082 57be237
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Nov 4 10:14:13 2016 +0000

    Merge tag 'upstream/1.1.3' into debian/master

 PKG-INFO                |   6 +-
 debian/changelog        |   7 +
 iapws.egg-info/PKG-INFO |   6 +-
 iapws/__init__.py       |   2 +-
 iapws/_iapws.py         |  63 +++++--
 iapws/iapws95.py        | 304 +++++++++++++++++++------------
 iapws/iapws97.py        | 470 +++++++++++++++++++++++++++---------------------
 setup.cfg               |   2 +-
 setup.py                |   5 +-
 9 files changed, 515 insertions(+), 350 deletions(-)

diff --cc debian/changelog
index 162d237,0000000..2e4152e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,68 -1,0 +1,75 @@@
++iapws (1.1.2-2) UNRELEASED; urgency=medium
++
++  * New upstream release.
++  * DH_COMPAT=10
++
++ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 04 Nov 2016 10:13:51 +0000
++
 +iapws (1.1.2-1) unstable; urgency=medium
 +
 +  * New upstream release
 +    - setup.py patch removed. 
 +  * Standards-Version: 3.9.8
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Thu, 02 Jun 2016 11:17:18 +0100
 +
 +iapws (1.1.1-2) unstable; urgency=medium
 +
 +  * Change Vcs-Git to canonical  anonscm form. 
 +  * Add new redirect-based watch file for pypi.python.org 
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Tue, 15 Dec 2015 11:47:13 +0000
 +
 +iapws (1.1.1-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * python3.patch disabled; changes merged by upstream.
 +  * Use 'xz' compression
 +  * Add Vcs-Git: to debian/control, debian-science repo.
 +
 + -- Alastair McKinstry <mckinstry at debian.org>  Tue, 16 Jun 2015 12:12:04 +0100
 +
 +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

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