[Pkg-javascript-commits] [node-iconv] 07/16: Rename patch (we know it's a fix) and DEP-3 it. Use relative path.

[Jérémy Lal]

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

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

commit c94b14447f521fce20c92d02846751aa0795a2ed
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Jun 14 16:32:30 2014 +0200

    Rename patch (we know it's a fix) and DEP-3 it. Use relative path.
---
 debian/patches/fix-libiconv-call.patch    | 15 ---------------
 debian/patches/path-to-binary-iconv.patch | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/debian/patches/fix-libiconv-call.patch b/debian/patches/fix-libiconv-call.patch
deleted file mode 100644
index 6d3b8f1..0000000
--- a/debian/patches/fix-libiconv-call.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The call to libiconv from library iconv.js is false because of not using npm tree
-bindings = require('../build/Release/iconv.node');
-replaced to
-bindings = require('/usr/lib/nodejs/iconv/lib/iconv.node');
---- a/lib/iconv.js
-+++ b/lib/iconv.js
-@@ -21,7 +21,7 @@
- 
- var bindings;
- try {
--  bindings = require('../build/Release/iconv.node');
-+  bindings = require('/usr/lib/nodejs/iconv/lib/iconv.node');
- }
- catch (e) {
-   bindings = require('../build/Debug/iconv.node');
diff --git a/debian/patches/path-to-binary-iconv.patch b/debian/patches/path-to-binary-iconv.patch
new file mode 100644
index 0000000..bb9e013
--- /dev/null
+++ b/debian/patches/path-to-binary-iconv.patch
@@ -0,0 +1,14 @@
+Description: iconv.js need to call iconv.node where it is installed
+Forwarded: not-needed
+Author: Matthew Pideil <matthewp_debian at teledetection.fr>
+--- a/lib/iconv.js
++++ b/lib/iconv.js
+@@ -21,7 +21,7 @@
+ 
+ var bindings;
+ try {
+-  bindings = require('../build/Release/iconv.node');
++  bindings = require('./iconv.node');
+ }
+ catch (e) {
+   bindings = require('../build/Debug/iconv.node');

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