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

commit a690907f25562f009d42b89ca9d2b604abf031f9
Merge: a2b7cb4 8975c00
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 25 07:26:40 2017 +0100

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

 .travis.yml                                |  26 ++--
 CHANGELOG.md                               |  40 ++++-
 CONTRIBUTING.md                            |   3 +-
 Makefile                                   |   2 +-
 README.md                                  |  17 +--
 UPGRADING.md                               |   6 +
 debian/changelog                           |  21 +++
 debian/libprotozero-dev.docs               |   1 +
 doc/advanced.md                            | 225 +++++++++++++++++++++++++++++
 doc/macros.md                              |  40 -----
 doc/tutorial.md                            |  50 +------
 include/protozero/byteswap.hpp             |   2 +-
 include/protozero/pbf_builder.hpp          |   7 +-
 include/protozero/pbf_reader.hpp           |  72 ++++++++-
 include/protozero/pbf_writer.hpp           |  66 +++++++--
 include/protozero/types.hpp                |  15 +-
 include/protozero/varint.hpp               |  14 +-
 include/protozero/version.hpp              |   7 +-
 package.json                               |   2 +-
 test/include/catch.hpp                     |  14 +-
 test/t/bytes/test_cases.cpp                |  52 +++++++
 test/t/repeated_packed_bool/test_cases.cpp |  40 +++++
 test/t/tag_and_type/data-combined.pbf      |   3 +
 test/t/tag_and_type/data-not-packed.pbf    |   2 +
 test/t/tag_and_type/data-packed.pbf        |   2 +
 test/t/tag_and_type/test_cases.cpp         |  59 ++++++++
 test/t/tag_and_type/testcase.cpp           |  42 ++++++
 test/t/tag_and_type/testcase.proto         |  15 ++
 test/t/vector_tile/test_cases.cpp          |  60 +++++++-
 test/t/zigzag/test_cases.cpp               |  40 ++++-
 30 files changed, 787 insertions(+), 158 deletions(-)

diff --cc debian/changelog
index 8bfa20c,de6f520..fcc56dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,30 @@@
+ protozero (1.5.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop makefile-docs.patch, applied upstream.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 14 Jan 2017 11:19:51 +0100
+ 
+ protozero (1.5.0-1) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 12 Jan 2017 19:25:52 +0100
+ 
+ protozero (1.5.0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Include additional docs in libprotozero-dev.
+   * Add patch to update DOC_FILES to fix `make doc` failure.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 12 Jan 2017 14:29:29 +0100
+ 
 +protozero (1.4.5-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 26 Nov 2016 10:03:10 +0100
 +
  protozero (1.4.5-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/protozero.git