[Pkg-javascript-commits] [node-millstone] 10/10: Merge tag 'upstream/0.6.8'

[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-millstone.

commit 6a667d1ac5f4524b2843498ba3468c0459596032
Merge: dea629e aed56ff
Author: Jérémy Lal <kapouer at melix.org>
Date:   Fri Oct 25 22:14:55 2013 +0200

    Merge tag 'upstream/0.6.8'
    
    Upstream version 0.6.8
    
    # gpg: Signature faite le ven. 25 oct. 2013 22:14:52 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> »

 .npmignore => .gitignore                           |    0
 .npmignore                                         |    3 +-
 .travis.yml                                        |   27 +
 CHANGELOG.md                                       |  153 ++++
 README.md                                          |    3 +
 bin/millstone                                      |   38 +
 lib/millstone.js                                   |  933 +++++++++++++++-----
 lib/util.js                                        |  159 +++-
 package.json                                       |   33 +-
 test/UPPERCASE_EXT/project.mml                     |   13 +
 test/UPPERCASE_EXT/style.mss                       |    1 +
 test/UPPERCASE_EXT/test1.CSV                       |    8 +
 test/cache/cache.mml                               |   12 +-
 test/corrupt-zip.test.js                           |   57 ++
 test/corrupt-zip/project.mml                       |   13 +
 test/corrupt-zip/style.mss                         |    1 +
 test/data/9368bdd9-zip_no_ext/.9368bdd9-zip_no_ext |    1 +
 test/data/9368bdd9-zip_no_ext/9368bdd9-zip_no_ext  |  Bin 0 -> 1162 bytes
 ...e_10m_admin_0_boundary_lines_disputed_areas.zip |  Bin 0 -> 49525 bytes
 test/data/snow-cover.tif                           |  Bin 0 -> 2876 bytes
 test/error.test.js                                 |   64 ++
 test/image-noext.test.js                           |   39 +
 test/image-noext/project.mml                       |   14 +
 test/image-noext/style.mss                         |    1 +
 test/invalid-json/broken.json                      |    8 +
 test/invalid-json/project.mml                      |   13 +
 test/invalid-json/style.mss                        |    1 +
 test/macosx-zipped.test.js                         |   41 +
 test/macosx-zipped/project.mml                     |   13 +
 test/macosx-zipped/style.mss                       |    1 +
 test/markers.test.js                               |   73 ++
 test/markers/layers/points.csv                     |    2 +
 test/markers/project.mml                           |   14 +
 test/markers/style.mss                             |    2 +
 test/missing-file-absolute/project.mml             |   13 +
 test/missing-file-absolute/style.mss               |    1 +
 test/missing-file-relative/project.mml             |   13 +
 test/missing-file-relative/style.mss               |    1 +
 test/multi-shape-zip.test.js                       |   48 +
 test/multi-shape-zip/project.mml                   |   11 +
 test/nosymlink.test.js                             |  102 +++
 test/nosymlink/points.csv                          |    2 +
 test/nosymlink/points.dbf                          |  Bin 0 -> 33 bytes
 test/nosymlink/points.prj                          |    1 +
 test/nosymlink/points.shp                          |  Bin 0 -> 100 bytes
 test/nosymlink/points.shx                          |  Bin 0 -> 100 bytes
 test/nosymlink/points.vrt                          |    9 +
 test/nosymlink/project.mml                         |   37 +
 test/nosymlink/pshape.zip                          |  Bin 0 -> 759 bytes
 test/nosymlink/style.mss                           |    1 +
 test/raster-linking.test.js                        |   48 +
 test/raster-linking/project.mml                    |   12 +
 test/support.js                                    |   28 +
 test/test.js                                       |  273 ++++--
 test/uppercase-ext.test.js                         |   49 +
 test/zip-with-shapefile-and-txt.test.js            |   38 +
 test/zip-with-shapefile-and-txt/project.mml        |   11 +
 test/zipped-json/project.mml                       |   13 +
 test/zipped-json/style.mss                         |    1 +
 59 files changed, 2129 insertions(+), 324 deletions(-)

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