[Pkg-javascript-commits] [node-asn1.js] 197/202: 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-asn1.js.

commit 58e3e63ff5c86cb0ed107fc8897f5b1b29a3d17f
Merge: 2c0a272 a0ae6fb
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Mon Apr 17 21:42:28 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...001-Replace-minimalistic-assert-by-assert.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 lib/asn1/base/node.js                              |  2 +-
 package.json                                       |  2 +-
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index a8e3e7b,0000000..83014fc
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
- 33e8f17800306ed28150ef8b6db71efa812552e5
- 33e8f17800306ed28150ef8b6db71efa812552e5
++a0ae6fb596d2e5b1140db875bead7fa4763e656e
++a0ae6fb596d2e5b1140db875bead7fa4763e656e
 +33e8f17800306ed28150ef8b6db71efa812552e5
 +33e8f17800306ed28150ef8b6db71efa812552e5
 +node-asn1.js_4.9.1.orig.tar.gz
 +2b7cd759ee146a0c18f3e426168325daf14582bc
 +32694
diff --cc debian/patches/0001-Replace-minimalistic-assert-by-assert.patch
index 0000000,0000000..2477ebb
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Replace-minimalistic-assert-by-assert.patch
@@@ -1,0 -1,0 +1,36 @@@
++From a0ae6fb596d2e5b1140db875bead7fa4763e656e Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Mon, 17 Apr 2017 21:42:00 +0200
++Subject: Replace minimalistic-assert by assert
++
++Forwarded: no
++---
++ lib/asn1/base/node.js | 2 +-
++ package.json          | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/lib/asn1/base/node.js b/lib/asn1/base/node.js
++index 7b26bd8..1e65281 100644
++--- a/lib/asn1/base/node.js
+++++ b/lib/asn1/base/node.js
++@@ -1,7 +1,7 @@
++ var Reporter = require('../base').Reporter;
++ var EncoderBuffer = require('../base').EncoderBuffer;
++ var DecoderBuffer = require('../base').DecoderBuffer;
++-var assert = require('minimalistic-assert');
+++var assert = require('assert');
++ 
++ // Supported tags
++ var tags = [
++diff --git a/package.json b/package.json
++index 0b987b8..7b04d6e 100644
++--- a/package.json
+++++ b/package.json
++@@ -26,6 +26,6 @@
++   "dependencies": {
++     "bn.js": "^4.0.0",
++     "inherits": "^2.0.1",
++-    "minimalistic-assert": "^1.0.0"
+++    "assert": "^1.0.0"
++   }
++ }
diff --cc debian/patches/series
index 0000000,0000000..cbc5a8f
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Replace-minimalistic-assert-by-assert.patch

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