[Pkg-javascript-commits] [node-asn1.js] 05/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 c92bde201803730d635ad413835a257bfea53358
Merge: eca8ced e045fc4
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Thu Nov 9 12:20:23 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 debian/control                                     |  2 +-
 .../0002-Use-local-copy-of-rfc-package.patch       | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 rfc/2560/index.js                                  |  2 +-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 148ec74,0000000..df8094c
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
- d1fd67451d54586146480480023da1d0e2113b64
- d1fd67451d54586146480480023da1d0e2113b64
++e045fc4075ae32261b78d05ccdd0a82f8c039363
++e045fc4075ae32261b78d05ccdd0a82f8c039363
 +3620bdf77502254a6e4cce7d515c97acbd7e09ad
 +3620bdf77502254a6e4cce7d515c97acbd7e09ad
 +node-asn1.js_5.0.0.orig.tar.gz
 +675fd79cca7cd6bf39ff3dad90575d3a8bdc4bc0
 +48245
diff --cc debian/control
index 1f5945d,0000000..b26bc63
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,36 -1,0 +1,36 @@@
 +Source: node-asn1.js
 +Section: javascript
 +Priority: optional
 +Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
 +Uploaders: Bastien Roucariès <rouca at debian.org>
 +Build-Depends:
 + debhelper (>= 10)
 + , dh-buildinfo
 + , nodejs (>= 4.7)
 + , dpkg-dev (>= 1.17.14)
 + , node-assert (>= 1.0.0) <!nocheck>
 + , node-inherits (>= 2.0.1) <!nocheck>
 + , node-bn.js (>= 4.0.0) <!nocheck>
 + , mocha (>= 1.20)  <!nocheck>
- Standards-Version: 3.9.8
++Standards-Version: 4.1.1
 +Homepage: https://github.com/indutny/asn1.js
 +Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/node-asn1.js.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-javascript/node-asn1.js.git
 +
 +Package: node-asn1.js
 +Architecture: all
 +Depends:
 + ${misc:Depends}
 + , nodejs (>= 4.7)
 + , node-assert (>= 1.0.0)
 + , node-inherits (>= 2.0.1)
 + , node-bn.js (>= 4.0.0)
 +Description: ASN.1 encoder and decoder (DER)
 + Asn1.js is a pure javascript ASN.1 encoder and decoder. Currently DER encoding
 + is supported.
 + .
 + Abstract Syntax Notation One (ASN.1) is an interface description
 + language for defining data structures that can be serialized and
 + deserialized in a standard, cross-platform way.
 + .
 + Node.js is an event-based server-side JavaScript engine.
diff --cc debian/patches/0002-Use-local-copy-of-rfc-package.patch
index 0000000,0000000..765a018
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-local-copy-of-rfc-package.patch
@@@ -1,0 -1,0 +1,23 @@@
++From e045fc4075ae32261b78d05ccdd0a82f8c039363 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
++
++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(
diff --cc debian/patches/series
index cbc5a8f,0000000..61943a1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Replace-minimalistic-assert-by-assert.patch
++0002-Use-local-copy-of-rfc-package.patch

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