[pyosmium] 01/02: Merge tag 'debian/2.6.0-1' into jessie-backports

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository pyosmium.

commit 8b4a5a81c5893a4eac7c7a2e2e0620de008ff90f
Merge: 8e480bc 98d976f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 12 19:52:36 2016 +0100

    Merge tag 'debian/2.6.0-1' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 CHANGELOG.md                              |  19 +-
 README.md                                 |   2 +-
 debian/changelog                          |  11 ++
 debian/control                            |   4 +-
 debian/copyright                          |   2 +-
 debian/patches/allows-to-typo.patch       |  14 ++
 debian/patches/series                     |   1 +
 debian/python-pyosmium.lintian-overrides  |   5 +-
 debian/python3-pyosmium.lintian-overrides |   5 +-
 doc/conf.py                               |   6 +-
 doc/intro.rst                             |  75 +++++++-
 doc/ref_osm.rst                           |  33 +++-
 doc/ref_osmium.rst                        |  28 ++-
 examples/convert.py                       |  37 ++++
 examples/filter_coastlines.py             |  56 ++++++
 examples/normalize_boolean.py             |  66 +++++++
 lib/generic_handler.hpp                   |   4 +-
 lib/generic_writer.hpp                    | 278 ++++++++++++++++++++++++++++++
 lib/geom.cc                               |   2 +-
 lib/index.cc                              |   2 +-
 lib/io.cc                                 |   2 +-
 lib/osm.cc                                |  20 +--
 lib/osmium.cc                             |  43 ++++-
 osmium/__init__.py                        |   2 +-
 osmium/geom/__init__.py                   |   1 -
 osmium/index/__init__.py                  |   1 -
 osmium/io/__init__.py                     |   1 -
 osmium/osm/__init__.py                    |  14 ++
 osmium/osm/mutable.py                     |  75 ++++++++
 setup.py                                  |  15 +-
 test/test_osm.py                          |  23 ++-
 test/test_writer.py                       | 142 +++++++++++++++
 32 files changed, 933 insertions(+), 56 deletions(-)

diff --cc debian/changelog
index 562ca1a,50ad819..e0bd807
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
+ pyosmium (2.6.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update Vcs-Git URL to use HTTPS.
+   * Bump minimum required libosmium2-dev to 2.6.0.
+   * Update copyright file, update years for Sarah Hoffmann.
+   * Add patch to fix 'allows one to' typo.
+   * Update lintian override for renamed modules.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 06 Feb 2016 20:50:23 +0100
+ 
 +pyosmium (2.5.4-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 11 Dec 2015 12:27:15 +0100
 +
  pyosmium (2.5.4-1) unstable; urgency=medium
  
    * Move from experimental to unstable.
diff --cc debian/control
index ea2b6f8,5e6fecb..44d1dc7
--- a/debian/control
+++ b/debian/control
@@@ -23,7 -23,7 +23,7 @@@ Build-Depends: debhelper (>= 9)
                 zlib1g-dev
  Standards-Version: 3.9.6
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pyosmium.git/
- Vcs-Git: git://anonscm.debian.org/pkg-grass/pyosmium.git -b jessie-backports
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pyosmium.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pyosmium.git -b jessie-backports
  Homepage: http://osmcode.org/pyosmium/
  
  Package: python-pyosmium

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