[fiona] 01/02: Merge branch 'master' into ubuntu

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch ubuntu
in repository fiona.

commit 0df58db1a6644da1358950676afe21e739a32558
Merge: abfde87 b025200
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Thu Feb 5 22:44:12 2015 +0100

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog

 .travis.yml                                        |   8 +-
 CHANGES.txt                                        |  12 +
 CREDITS.txt                                        |   1 +
 README.rst                                         |   3 +
 debian/changelog                                   |   4 +-
 debian/control                                     |   7 +-
 debian/copyright                                   |  22 +-
 debian/{fiona.docbase => fiona-doc.doc-base}       |   2 +-
 debian/fiona-doc.install                           |   1 -
 debian/fiona.1                                     |   2 +-
 ...-fio-command-to-fiona-to-avoid-name-clash.patch |   4 +-
 .../0002-Fix-cython-compilation-error.patch        |  31 -
 ...utside-reference-possible-privacy-breach.patch} |  15 +-
 ...003-Update-test-to-changed-name-fio-fiona.patch |  74 ---
 debian/patches/series                              |   4 +-
 debian/rules                                       |  14 +-
 debian/watch                                       |   6 +-
 docs/data/test_uk.dbf                              | Bin 10129 -> 0 bytes
 docs/data/test_uk.gpkg                             | Bin 86016 -> 0 bytes
 docs/data/test_uk.shp                              | Bin 65156 -> 0 bytes
 docs/data/test_uk.shx                              | Bin 484 -> 0 bytes
 fiona/__init__.py                                  |  36 +-
 fiona/_drivers.pyx                                 | 236 +++++++-
 fiona/collection.py                                | 147 +----
 fiona/errors.py                                    |   3 +
 fiona/fio/bounds.py                                |  20 +-
 fiona/fio/cat.py                                   |  96 +---
 fiona/fio/cli.py                                   |   5 +-
 fiona/fio/fio.py                                   |  35 +-
 fiona/ograpi.pxd                                   |   3 +-
 fiona/ogrext.pyx                                   |  72 +--
 requirements.txt                                   |   2 +-
 setup.py                                           |  49 +-
 tests/__init__.py                                  |  10 +-
 tests/data/LICENSE.txt                             |   4 +
 tests/data/collection-pp.txt                       | 635 +++++++++++++++++++++
 tests/data/collection.txt                          |   1 +
 tests/data/coutwildrnp.dbf                         | Bin 0 -> 43233 bytes
 .../data/test_uk.prj => tests/data/coutwildrnp.prj |   0
 tests/data/coutwildrnp.shp                         | Bin 0 -> 109548 bytes
 tests/data/coutwildrnp.shx                         | Bin 0 -> 636 bytes
 tests/data/sequence-pp.txt                         | 630 ++++++++++++++++++++
 tests/data/sequence.txt                            |   2 +
 tests/data/test_gpx.gpx                            |  34 ++
 tests/fixtures.py                                  |  10 +
 tests/test_bounds.py                               |  28 +-
 tests/test_cli.py                                  |  91 +--
 tests/test_collection.py                           | 116 ++--
 tests/test_drivers.py                              |   6 +-
 tests/test_fio_bounds.py                           |  97 ++--
 tests/test_fio_cat.py                              |  63 +-
 tests/test_fio_load.py                             |  70 +++
 tests/test_geojson.py                              |   4 +-
 tests/test_geopackage.py                           |   8 +-
 tests/test_layer.py                                |  24 +-
 tests/test_listing.py                              |  12 +-
 tests/test_multiconxn.py                           |   7 +-
 tests/test_non_counting_layer.py                   |  35 ++
 tests/test_read_drivers.py                         |  26 +
 tests/test_revolvingdoor.py                        |   3 +-
 tests/test_slice.py                                |  12 +-
 tests/test_unicode.py                              |  15 +-
 tests/test_vfs.py                                  |  30 +-
 63 files changed, 2187 insertions(+), 700 deletions(-)

diff --cc debian/changelog
index ed7da18,56cbb13..bdc871f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,5 +1,6 @@@
- fiona (1.4.8-0~trusty) trusty; urgency=medium
+ fiona (1.5.0-1) unstable; urgency=medium
  
    * Initial upload (closes: #765470)
 +  * Trusty build
  
-  -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Wed, 22 Oct 2014 22:42:36 +0200
+  -- 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