[Pkg-javascript-commits] [node-nan] 03/04: update changelog, update patches

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository node-nan.

commit be35445f39e3730a38bd1ea1c290be93f7f2d987
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Aug 31 02:43:44 2015 +0200

    update changelog, update patches
---
 debian/changelog                     |  7 +++++++
 debian/patches/embed-xtend.patch     | 33 -----------------------------
 debian/patches/fix_regexp_test.patch | 40 ------------------------------------
 debian/patches/rename_node.patch     |  2 +-
 debian/patches/series                |  2 --
 5 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9be21f..1c579f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+node-nan (2.0.8-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+
+ -- Ximin Luo <infinity0 at debian.org>  Mon, 31 Aug 2015 02:42:49 +0200
+
 node-nan (1.8.4-3) unstable; urgency=medium
 
   * Install all headers (Closes: #785791).
diff --git a/debian/patches/embed-xtend.patch b/debian/patches/embed-xtend.patch
deleted file mode 100644
index 1484c42..0000000
--- a/debian/patches/embed-xtend.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: embed the single-function 10-line module which is only used once
-Author: Andrew Kelley <superjoe30 at gmail.com>
-
---- node-nan-1.8.4.orig/test/js/optionvalues-test.js
-+++ node-nan-1.8.4/test/js/optionvalues-test.js
-@@ -9,7 +9,6 @@
- const test     = require('tap').test
-     , testRoot = require('path').resolve(__dirname, '..')
-     , bindings = require('bindings')({ module_root: testRoot, bindings: 'optionvalues' })
--    , xtend    = require('xtend');
- 
- test('optionvalues', function (t) {
-   t.plan(2);
-@@ -31,3 +30,19 @@ test('optionvalues', function (t) {
-   actobj = bindings.o(obj);
-   t.deepEqual(actobj, expobj);
- });
-+
-+function xtend() {
-+    var target = {}
-+
-+    for (var i = 0; i < arguments.length; i++) {
-+        var source = arguments[i]
-+
-+        for (var key in source) {
-+            if (source.hasOwnProperty(key)) {
-+                target[key] = source[key]
-+            }
-+        }
-+    }
-+
-+    return target
-+}
diff --git a/debian/patches/fix_regexp_test.patch b/debian/patches/fix_regexp_test.patch
deleted file mode 100644
index cc10393..0000000
--- a/debian/patches/fix_regexp_test.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: fix incorrect regexp test
-Forwarded: https://github.com/nodejs/nan/issues/352
-Origin: https://github.com/nodejs/nan/commit/5729a46247261db5804d62940ce82c7bb4a4e898
-Last-Update: 2015-05-20
-Acked-By: Jérémy Lal <kapouer at melix.org>
---- a/package.json
-+++ b/package.json
-@@ -23,8 +23,8 @@
-   "devDependencies": {
-     "bindings": "~1.2.1",
-     "node-gyp": "~1.0.2",
--    "pangyp": "~2.0.1",
--    "tap": "~0.7.1",
-+    "pangyp": "~2.2.0",
-+    "tap": "~1.0.7",
-     "xtend": "~4.0.0"
-   },
-   "license": "MIT"
---- a/test/js/news-test.js
-+++ b/test/js/news-test.js
-@@ -51,7 +51,7 @@
-   t.equal(bindings.newLatin1String(), 'strïng');
-   t.equal(bindings.newUcs2String(), 'strïng');
-   t.equal(bindings.newStdString(), 'strïng');
--  t.deepEquals(bindings.newRegExp(), /foo/g);
-+  t.equal(bindings.newRegExp().toString(), '/foo/');
-   t.deepEquals(bindings.newStringObject(), new String("foo"));
-   t.deepEquals(bindings.newNumberObject(), new Number(0.5));
-   t.deepEquals(bindings.newBooleanObject(), new Boolean(true));
---- a/test/js/persistent-test.js
-+++ b/test/js/persistent-test.js
-@@ -11,7 +11,7 @@
-     , bindings = require('bindings')({ module_root: testRoot, bindings: 'persistent' });
- 
- test('persistent', function (t) {
--  t.plan(9)
-+  t.plan(11)
- 
-   var persistent = bindings;
-   t.type(persistent.save1, 'function');
diff --git a/debian/patches/rename_node.patch b/debian/patches/rename_node.patch
index 74b0801..82cb74d 100644
--- a/debian/patches/rename_node.patch
+++ b/debian/patches/rename_node.patch
@@ -6,7 +6,7 @@ Last-Update: 2015-05-20
 @@ -2,7 +2,7 @@
    "target_defaults":
      {
-         "cflags" : ["-Wall", "-Wextra"],
+         "cflags" : ["-Wall", "-Wextra", "-Wno-unused-parameter"],
 -        "include_dirs": ["<!(node -e \"require('..')\")"]
 +        "include_dirs": ["<!(nodejs -e \"require('..')\")"]
      },
diff --git a/debian/patches/series b/debian/patches/series
index 912ced4..23fbe29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 rename_node.patch
-embed-xtend.patch
-fix_regexp_test.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-nan.git