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

commit 8bab75f95377b3231cd2abc8ff16b186a09a6859
Merge: 8fc90a1 bc23a2b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jun 14 19:17:13 2016 +0200

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

 CHANGELOG.md                                     |  18 ++-
 CMakeLists.txt                                   |   2 +-
 debian/changelog                                 |   6 +
 include/osmium/geom/factory.hpp                  |   4 +-
 include/osmium/index/detail/mmap_vector_base.hpp |   9 +-
 include/osmium/io/detail/debug_output_format.hpp |  66 ++++++---
 include/osmium/io/detail/opl_output_format.hpp   | 171 +++++++++++++----------
 include/osmium/io/detail/output_format.hpp       |  25 +++-
 include/osmium/io/detail/pbf.hpp                 |   2 +-
 include/osmium/io/detail/string_util.hpp         |  30 +++-
 include/osmium/io/detail/xml_input_format.hpp    |  24 ++--
 include/osmium/io/detail/xml_output_format.hpp   |  89 +++++++-----
 include/osmium/osm/location.hpp                  | 169 ++++++++++++++++++++--
 include/osmium/version.hpp                       |   4 +-
 test/t/basic/test_location.cpp                   | 108 ++++++++++++++
 15 files changed, 561 insertions(+), 166 deletions(-)

diff --cc debian/changelog
index 7980a72,8a38e7a..029dfb8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ libosmium (2.7.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 08 Jun 2016 20:31:49 +0200
+ 
 +libosmium (2.7.1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 07 Jun 2016 19:22:04 +0200
 +
  libosmium (2.7.1-1) unstable; urgency=medium
  
    * New upstream release.

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