[pyosmium] 01/02: Merge tag 'debian/2.11.0-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 8ada18cfc2baec6ac93651ca93726cf1654b4402
Merge: cc06445 ccb847d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 30 19:58:07 2017 +0100

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

 CHANGELOG.md      | 13 +++++++++++--
 debian/changelog  | 21 +++++++++++++++++++++
 debian/control    |  2 +-
 debian/copyright  |  2 +-
 doc/conf.py       |  2 +-
 doc/ref_geom.rst  |  1 +
 lib/osm.cc        |  3 ++-
 osmium/version.py |  6 +++---
 8 files changed, 41 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 7e14e12,cd53dc8..e13391c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,30 @@@
+ pyosmium (2.11.0-1) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 17 Jan 2017 18:45:04 +0100
+ 
+ pyosmium (2.11.0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop patches, included upstream.
+   * Update copyright years for Sarah Hoffmann.
+   * Bump minimum required libosmium2-dev to 2.11.0.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 15 Jan 2017 21:47:38 +0100
+ 
+ pyosmium (2.10.2-2~exp1) experimental; urgency=medium
+ 
+   * Add upstream patch to fix FTBFS with libosmium 2.11.0.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 15 Jan 2017 13:41:56 +0100
+ 
 +pyosmium (2.10.2-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 26 Nov 2016 10:35:25 +0100
 +
  pyosmium (2.10.2-1) unstable; urgency=medium
  
    * Move from experimental to unstable.

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