[Pkg-javascript-commits] [node-hmac-drbg] 08/12: 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-hmac-drbg.

commit e01b3e4ab7946993af0cd4ae31e7148432f382ff
Merge: 970b184 bdb39fc
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Sat Apr 29 11:34:45 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...e-assert-instead-of-tiny-spurious-package.patch | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 lib/hmac-drbg.js                                   |  2 +-
 package.json                                       |  2 +-
 5 files changed, 44 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index c680b49,0000000..33f3a14
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
- 2592375270a7a689d3752a6ba7235a47eb234d15
- 2592375270a7a689d3752a6ba7235a47eb234d15
++bdb39fc2b431aeb7a59fe2c77eeffe8f6a9c2151
++bdb39fc2b431aeb7a59fe2c77eeffe8f6a9c2151
 +2592375270a7a689d3752a6ba7235a47eb234d15
 +2592375270a7a689d3752a6ba7235a47eb234d15
 +node-hmac-drbg_1.0.1.orig.tar.gz
 +3d5183889a1e25ff34f4b1b45166d8cee4580fef
 +11482
diff --cc debian/patches/0001-Use-node-assert-instead-of-tiny-spurious-package.patch
index 0000000,0000000..361bd64
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-node-assert-instead-of-tiny-spurious-package.patch
@@@ -1,0 -1,0 +1,39 @@@
++From bdb39fc2b431aeb7a59fe2c77eeffe8f6a9c2151 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sat, 29 Apr 2017 11:34:07 +0200
++Subject: Use node assert instead of tiny (spurious) package
++
++Avoid to use an useless package
++
++Forwarded: no
++---
++ lib/hmac-drbg.js | 2 +-
++ package.json     | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/lib/hmac-drbg.js b/lib/hmac-drbg.js
++index 9051a52..924144c 100644
++--- a/lib/hmac-drbg.js
+++++ b/lib/hmac-drbg.js
++@@ -2,7 +2,7 @@
++ 
++ var hash = require('hash.js');
++ var utils = require('minimalistic-crypto-utils');
++-var assert = require('minimalistic-assert');
+++var assert = require('assert');
++ 
++ function HmacDRBG(options) {
++   if (!(this instanceof HmacDRBG))
++diff --git a/package.json b/package.json
++index b95d391..3b27c0b 100644
++--- a/package.json
+++++ b/package.json
++@@ -26,7 +26,7 @@
++   },
++   "dependencies": {
++     "hash.js": "^1.0.3",
++-    "minimalistic-assert": "^1.0.0",
+++    "assert": "^1.0.0",
++     "minimalistic-crypto-utils": "^1.0.1"
++   }
++ }
diff --cc debian/patches/series
index 0000000,0000000..2ce70ae
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-node-assert-instead-of-tiny-spurious-package.patch

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