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

commit 21834210663105f563a7905dc267476ad7d8af06
Merge: b0714a4 74653ac
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 2 08:47:30 2016 +0200

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

 CHANGELOG.md                      | 22 ++++++++++++++++++-
 CONTRIBUTING.md                   |  6 +++++-
 Makefile                          |  2 +-
 UPGRADING.md                      |  5 +++++
 debian/changelog                  | 15 ++++++++++++-
 debian/copyright                  |  2 +-
 include/protozero/iterators.hpp   | 10 ++++-----
 include/protozero/pbf_writer.hpp  |  8 +++++--
 include/protozero/version.hpp     |  4 ++--
 include_dirs.js                   |  2 ++
 package.json                      |  4 ++--
 test/create_pbf_test_data.sh      |  2 +-
 test/t/enum/data-max.pbf          |  1 +
 test/t/enum/data-min.pbf          |  1 +
 test/t/enum/data-neg.pbf          |  1 +
 test/t/enum/test_cases.cpp        | 45 +++++++++++++++++++++++++++++++++++++++
 test/t/enum/testcase.cpp          |  9 ++++++++
 test/t/enum/testcase.proto        |  7 ++++++
 test/t/enum/writer_test_cases.cpp | 24 +++++++++++++++++++++
 19 files changed, 153 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index 43b6a1b,a1f8d45..2ebc653
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ protozero (1.4.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Aug 2016 09:58:57 +0200
+ 
+ protozero (1.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop © character from copyright statement in copyright file.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 22 Aug 2016 07:34:50 +0200
+ 
 +protozero (1.4.0-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 28 Jul 2016 19:07:43 +0200
 +
  protozero (1.4.0-1) unstable; urgency=medium
  
    * New upstream release.

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