[fiona] 02/03: Merge tag 'upstream/1.6.1'

[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 fiona.

commit e2a847c6726f38522e076155544f3a94086032e5
Merge: d46f760 23e1e30
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Wed Aug 19 23:57:30 2015 +0200

    Merge tag 'upstream/1.6.1'
    
    Upstream version 1.6.1

 CHANGES.txt         |  13 +++++
 CREDITS.txt         |  48 +++++++++----------
 debian/changelog    |   4 +-
 fiona/__init__.py   |   2 +-
 fiona/fio/info.py   |  34 +++++++++----
 fiona/fio/main.py   |   8 ++--
 fiona/ogrext.pyx    |  24 +++++++++-
 setup.py            |   8 +++-
 tests/test_props.py | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 9 files changed, 231 insertions(+), 45 deletions(-)

diff --cc debian/changelog
index d4dd498,0000000..c3bea49
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,0 +1,38 @@@
- fiona (1.6.0-1) UNRELEASED; urgency=medium
++fiona (1.6.1-1) UNRELEASED; urgency=medium
 +
 +  * Imported Upstream version 1.6.0
 +  * Fix patch for new release
++  * Skip tests as in travis build
++  * Imported Upstream version 1.6.1
 +
 + -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Sun, 02 Aug 2015 01:10:12 +0200
 +
 +fiona (1.5.1-2) unstable; urgency=medium
 +
 +  * Team upload.
 +  * Apply patch by Steve Langasek to build-depend on python*-all-dev.
 +    (closes: #793645)
 +  * Update watch file to handle other tar extensions in filenamemangle.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 26 Jul 2015 00:33:14 +0200
 +
 +fiona (1.5.1-1) unstable; urgency=medium
 +
 +  * Make build reproducible (Closes: #788308)
 +  * Imported Upstream version 1.5.1
 +
 + -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Wed, 10 Jun 2015 22:01:07 +0200
 +
 +fiona (1.5.0-2) unstable; urgency=medium
 +
 +  * Initial upload, after FTP-master comment about missing license 
 +  * Add license for docs/manual.rst (CC-BY-3.0-US)
 +  * Fix compatibility with Cython 0.22
 +
 + -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Tue, 02 Jun 2015 19:59:43 +0200
 +
 +fiona (1.5.0-1) unstable; urgency=medium
 +
 +  * Initial upload (closes: #765470)
 +
 + -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Thu, 05 Feb 2015 16:23:03 +0100

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