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

commit 00633391f16efbd2e2f1fd70009eb1aca55c1514
Merge: 30f035a 497eafe
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 11 11:25:02 2015 +0100

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

 .gitattributes                                 |   1 +
 .gitignore                                     |   1 +
 CHANGELOG.md                                   |  49 +++-
 Makefile                                       |   6 +-
 README.md                                      |  24 +-
 appveyor.yml                                   |  12 +-
 build-appveyor.bat                             |  79 ++++++
 build-local.bat                                |  29 ++
 common.gypi                                    |  52 +---
 debian/changelog                               |  25 ++
 debian/control                                 |   2 +-
 include/protozero/byteswap.hpp                 |  34 ++-
 include/protozero/config.hpp                   |  57 ++++
 include/protozero/pbf_builder.hpp              |  28 +-
 include/protozero/pbf_message.hpp              |  44 ++++
 include/protozero/pbf_reader.hpp               |  46 ++--
 include/protozero/pbf_writer.hpp               |  17 +-
 include/protozero/version.hpp                  |   6 +-
 protozero.gyp                                  |  59 ++---
 test/include/test.hpp                          |   3 +
 test/include/testcase.hpp                      |   2 +-
 test/t/basic/test_cases.cpp                    |   5 +-
 test/t/bool/test_cases.cpp                     |  83 +++++-
 test/t/bytes/test_cases.cpp                    |  14 +-
 test/t/complex/test_cases.cpp                  | 350 ++++++++++++++++++++++++-
 test/t/double/test_cases.cpp                   |  65 +++--
 test/t/endian/test_cases.cpp                   |  47 ++++
 test/t/enum/test_cases.cpp                     |   4 +-
 test/t/fixed32/test_cases.cpp                  | 112 ++++----
 test/t/fixed64/test_cases.cpp                  |  65 +++--
 test/t/float/test_cases.cpp                    |  65 +++--
 test/t/int32/test_cases.cpp                    |  18 +-
 test/t/int64/test_cases.cpp                    |  16 +-
 test/t/message/test_cases.cpp                  |  10 +-
 test/t/nested/test_cases.cpp                   |   4 +-
 test/t/repeated/test_cases.cpp                 |  10 +-
 test/t/repeated_packed_bool/test_cases.cpp     |  10 +-
 test/t/repeated_packed_double/test_cases.cpp   |  81 +++---
 test/t/repeated_packed_enum/test_cases.cpp     |  10 +-
 test/t/repeated_packed_fixed32/test_cases.cpp  |  79 +++---
 test/t/repeated_packed_fixed64/test_cases.cpp  |  79 +++---
 test/t/repeated_packed_float/test_cases.cpp    |  81 +++---
 test/t/repeated_packed_int32/test_cases.cpp    |  10 +-
 test/t/repeated_packed_int64/test_cases.cpp    |  10 +-
 test/t/repeated_packed_sfixed32/test_cases.cpp |  10 +-
 test/t/repeated_packed_sfixed64/test_cases.cpp |  10 +-
 test/t/repeated_packed_sint32/test_cases.cpp   |  10 +-
 test/t/repeated_packed_sint64/test_cases.cpp   |  10 +-
 test/t/repeated_packed_uint32/test_cases.cpp   |  10 +-
 test/t/repeated_packed_uint64/test_cases.cpp   |  10 +-
 test/t/sfixed32/test_cases.cpp                 |  10 +-
 test/t/sfixed64/test_cases.cpp                 |  10 +-
 test/t/sint32/test_cases.cpp                   |  14 +-
 test/t/sint64/test_cases.cpp                   |  14 +-
 test/t/skip/test_cases.cpp                     |   9 +-
 test/t/string/test_cases.cpp                   |  12 +-
 test/t/uint32/test_cases.cpp                   |  10 +-
 test/t/uint64/test_cases.cpp                   |  10 +-
 test/t/vector_tile/test_cases.cpp              |   8 +-
 test/tests.cpp                                 |   2 +-
 tutorial.md                                    | 139 +++++++++-
 61 files changed, 1530 insertions(+), 572 deletions(-)

diff --cc debian/changelog
index bc33562,9814569..8463c38
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,28 +1,35 @@@
+ protozero (1.2.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 01 Dec 2015 09:14:44 +0100
+ 
+ protozero (1.2.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 13 Oct 2015 09:08:19 +0200
+ 
+ protozero (1.2.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 12 Oct 2015 22:30:21 +0200
+ 
+ protozero (1.2.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update Vcs-Browser URL to use HTTPS.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 12 Oct 2015 08:18:37 +0200
+ 
 +protozero (1.1.0-5~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 08 Sep 2015 08:11:48 +0200
 +
  protozero (1.1.0-5) unstable; urgency=medium
  
    * Fix Breaks/Replaces to use less then versions only.
diff --cc debian/control
index c959f86,09c00e2..9355811
--- a/debian/control
+++ b/debian/control
@@@ -10,8 -10,8 +10,8 @@@ Build-Depends: debhelper (>= 9)
                 protobuf-compiler,
                 pkg-config
  Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/protozero.git/
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/protozero.git/
 -Vcs-Git: git://anonscm.debian.org/pkg-grass/protozero.git
 +Vcs-Git: git://anonscm.debian.org/pkg-grass/protozero.git -b jessie-backports
  Homepage: https://github.com/mapbox/protozero
  
  Package: libprotozero-dev

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