[Pkg-javascript-commits] [node-zipfile] 02/20: Merge tag 'upstream/0.4.0+ds1'

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository node-zipfile.

commit b65cc14de59b7836507588347e10f5794b264bb1
Merge: 1e93b52 bfa3967
Author: Jérémy Lal <kapouer at melix.org>
Date:   Fri Aug 30 15:14:12 2013 +0200

    Merge tag 'upstream/0.4.0+ds1'
    
    Upstream version 0.4.0+ds1
    
    # gpg: Signature faite le ven. 30 août 2013 15:14:09 CEST avec la clef RSA d'identifiant DD39F374
    # gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
    # gpg:                 alias « Jérémy Lal <jerry at edagames.com> »

 .gitignore                                         |    9 +
 .npmignore                                         |    1 -
 Makefile                                           |   45 ++---
 binding.gyp                                        |   67 +++++++
 build.gyp                                          |   82 ---------
 configure                                          |    2 +-
 deps/common-libzip.gypi                            |    5 +
 deps/notes.md                                      |    4 +
 lib/zipfile.js                                     |    2 +-
 package.json                                       |   10 +-
 src/_zipfile.cc                                    |   28 ---
 src/node_zipfile.cpp                               |  105 ++++++++++-
 .../zipfile/node_zipfile.h => src/node_zipfile.hpp |    0
 test/data/Archive/one.txt                          |    1 +
 test/data/Archive/two.txt                          |    1 +
 "test/data/Cl\303\251ment/Ol\303\241.txt"          |    1 +
 "test/data/Cl\303\251ment/Ol\303\241.zip"          |  Bin 0 -> 167 bytes
 "test/data/Cl\303\251ment/foo.csv"                 |    2 +
 "test/data/Cl\303\251ment/foo.csv.zip"             |  Bin 0 -> 536 bytes
 test/data/points.csv.zip                           |  Bin 0 -> 615 bytes
 test/data/world_merc.zip                           |  Bin 345387 -> 0 bytes
 "test/data/\303\251\303\251\303\251/foo.csv"       |    2 +
 "test/data/\303\251\303\251\303\251/foo.csv.zip"   |  Bin 0 -> 536 bytes
 "test/data/\344\275\240\345\245\275_points.csv"    |    3 +
 test/support/helper.js                             |   31 ----
 test/unicode.test.js                               |   47 +++++
 test/write.test.js                                 |   42 ++---
 vcbuild.bat                                        |   17 +-
 wscript                                            |  185 --------------------
 29 files changed, 283 insertions(+), 409 deletions(-)

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