[Pkg-javascript-commits] [node-iconv] 01/01: copy of package.json, fix ITP

[matthew pideil]

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

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

commit a8a53fb02e1d05295a8bb701060e250ae537c7d4
Author: Matthew Pideil <matthewp_debian at teledetection.fr>
Date:   Mon May 5 12:37:49 2014 +0000

    copy of package.json, fix ITP
---
 debian/changelog                       | 2 +-
 debian/install                         | 5 +++--
 debian/patches/fix-libiconv-call.patch | 4 ++--
 debian/rules                           | 6 +++---
 lib/iconv.js                           | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63299f6..1c6b691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 node-iconv (2.1.0-1) unstable; urgency=low
 
-  * Initial release (Closes: #744348)
+  * Initial release (Closes: #667484)
 
  -- Matthew Pideil <matthewp_debian at teledetection.fr>  Sun, 04 May 2014 17:03:31 +0000
diff --git a/debian/install b/debian/install
index 2715e0e..52c940a 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,3 @@
-lib/iconv.js	/usr/lib/nodejs/
-build/Release/iconv.node	/usr/lib/nodejs/iconv
+lib/	/usr/lib/nodejs/iconv/lib
+build/Release/iconv.node	/usr/lib/nodejs/iconv/lib
+package.json	usr/lib/nodejs/iconv
diff --git a/debian/patches/fix-libiconv-call.patch b/debian/patches/fix-libiconv-call.patch
index c16de90..6d3b8f1 100644
--- a/debian/patches/fix-libiconv-call.patch
+++ b/debian/patches/fix-libiconv-call.patch
@@ -1,7 +1,7 @@
 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/iconv.node');
+bindings = require('/usr/lib/nodejs/iconv/lib/iconv.node');
 --- a/lib/iconv.js
 +++ b/lib/iconv.js
 @@ -21,7 +21,7 @@
@@ -9,7 +9,7 @@ bindings = require('/usr/lib/nodejs/iconv/iconv.node');
  var bindings;
  try {
 -  bindings = require('../build/Release/iconv.node');
-+  bindings = require('/usr/lib/nodejs/iconv/iconv.node');
++  bindings = require('/usr/lib/nodejs/iconv/lib/iconv.node');
  }
  catch (e) {
    bindings = require('../build/Debug/iconv.node');
diff --git a/debian/rules b/debian/rules
index abaa1a6..8dc22ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,16 +24,16 @@ override_dh_auto_build:
 
 override_dh_install:
 	dh_install
-	chmod 644 $(CURDIR)/debian/node-iconv/usr/lib/nodejs/iconv/iconv.node
+	chmod 644 $(CURDIR)/debian/node-iconv/usr/lib/nodejs/iconv/lib/iconv.node
 
 override_dh_shlibdeps:
 	dpkg-shlibdeps \
 	-T$(CURDIR)/debian/node-iconv.substvars \
-	$(CURDIR)/debian/node-iconv/usr/lib/nodejs/iconv/iconv.node
+	$(CURDIR)/debian/node-iconv/usr/lib/nodejs/iconv/lib/iconv.node
 
 override_dh_strip:
 	strip \
 	--remove-section=.comment \
 	--remove-section=.note \
 	--strip-unneeded \
-	$(CURDIR)/debian/node-iconv/usr/lib/nodejs/iconv/iconv.node
+	$(CURDIR)/debian/node-iconv/usr/lib/nodejs/iconv/lib/iconv.node
diff --git a/lib/iconv.js b/lib/iconv.js
index 8fc3332..20e284e 100644
--- a/lib/iconv.js
+++ b/lib/iconv.js
@@ -21,7 +21,7 @@ var util = require('util');
 
 var bindings;
 try {
-  bindings = require('/usr/lib/nodejs/iconv/iconv.node');
+  bindings = require('/usr/lib/nodejs/iconv/lib/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