[Pkg-javascript-commits] [node-sqlite3] 02/10: Merge tag 'upstream/3.1.3+ds1'

[László Böszörményi]

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

gcs pushed a commit to branch master
in repository node-sqlite3.

commit 25e66fbd814ad61044ba50cdd08810f0f252232d
Merge: 00d6a10 97ad028
Author: Laszlo Boszormenyi (GCS) <gcs at debian.org>
Date:   Sun Apr 24 08:31:18 2016 +0000

    Merge tag 'upstream/3.1.3+ds1'
    
    Upstream version 3.1.3+ds1

 .gitignore                           |   7 +-
 .npmignore                           |  12 +
 .travis.yml                          | 160 ++++++++-----
 CHANGELOG.md                         | 146 +++++++++++-
 CONTRIBUTING.md                      |  57 +++++
 Makefile                             |  50 +++-
 README.md                            | 144 ++++++-----
 appveyor.yml                         |  56 +++++
 binding.gyp                          |  20 +-
 configure                            |   3 -
 deps/common-sqlite.gypi              |  55 ++++-
 deps/sqlite3.gyp                     |   8 +-
 lib/binary_name.js                   |  59 -----
 lib/sqlite3.js                       | 115 ++++-----
 package.json                         |  37 +--
 scripts/build-appveyor.bat           | 160 +++++++++++++
 scripts/build-local.bat              |  59 +++++
 scripts/build.bat                    |  49 ----
 scripts/build_against_node.sh        |  79 ++++++
 scripts/build_against_node_webkit.sh |  91 +++++++
 scripts/build_for_node_webkit.cmd    |  15 ++
 scripts/install_node.sh              |  21 ++
 scripts/validate_tag.sh              |  24 ++
 src/async.h                          |   2 +-
 src/database.cc                      | 347 ++++++++++++++-------------
 src/database.h                       |  61 ++---
 src/gcc-preinclude.h                 |   2 +
 src/macros.h                         | 105 ++++----
 src/node_sqlite3.cc                  |   9 +-
 src/statement.cc                     | 449 ++++++++++++++++++-----------------
 src/statement.h                      |  58 ++---
 test/json.test.js                    |  22 ++
 test/named_columns.test.js           |   9 +
 test/nw/Makefile                     |  11 +-
 test/prepare.test.js                 |  51 ++++
 test/profile.test.js                 |   7 +-
 test/unicode.test.js                 |  73 +++++-
 37 files changed, 1783 insertions(+), 850 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-sqlite3.git