[Pkg-javascript-commits] [node-iconv] 04/04: refresh patches

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Sat Sep 2 06:51:10 UTC 2017


This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository node-iconv.

commit 653795161d7f3433f072e7a53e5a43a415383eed
Author: Pirate Praveen <praveen at debian.org>
Date:   Sat Sep 2 11:52:58 2017 +0530

    refresh patches
---
 debian/patches/path-to-binary-iconv.patch | 3 ++-
 debian/patches/use-glibc-iconv.patch      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/patches/path-to-binary-iconv.patch b/debian/patches/path-to-binary-iconv.patch
index e395fa0..37ca985 100644
--- a/debian/patches/path-to-binary-iconv.patch
+++ b/debian/patches/path-to-binary-iconv.patch
@@ -3,7 +3,7 @@ Forwarded: not-needed
 Author: Matthew Pideil <matthewp_debian at teledetection.fr>
 --- a/lib/iconv.js
 +++ b/lib/iconv.js
-@@ -23,10 +23,10 @@
+@@ -23,11 +23,11 @@
  
  var bindings;
  try {
@@ -11,6 +11,7 @@ Author: Matthew Pideil <matthewp_debian at teledetection.fr>
 +  bindings = require('./iconv.node');
  }
  catch (e) {
+   if (e.code !== 'MODULE_NOT_FOUND') throw e;
 -  bindings = require('../build/Debug/iconv.node');
 +  bindings = require('../build/Release/iconv.node');
  }
diff --git a/debian/patches/use-glibc-iconv.patch b/debian/patches/use-glibc-iconv.patch
index a1d1df6..e34073f 100644
--- a/debian/patches/use-glibc-iconv.patch
+++ b/debian/patches/use-glibc-iconv.patch
@@ -38,7 +38,7 @@ Last-Update: 2016-10-16
      object_template.Reset(t);
 --- a/lib/iconv.js
 +++ b/lib/iconv.js
-@@ -45,15 +45,18 @@
+@@ -46,15 +46,18 @@
    stream.Stream.call(this);
    this.writable = true;
  
@@ -60,7 +60,7 @@ Last-Update: 2016-10-16
    var context_ = { trailer: null };
  
    this.convert = function(input, encoding) {
-@@ -143,7 +146,9 @@
+@@ -144,7 +147,9 @@
          continue;
        }
        else if (errno === EILSEQ) {

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



More information about the Pkg-javascript-commits mailing list