[Pkg-javascript-commits] [node-expat] 328/371: Fix install all code in subdirs referenced by package.json. Thanks to Jérémy Lal (see bug#784439).

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository node-expat.

commit b5c2aeec8aa8560aebd0a46a9cafc04110f5fa99
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue May 19 22:58:26 2015 +0200

    Fix install all code in subdirs referenced by package.json. Thanks to Jérémy Lal (see bug#784439).
---
 debian/install | 2 --
 debian/rules   | 8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/install b/debian/install
deleted file mode 100644
index 4d1e964..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/* usr/lib/nodejs/node-expat
-build/Release/*.node usr/lib/nodejs/node-expat/native
diff --git a/debian/rules b/debian/rules
index 236d94e..87d1a5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ include /usr/share/cdbs/1/class/langcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 pkg = node-node-expat
+libdir = /usr/lib/nodejs/node-expat
 
 DEB_UPSTREAM_URL = https://github.com/node-xmpp/$(DEB_UPSTREAM_PACKAGE)/archive
 DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION)
@@ -39,9 +40,7 @@ CDBS_BUILD_DEPENDS +=, $(bdeps), $(deps)
 CDBS_DEPENDS_$(pkg) = $(deps)
 
 DEB_INSTALL_DOCS_$(pkg) += README.markdown
-
-# Fix backwards compatibility. See bug#678762
-DEB_DH_LINK_$(pkg) = usr/lib/nodejs/node_expat.node /usr/lib/nodejs/node-expat.node
+DEB_DH_INSTALL_ARGS_$(pkg) = package.json lib $(libdir)
 
 NODE = NODE_DISABLE_COLORS=1 nodejs
 configure/$(pkg):: debian/stamp-node-gyp-configure
@@ -55,6 +54,9 @@ debian/stamp-node-gyp-build:
 		node-gyp build
 	$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,$(NODE) test.js)
 	touch $@
+install/$(pkg)::
+	install -m 644 -D -t debian/$(cdbs_curpkg)$(libdir)/build/Release \
+	build/Release/*.node
 clean::
 	node-gyp clean
 	rm -f debian/stamp-node-gyp-*

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