[Pkg-javascript-commits] [node-miller-rabin] 06/08: 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-miller-rabin.

commit 8d683371025b41c561089a5cc98662a67ccc27de
Merge: 634704f d5fb9f8
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Wed Oct 4 23:17:43 2017 +0200

    merge patched into master

 debian/.git-dpm                                  |  6 ++---
 debian/patches/0001-Replace-node-by-nodejs.patch |  2 +-
 lib/mr.js                                        | 30 +++++++++++++-----------
 package.json                                     |  2 +-
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --cc debian/.git-dpm
index fc730e6,0000000..579b34c
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
- 362fb113d46999b5ce1abfce7ece08f14e6da476
- 362fb113d46999b5ce1abfce7ece08f14e6da476
- 94b56df9948a1ae592b331afc9559115f3f98fb2
++d5fb9f881e7b44bad44b39ebe15107e1c1b7d757
++d5fb9f881e7b44bad44b39ebe15107e1c1b7d757
++2c0ddd1ce6a4bd8f50d661df2975f9fb9214c8b9
 +2c0ddd1ce6a4bd8f50d661df2975f9fb9214c8b9
 +node-miller-rabin_4.0.1.orig.tar.gz
 +b0c68d18b9cb9586499d4ecb73cb65585ca9b933
 +2802
diff --cc debian/patches/0001-Replace-node-by-nodejs.patch
index 606ad8c,0000000..7a750cc
mode 100644,000000..100644
--- a/debian/patches/0001-Replace-node-by-nodejs.patch
+++ b/debian/patches/0001-Replace-node-by-nodejs.patch
@@@ -1,20 -1,0 +1,20 @@@
- From 362fb113d46999b5ce1abfce7ece08f14e6da476 Mon Sep 17 00:00:00 2001
++From d5fb9f881e7b44bad44b39ebe15107e1c1b7d757 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 14:15:09 +0200
 +Subject: Replace node by nodejs
 +
 +Forwarded: no
 +---
 + bin/miller-rabin | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/bin/miller-rabin b/bin/miller-rabin
 +index 2e18dfd..591e67d 100755
 +--- a/bin/miller-rabin
 ++++ b/bin/miller-rabin
 +@@ -1,4 +1,4 @@
 +-#!/usr/bin/env node
 ++#!/usr/bin/env nodejs
 + var bn = require('bn.js');
 + var fs = require('fs');
 + var mr = require('../').create();

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