[Pkg-javascript-commits] [node-asn1.js] 02/03: 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 e16ef0ba53f6c7e8e466e1f51e6d41bc96fcb2d0
Merge: 3fedd94 986e219
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Nov 10 13:26:28 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0003-Use-local-install-of-ans1.js.patch        | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 rfc/2560/index.js                                  |  2 +-
 rfc/5280/index.js                                  |  2 +-
 5 files changed, 40 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 0b82604,0000000..7f5d1b8
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
- 9e5ff14b9d6951fc3f74cf7a685d051199b7956d
- 9e5ff14b9d6951fc3f74cf7a685d051199b7956d
++986e219e0d5d0fe4aec42c255104f19f05ff3655
++986e219e0d5d0fe4aec42c255104f19f05ff3655
 +3620bdf77502254a6e4cce7d515c97acbd7e09ad
 +3620bdf77502254a6e4cce7d515c97acbd7e09ad
 +node-asn1.js_5.0.0.orig.tar.gz
 +675fd79cca7cd6bf39ff3dad90575d3a8bdc4bc0
 +48245
diff --cc debian/patches/0003-Use-local-install-of-ans1.js.patch
index 0000000,0000000..9c53261
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Use-local-install-of-ans1.js.patch
@@@ -1,0 -1,0 +1,35 @@@
++From 986e219e0d5d0fe4aec42c255104f19f05ff3655 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Fri, 10 Nov 2017 13:26:03 +0100
++Subject: Use local install of ans1.js
++
++Forwarded: no
++---
++ rfc/2560/index.js | 2 +-
++ rfc/5280/index.js | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/rfc/2560/index.js b/rfc/2560/index.js
++index 474f360..53970c9 100644
++--- a/rfc/2560/index.js
+++++ b/rfc/2560/index.js
++@@ -1,6 +1,6 @@
++ 'use strict';
++ 
++-const asn1 = require('asn1.js');
+++const asn1 = require('../../lib/asn1.js');
++ const rfc5280 = require('../../rfc/5280');
++ 
++ const OCSPRequest = asn1.define('OCSPRequest', function() {
++diff --git a/rfc/5280/index.js b/rfc/5280/index.js
++index ad4760c..c9f1ebf 100644
++--- a/rfc/5280/index.js
+++++ b/rfc/5280/index.js
++@@ -1,6 +1,6 @@
++ 'use strict';
++ 
++-const asn1 = require('asn1.js');
+++const asn1 = require('../../lib/asn1.js');
++ 
++ /**
++  * RFC5280 X509 and Extension Definitions
diff --cc debian/patches/series
index 61943a1,0000000..4d1747f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Replace-minimalistic-assert-by-assert.patch
 +0002-Use-local-copy-of-rfc-package.patch
++0003-Use-local-install-of-ans1.js.patch

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