[Pkg-javascript-commits] [node-zipfile] 06/09: Work around new node-pre-gyp (anti)build system

Jérémy Lal kapouer at moszumanska.debian.org
Sun Mar 16 22:39:20 UTC 2014


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

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

commit 9b39cc32b9b2ea935a3aff591cfbb47864d7faa2
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Mar 16 23:07:04 2014 +0100

    Work around new node-pre-gyp (anti)build system
---
 debian/clean   |  1 +
 debian/install |  2 +-
 debian/rules   | 10 ++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..385473c
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+lib/binding/zipfile.node
diff --git a/debian/install b/debian/install
index ffebbdb..0bc2da9 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-lib/* usr/lib/nodejs/zipfile
+lib/binding/zipfile.node usr/lib/nodejs/
diff --git a/debian/rules b/debian/rules
index 684d761..7bfea8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,10 +17,12 @@ TARNAME := node-zipfile_$(UPVER)+ds1.orig.tar
 override_dh_install:
 	dh_install
 	dh_buildinfo
-	chmod 644 $(CURDIR)/debian/node-zipfile/usr/lib/nodejs/zipfile/node_zipfile.node
+	chmod 644 $(CURDIR)/debian/node-zipfile/usr/lib/nodejs/zipfile.node
 
 override_dh_auto_configure:
-	node-gyp configure --libzip=shared
+	node-gyp configure --shared_libzip=true \
+		--shared_libzip_includes=`pkg-config libzip --cflags-only-I | sed s/-I//g` \
+		--module_name=zipfile --module_path="$(CURDIR)/lib/binding"
 
 override_dh_auto_build:
 	node-gyp build
@@ -30,14 +32,13 @@ override_dh_auto_test:
 override_dh_shlibdeps:
 	dpkg-shlibdeps \
 		-T$(CURDIR)/debian/node-zipfile.substvars \
-		$(CURDIR)/debian/node-zipfile/usr/lib/nodejs/zipfile/node_zipfile.node
+		$(CURDIR)/debian/node-zipfile/usr/lib/nodejs/zipfile.node
 
 override_dh_strip:
 	strip \
 		--remove-section=.comment \
 		--remove-section=.note \
 		--strip-unneeded \
-		$(CURDIR)/debian/node-zipfile/usr/lib/nodejs/zipfile/node_zipfile.node
 
 get-orig-source:
 	mkdir -p ../tarballs
@@ -59,3 +60,4 @@ get-orig-source:
 	gzip -9 $(TARNAME)
 	mv $(TARNAME).gz ../tarballs/
 
+		$(CURDIR)/debian/node-zipfile/usr/lib/nodejs/zipfile.node

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-zipfile.git



More information about the Pkg-javascript-commits mailing list