[protozero] 01/02: Merge tag 'debian/1.3.0-1' into jessie-backports

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Thu Mar 3 16:52:52 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie-backports
in repository protozero.

commit d51effff92e79cbbb32e0894c1c86c684be1f28b
Merge: 616263a c70f46c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 3 17:43:49 2016 +0100

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

 .npmignore                                         |   33 +
 .travis.yml                                        |  150 +-
 CHANGELOG.md                                       |   21 +-
 CONTRIBUTING.md                                    |   17 +
 Makefile                                           |   12 +-
 README.md                                          |    2 +-
 build-appveyor.bat                                 |   12 +-
 debian/changelog                                   |    8 +
 debian/control                                     |    4 +-
 common.gypi => gyp/common.gypi                     |    0
 gyp/protozero.gyp                                  |   37 +
 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 +-
 package.json                                       |   10 +
 protozero.gyp                                      |   37 -
 test/include/catch.hpp                             | 3045 ++++++++++++--------
 test/include/scalar_access.hpp                     |  111 +
 test/include/test.hpp                              |    6 +
 test/t/{fixed32 => alignment}/test_cases.cpp       |   89 +-
 test/t/fixed32/{data-max-uint.pbf => data-max.pbf} |    0
 test/t/fixed32/data-min-uint.pbf                   |  Bin 5 -> 0 bytes
 test/t/fixed32/data-pos.pbf                        |  Bin 0 -> 5 bytes
 test/t/fixed32/test_cases.cpp                      |  109 +-
 test/t/fixed32/testcase.cpp                        |    8 +-
 test/t/fixed32/writer_test_cases.cpp               |    4 +-
 test/t/fixed64/{data-max-uint.pbf => data-max.pbf} |    0
 test/t/fixed64/data-min-uint.pbf                   |  Bin 9 -> 0 bytes
 test/t/fixed64/data-pos.pbf                        |  Bin 0 -> 9 bytes
 test/t/fixed64/test_cases.cpp                      |   79 +-
 test/t/fixed64/testcase.cpp                        |    8 +-
 test/t/float/test_cases.cpp                        |    6 +-
 test/t/int32/test_cases.cpp                        |  118 +-
 test/t/int64/data-overflow.pbf                     |    1 -
 test/t/int64/test_cases.cpp                        |  107 +-
 test/t/int64/testcase.cpp                          |   10 -
 test/t/message/test_cases.cpp                      |   46 +
 test/t/repeated_packed_bool/test_cases.cpp         |   36 +
 test/t/repeated_packed_fixed32/test_cases.cpp      |   72 +
 test/t/repeated_packed_int64/test_cases.cpp        |   38 +
 test/t/repeated_packed_sint64/test_cases.cpp       |   38 +
 test/t/rollback/test_cases.cpp                     |  214 ++
 test/t/sfixed32/{data-max-int.pbf => data-max.pbf} |    0
 test/t/sfixed32/{data-min-int.pbf => data-min.pbf} |  Bin
 .../data-max-uint.pbf => sfixed32/data-neg.pbf}    |    0
 test/t/sfixed32/data-pos.pbf                       |  Bin 0 -> 5 bytes
 test/t/sfixed32/test_cases.cpp                     |   68 +-
 test/t/sfixed32/testcase.cpp                       |   10 +-
 test/t/sfixed64/{data-max-int.pbf => data-max.pbf} |    0
 test/t/sfixed64/{data-min-int.pbf => data-min.pbf} |  Bin
 .../data-max-uint.pbf => sfixed64/data-neg.pbf}    |    0
 test/t/sfixed64/data-pos.pbf                       |  Bin 0 -> 9 bytes
 test/t/sfixed64/test_cases.cpp                     |   68 +-
 test/t/sfixed64/testcase.cpp                       |   10 +-
 test/t/sint32/test_cases.cpp                       |   98 +-
 test/t/sint64/test_cases.cpp                       |   98 +-
 test/t/skip/test_cases.cpp                         |   16 +-
 test/t/string/test_cases.cpp                       |    9 -
 test/t/uint32/test_cases.cpp                       |   68 +-
 test/t/uint64/test_cases.cpp                       |   68 +-
 test/t/wrong_type_access/test_cases.cpp            |   55 +
 tutorial.md                                        |  119 +-
 68 files changed, 3246 insertions(+), 2217 deletions(-)

diff --cc debian/changelog
index bce5e12,4be06f1..7976db3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ protozero (1.3.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update Vcs-Git URL to use HTTPS.
+   * Bump Standards-Version to 3.9.7, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 19 Feb 2016 11:36:58 +0100
+ 
 +protozero (1.2.3-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 11 Dec 2015 11:25:08 +0100
 +
  protozero (1.2.3-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 9355811,6fc30a0..139eb1a
--- a/debian/control
+++ b/debian/control
@@@ -9,9 -9,9 +9,9 @@@ Build-Depends: debhelper (>= 9)
                 libprotobuf-dev,
                 protobuf-compiler,
                 pkg-config
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/protozero.git/
- Vcs-Git: git://anonscm.debian.org/pkg-grass/protozero.git -b jessie-backports
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/protozero.git
++Vcs-Git: https://anonscm.debian.org/git/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



More information about the Pkg-grass-devel mailing list