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

[Bas 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 a2be3acfc38807dc4a154bf7cbbdcb2c028b58c0
Merge: 8707fc8 a2f442c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Nov 26 10:35:22 2016 +0100

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

 .travis.yml                  |  1 +
 CHANGELOG.md                 | 19 ++++++++++
 MANIFEST.in                  |  6 +++
 README.rst                   | 55 +++++++++++++++++++++++++++
 debian/changelog             | 22 +++++++++++
 debian/control               |  2 +-
 debian/rules                 |  2 +-
 doc/conf.py                  | 13 ++++++-
 doc/intro.rst                | 12 +++---
 lib/generic_writer.hpp       | 10 ++---
 lib/io.cc                    |  3 ++
 lib/osmium.cc                |  2 +-
 osmium/replication/server.py | 12 +++---
 osmium/version.py            | 11 ++++++
 setup.py                     | 89 ++++++++++++++++++++++++++++++++++++++++----
 test/test_io.py              |  2 +
 16 files changed, 231 insertions(+), 30 deletions(-)

diff --cc debian/changelog
index d4e6d47,def1b26..f16e12b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,31 @@@
+ pyosmium (2.10.2-1) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 21 Nov 2016 11:29:13 +0100
+ 
+ pyosmium (2.10.2-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump minimum required libosmium2-dev to 2.10.2.
+   * Drop applying-typo.patch, applied upstream.
+   * Set PYTHONPATH for documentation generation.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 16 Nov 2016 18:54:24 +0100
+ 
+ pyosmium (2.9.0-2) unstable; urgency=medium
+ 
+   * Add patch to fix 'applying' typo.
+   * Rebuild for boost1.62 transition.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 05 Nov 2016 14:35:46 +0100
+ 
 +pyosmium (2.9.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 22 Sep 2016 07:17:10 +0200
 +
  pyosmium (2.9.0-1) unstable; urgency=medium
  
    * New upstream release.

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