diff -Nru smash-0.0.14/debian/changelog smash-0.0.15/debian/changelog --- smash-0.0.14/debian/changelog 2014-10-24 16:02:33.000000000 +0000 +++ smash-0.0.15/debian/changelog 2015-11-01 14:25:45.000000000 +0000 @@ -1,3 +1,12 @@ +smash (0.0.15-1) unstable; urgency=medium + + * Team upload + * New upstream release. + - fixes build (Closes: #802111) + * debian/control: add Vcs-* fields, pointing to pkg-javascript/smash.git + + -- Antonio Terceiro Sun, 01 Nov 2015 12:25:43 -0200 + smash (0.0.14-1) unstable; urgency=low * New upstream release. diff -Nru smash-0.0.14/debian/control smash-0.0.15/debian/control --- smash-0.0.14/debian/control 2014-10-24 01:31:10.000000000 +0000 +++ smash-0.0.15/debian/control 2015-11-01 14:25:45.000000000 +0000 @@ -6,6 +6,8 @@ Build-Depends: debhelper (>= 9), node-queue-async (>= 1.0.0), node-vows (>= 0.7) Standards-Version: 3.9.6 Homepage: https://github.com/mbostock/smash +Vcs-Git: git://anonscm.debian.org/pkg-javascript/smash.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-javascript/smash.git Package: node-smash Architecture: all diff -Nru smash-0.0.14/.gitignore smash-0.0.15/.gitignore --- smash-0.0.14/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ smash-0.0.15/.gitignore 2015-11-01 12:51:02.000000000 +0000 @@ -0,0 +1,2 @@ +.DS_Store +node_modules diff -Nru smash-0.0.14/lib/smash/load.js smash-0.0.15/lib/smash/load.js --- smash-0.0.14/lib/smash/load.js 2014-10-11 22:22:15.000000000 +0000 +++ smash-0.0.15/lib/smash/load.js 2015-11-01 12:51:02.000000000 +0000 @@ -4,7 +4,7 @@ // Loads the specified files and their imports, then evaluates the specified // expression in the context of the concatenated code. module.exports = function(files, expression, sandbox, callback) { - if (arguments.length < 4) callback = sandbox, sandbox = null; + if (arguments.length < 4) callback = sandbox, sandbox = undefined; var chunks = []; smash(files) .on("error", callback) diff -Nru smash-0.0.14/lib/smash/read-all-imports.js smash-0.0.15/lib/smash/read-all-imports.js --- smash-0.0.14/lib/smash/read-all-imports.js 2014-10-11 22:22:15.000000000 +0000 +++ smash-0.0.15/lib/smash/read-all-imports.js 2015-11-01 12:51:02.000000000 +0000 @@ -16,7 +16,7 @@ fileMap[file] = true; readImports(file, function(error, files) { if (error) { - if (options["ignore-missing"] && error.errno === 34) files = []; + if (options["ignore-missing"] && error.code === "ENOENT") files = []; else return void callback(error); } var q = queue(1); diff -Nru smash-0.0.14/lib/smash/read-graph.js smash-0.0.15/lib/smash/read-graph.js --- smash-0.0.14/lib/smash/read-graph.js 2014-10-11 22:22:15.000000000 +0000 +++ smash-0.0.15/lib/smash/read-graph.js 2015-11-01 12:51:02.000000000 +0000 @@ -15,7 +15,7 @@ if (file in fileMap) return callback(null); readImports(file, function(error, files) { if (error) { - if (options["ignore-missing"] && error.errno === 34) files = []; + if (options["ignore-missing"] && error.code === "ENOENT") files = []; else return void callback(error); } var q = queue(1); diff -Nru smash-0.0.14/package.json smash-0.0.15/package.json --- smash-0.0.14/package.json 2014-10-11 22:22:15.000000000 +0000 +++ smash-0.0.15/package.json 2015-11-01 12:51:02.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "smash", - "version": "0.0.14", + "version": "0.0.15", "description": "Concatenate files together using import statements.", "keywords": [ "import", diff -Nru smash-0.0.14/test/readAllImports-test.js smash-0.0.15/test/readAllImports-test.js --- smash-0.0.14/test/readAllImports-test.js 2014-10-11 22:22:15.000000000 +0000 +++ smash-0.0.15/test/readAllImports-test.js 2015-11-01 12:51:02.000000000 +0000 @@ -41,7 +41,8 @@ }); }, "throws an error with the expected message": function(error) { - assert.deepEqual(error.message, "ENOENT, open 'test/data/not-found.js'"); + assert.equal(error.code, "ENOENT"); + assert.equal(error.path, "test/data/not-found.js"); } }, "on a file with that imports a file that does not exist with --ignore-missing": { diff -Nru smash-0.0.14/test/readGraph-test.js smash-0.0.15/test/readGraph-test.js --- smash-0.0.14/test/readGraph-test.js 2014-10-11 22:22:15.000000000 +0000 +++ smash-0.0.15/test/readGraph-test.js 2015-11-01 12:51:02.000000000 +0000 @@ -47,7 +47,8 @@ }); }, "throws an error with the expected message": function(error) { - assert.deepEqual(error.message, "ENOENT, open 'test/data/not-found.js'"); + assert.equal(error.code, "ENOENT"); + assert.equal(error.path, "test/data/not-found.js"); } }, "on a file with that imports a file that does not exist with --ignore-missing": { diff -Nru smash-0.0.14/test/smash-test.js smash-0.0.15/test/smash-test.js --- smash-0.0.14/test/smash-test.js 2014-10-11 22:22:15.000000000 +0000 +++ smash-0.0.15/test/smash-test.js 2015-11-01 12:51:02.000000000 +0000 @@ -11,9 +11,9 @@ "on a file with no imports": testCase(["test/data/foo.js"], "test/data/foo.js"), "on a file with imports with trailing comments": testCase(["test/data/trailing-comment-import.js"], "test/data/trailing-comment-import-expected.js"), "on a file with single-quote import syntax": testCase(["test/data/single-quote-import.js"], "test/data/single-quote-import-expected.js"), - "on a file with mismatched quote delimiters": testFailureCase(["test/data/mismatched-quotes.js"], "invalid import: test/data/mismatched-quotes.js:0: import 'foo\";"), - "on a file with invalid import syntax": testFailureCase(["test/data/invalid-import-syntax.js"], "invalid import: test/data/invalid-import-syntax.js:0: import foo;"), - "on a file with that imports a file that does not exist": testFailureCase(["test/data/imports-not-found.js"], "ENOENT, open 'test/data/not-found.js'"), + "on a file with mismatched quote delimiters": testFailureCase(["test/data/mismatched-quotes.js"], {message: "invalid import: test/data/mismatched-quotes.js:0: import 'foo\";"}), + "on a file with invalid import syntax": testFailureCase(["test/data/invalid-import-syntax.js"], {message: "invalid import: test/data/invalid-import-syntax.js:0: import foo;"}), + "on a file with that imports a file that does not exist": testFailureCase(["test/data/imports-not-found.js"], {code: "ENOENT", path: "test/data/not-found.js"}), "on a file with a commented-out import": testCase(["test/data/commented-import.js"], "test/data/commented-import.js"), "on a file with a not-commented-out import": testCase(["test/data/not-commented-import.js"], "test/data/not-commented-import-expected.js"), "on a file with one import": testCase(["test/data/imports-foo.js"], "test/data/imports-foo-expected.js"), @@ -53,7 +53,9 @@ }); }, "produces the expected error message": function(error) { - assert.deepEqual(error.message, expected); + for (var key in expected) { + assert.equal(error[key], expected[key]); + } } }; }