[Pkg-javascript-commits] [node-asn1.js] 07/07: 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 3fedd9476a5fc25f32c6fc239cbcc1a3ebccaa44
Merge: c92bde2 9e5ff14
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Thu Nov 9 13:18:23 2017 +0100

    merge patched into master

 debian/.git-dpm                                         | 4 ++--
 debian/patches/0002-Use-local-copy-of-rfc-package.patch | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index df8094c,0000000..0b82604
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
- e045fc4075ae32261b78d05ccdd0a82f8c039363
- e045fc4075ae32261b78d05ccdd0a82f8c039363
++9e5ff14b9d6951fc3f74cf7a685d051199b7956d
++9e5ff14b9d6951fc3f74cf7a685d051199b7956d
 +3620bdf77502254a6e4cce7d515c97acbd7e09ad
 +3620bdf77502254a6e4cce7d515c97acbd7e09ad
 +node-asn1.js_5.0.0.orig.tar.gz
 +675fd79cca7cd6bf39ff3dad90575d3a8bdc4bc0
 +48245
diff --cc debian/patches/0002-Use-local-copy-of-rfc-package.patch
index 765a018,0000000..62b8cd4
mode 100644,000000..100644
--- a/debian/patches/0002-Use-local-copy-of-rfc-package.patch
+++ b/debian/patches/0002-Use-local-copy-of-rfc-package.patch
@@@ -1,23 -1,0 +1,25 @@@
- From e045fc4075ae32261b78d05ccdd0a82f8c039363 Mon Sep 17 00:00:00 2001
++From 9e5ff14b9d6951fc3f74cf7a685d051199b7956d Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Thu, 9 Nov 2017 12:20:05 +0100
 +Subject: Use local copy of rfc package
 +
++do not use other package
++
 +Forwarded: no
 +---
 + rfc/2560/index.js | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/rfc/2560/index.js b/rfc/2560/index.js
 +index b441b13..474f360 100644
 +--- a/rfc/2560/index.js
 ++++ b/rfc/2560/index.js
 +@@ -1,7 +1,7 @@
 + 'use strict';
 + 
 + const asn1 = require('asn1.js');
 +-const rfc5280 = require('asn1.js-rfc5280');
 ++const rfc5280 = require('../../rfc/5280');
 + 
 + const OCSPRequest = asn1.define('OCSPRequest', function() {
 +   this.seq().obj(

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