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

commit fce18e2c8d878efb41fed818e3bc5d279e7ed75d
Merge: 766e18d 67442f8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 3 17:54:20 2016 +0100

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

 CHANGELOG.md                                    |  19 ++-
 CMakeLists.txt                                  |   9 +-
 debian/changelog                                |  13 ++
 debian/control                                  |   2 +-
 debian/rules                                    |   2 +-
 examples/osmium_area_test.cpp                   |  12 +-
 include/osmium/area/assembler.hpp               |  30 ++--
 include/osmium/area/detail/proto_ring.hpp       |   8 +
 include/osmium/area/detail/segment_list.hpp     |  27 +++-
 include/osmium/io/detail/pbf_output_format.hpp  |  55 +++----
 include/osmium/io/detail/protobuf_tags.hpp      |   2 +-
 include/osmium/relations/collector.hpp          |  95 ++++++-----
 include/osmium/relations/detail/member_meta.hpp |  15 --
 include/osmium/util/iterator.hpp                |  74 +++++++++
 include/osmium/util/memory.hpp                  |   6 +-
 include/protozero/config.hpp                    |   4 +-
 include/protozero/exception.hpp                 |   8 +-
 include/protozero/pbf_builder.hpp               |  14 +-
 include/protozero/pbf_message.hpp               |   2 +-
 include/protozero/pbf_reader.hpp                |  40 +++--
 include/protozero/pbf_writer.hpp                | 202 ++++++++++++++++++++++--
 include/protozero/{pbf_types.hpp => types.hpp}  |   8 +-
 include/protozero/varint.hpp                    |   4 +-
 include/protozero/version.hpp                   |   6 +-
 test/t/basic/test_node_ref.cpp                  |  52 ++++++
 25 files changed, 532 insertions(+), 177 deletions(-)

diff --cc debian/changelog
index 3bb74a8,1df2afc..f86091f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ libosmium (2.6.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 25 Feb 2016 19:58:35 +0100
+ 
+ libosmium (2.6.0-2) unstable; urgency=medium
+ 
+   * Ignore test failures on sparc64.
+   * Bump Standards-Version to 3.9.7, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 16 Feb 2016 23:09:42 +0100
+ 
 +libosmium (2.6.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 12 Feb 2016 19:22:13 +0100
 +
  libosmium (2.6.0-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 8e7217b,149d903..c9a10c0
--- a/debian/control
+++ b/debian/control
@@@ -18,9 -18,9 +18,9 @@@ Build-Depends: debhelper (>= 9)
                 libsparsehash-dev,
                 libutfcpp-dev,
                 zlib1g-dev
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/libosmium.git/
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/libosmium.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/libosmium.git -b jessie-backports
  Homepage: http://osmcode.org/libosmium/
  
  Package: libosmium2-dev

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