[Pkg-javascript-commits] [node-hash.js] 18/19: merge patched into master

[Bastien Roucariès]

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

rouca pushed a commit to branch master
in repository node-hash.js.

commit 27b00bbe07dd1318830786b50753c06a4c48aa52
Merge: 00cc73b 6a01cb5
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Aug 25 13:56:50 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...1-Use-assert-instead-of-minimalist-assert.patch | 92 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 lib/hash/common.js                                 |  2 +-
 lib/hash/hmac.js                                   |  2 +-
 lib/hash/sha/256.js                                |  2 +-
 lib/hash/sha/512.js                                |  2 +-
 lib/hash/utils.js                                  |  2 +-
 package.json                                       |  2 +-
 9 files changed, 101 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 8d51d8f,0000000..62ed224
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- e71f4ba88607f395f8bf90af582cab249cd77221
- e71f4ba88607f395f8bf90af582cab249cd77221
++6a01cb582a68731d7cf2bc16e008babad121016f
++6a01cb582a68731d7cf2bc16e008babad121016f
 +e71f4ba88607f395f8bf90af582cab249cd77221
 +e71f4ba88607f395f8bf90af582cab249cd77221
 +node-hash.js_1.1.3.orig.tar.gz
 +8cd0486095e2fb949d9e86df87fc4464366ab4b1
 +19811
diff --cc debian/patches/0001-Use-assert-instead-of-minimalist-assert.patch
index 0000000,0000000..221c630
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-assert-instead-of-minimalist-assert.patch
@@@ -1,0 -1,0 +1,92 @@@
++From 6a01cb582a68731d7cf2bc16e008babad121016f Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Fri, 25 Aug 2017 13:56:25 +0200
++Subject: Use assert instead of minimalist-assert
++
++Forwarded: no
++---
++ lib/hash/common.js  | 2 +-
++ lib/hash/hmac.js    | 2 +-
++ lib/hash/sha/256.js | 2 +-
++ lib/hash/sha/512.js | 2 +-
++ lib/hash/utils.js   | 2 +-
++ package.json        | 2 +-
++ 6 files changed, 6 insertions(+), 6 deletions(-)
++
++diff --git a/lib/hash/common.js b/lib/hash/common.js
++index c49f476..99bc9c4 100644
++--- a/lib/hash/common.js
+++++ b/lib/hash/common.js
++@@ -1,7 +1,7 @@
++ 'use strict';
++ 
++ var utils = require('./utils');
++-var assert = require('minimalistic-assert');
+++var assert = require('assert');
++ 
++ function BlockHash() {
++   this.pending = null;
++diff --git a/lib/hash/hmac.js b/lib/hash/hmac.js
++index faff12d..0423278 100644
++--- a/lib/hash/hmac.js
+++++ b/lib/hash/hmac.js
++@@ -1,7 +1,7 @@
++ 'use strict';
++ 
++ var utils = require('./utils');
++-var assert = require('minimalistic-assert');
+++var assert = require('assert');
++ 
++ function Hmac(hash, key, enc) {
++   if (!(this instanceof Hmac))
++diff --git a/lib/hash/sha/256.js b/lib/hash/sha/256.js
++index 6dbd6a0..74ea994 100644
++--- a/lib/hash/sha/256.js
+++++ b/lib/hash/sha/256.js
++@@ -3,7 +3,7 @@
++ var utils = require('../utils');
++ var common = require('../common');
++ var shaCommon = require('./common');
++-var assert = require('minimalistic-assert');
+++var assert = require('assert');
++ 
++ var sum32 = utils.sum32;
++ var sum32_4 = utils.sum32_4;
++diff --git a/lib/hash/sha/512.js b/lib/hash/sha/512.js
++index c371a25..3cef22a 100644
++--- a/lib/hash/sha/512.js
+++++ b/lib/hash/sha/512.js
++@@ -2,7 +2,7 @@
++ 
++ var utils = require('../utils');
++ var common = require('../common');
++-var assert = require('minimalistic-assert');
+++var assert = require('assert');
++ 
++ var rotr64_hi = utils.rotr64_hi;
++ var rotr64_lo = utils.rotr64_lo;
++diff --git a/lib/hash/utils.js b/lib/hash/utils.js
++index 3d7d4ea..2cfbfae 100644
++--- a/lib/hash/utils.js
+++++ b/lib/hash/utils.js
++@@ -1,6 +1,6 @@
++ 'use strict';
++ 
++-var assert = require('minimalistic-assert');
+++var assert = require('assert');
++ var inherits = require('inherits');
++ 
++ exports.inherits = inherits;
++diff --git a/package.json b/package.json
++index 20524c8..7a8ca50 100644
++--- a/package.json
+++++ b/package.json
++@@ -26,7 +26,7 @@
++   "homepage": "https://github.com/indutny/hash.js",
++   "dependencies": {
++     "inherits": "^2.0.3",
++-    "minimalistic-assert": "^1.0.0"
+++    "assert": "^1.0.0"
++   },
++   "devDependencies": {
++     "eslint": "^4.0.0",
diff --cc debian/patches/series
index 0000000,0000000..5d565f2
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-assert-instead-of-minimalist-assert.patch

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