[python-descartes] 02/04: Merge tag 'upstream/1.1.0'

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch master
in repository python-descartes.

commit 171caffe76e160a727c7d4e48eb869eeaa204908
Merge: 7f140c8 0fe3eb3
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Thu Jan 19 18:00:34 2017 +0100

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0

 PKG-INFO                        |  2 +-
 debian/changelog                |  6 ++++
 descartes.egg-info/PKG-INFO     |  2 +-
 descartes.egg-info/SOURCES.txt  |  1 +
 descartes.egg-info/requires.txt |  1 +
 descartes/patch.py              | 59 +++++++++++++++++++++----------
 descartes/tests.py              | 77 +++++++++++++++++++++++++++++++++++------
 setup.py                        | 27 +++++++--------
 8 files changed, 130 insertions(+), 45 deletions(-)

diff --cc debian/changelog
index 61d76dd,0000000..c790c82
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,0 +1,31 @@@
++python-descartes (1.1.0-1) UNRELEASED; urgency=medium
++
++  * Imported Upstream version 1.1.0
++
++ -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Thu, 19 Jan 2017 18:00:57 +0100
++
 +python-descartes (1.0.2-1) unstable; urgency=medium
 +
 +  * Team upload.
 +  * New upstream release.
 +  * Bump Standards-Version to 3.9.7, no changes.
 +  * Update Vcs-* URLs to use HTTPS.
 +  * Enable parallel builds.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 20 Feb 2016 15:34:18 +0100
 +
 +python-descartes (1.0.1-2) unstable; urgency=medium
 +
 +  * Team upload.
 +  * Fix broken watch file, use pypi.debian.net instead of pypi.python.org.
 +  * Add upstream metadata.
 +  * Ignore test failures to not fail the entire build.
 +  * Limit extended description to 72 characters per line.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 15 Aug 2015 22:09:14 +0200
 +
 +python-descartes (1.0.1-1) unstable; urgency=medium
 +
 +  * Initial release (Closes: #773430)
 +
 + -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Thu, 18 Dec 2014 22:19:30 +0100

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-descartes.git