[libosmium] 01/02: Merge tag 'debian/2.11.1-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 libosmium.

commit c8f97ea659d6782c15e16e5c7fa08aa68c1e8aad
Merge: eefd5d8 b5d22f1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Mar 13 07:51:54 2017 +0100

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

 CHANGELOG.md                                  | 14 +++++++++++---
 CMakeLists.txt                                |  2 +-
 debian/changelog                              | 14 ++++++++++++++
 debian/gbp.conf                               |  2 +-
 include/osmium/builder/builder.hpp            | 18 +++++++++++++++++-
 include/osmium/builder/osm_object_builder.hpp | 20 +++++++++++---------
 include/osmium/io/reader.hpp                  |  8 +++++---
 include/osmium/tags/filter.hpp                |  2 +-
 include/osmium/version.hpp                    |  4 ++--
 test/CMakeLists.txt                           |  1 +
 test/t/io/test_reader_fileformat.cpp          | 10 ++++++++++
 11 files changed, 74 insertions(+), 21 deletions(-)

diff --cc debian/changelog
index 53e9d41,1015506..cfac96c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,23 @@@
+ libosmium (2.11.1-1) unstable; urgency=medium
+ 
+   * New upstream bugfix release.
+     - Fix the Filter::count() method.
+     - Bugfix: Terminate called on full buffer.
+       See: https://github.com/osmcode/libosmium/issues/189
+     - Add test for not correctly handled unsupported_file_format_error.
+       See: https://github.com/osmcode/libosmium/issues/197
+     - Bugfix: Call get_creator_function() in main thread.
+       See: https://github.com/osmcode/libosmium/issues/197
+   * Update gbp.conf to use upstream-2.11 branch.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 07 Mar 2017 18:31:00 +0100
+ 
 +libosmium (2.11.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 30 Jan 2017 19:43:15 +0100
 +
  libosmium (2.11.0-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/libosmium.git