use system jison

6 files changed, 49 insertions, 2 deletions

diff --git a/debian/control b/debian/control
index 7f0f340..c39eb7f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: web
 Priority: optional
 Maintainer: Pirate Praveen <praveen@debian.org>
 Build-Depends: debhelper (>= 9)
- , npm
+ , jison
+ , node-test
 Standards-Version: 3.9.8
 Homepage: https://github.com/zaach/lex-parser
 Vcs-Git: https://anonscm.debian.org/pkg-javascript/node-lex-parser.git
diff --git a/debian/patches/remove-npm.patch b/debian/patches/remove-npm.patch
new file mode 100644
index 0000000..ccfd9c2
--- /dev/null
+++ b/debian/patches/remove-npm.patch
@@ -0,0 +1,13 @@
+Index: node-lex-parser/Makefile
+===================================================================
+--- node-lex-parser.orig/Makefile
++++ node-lex-parser/Makefile
+@@ -2,7 +2,7 @@
+ all: install build test
+ 
+ install:
+-	npm install
++#	npm install
+ 
+ build:
+ 	node ./node_modules/.bin/jison lex.y lex.l
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9766172
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+remove-npm.patch
+use-nodejs.patch
+use-system-libs.patch
diff --git a/debian/patches/use-nodejs.patch b/debian/patches/use-nodejs.patch
new file mode 100644
index 0000000..2762508
--- /dev/null
+++ b/debian/patches/use-nodejs.patch
@@ -0,0 +1,18 @@
+Index: node-lex-parser/Makefile
+===================================================================
+--- node-lex-parser.orig/Makefile
++++ node-lex-parser/Makefile
+@@ -5,11 +5,11 @@ install:
+ #	npm install
+ 
+ build:
+-	node ./node_modules/.bin/jison lex.y lex.l
++	nodejs ./node_modules/.bin/jison lex.y lex.l
+ 	mv lex.js lex-parser.js
+ 
+ test:
+-	node tests/all-tests.js
++	nodejs tests/all-tests.js
+ 
+ 
+ 
diff --git a/debian/patches/use-system-libs.patch b/debian/patches/use-system-libs.patch
new file mode 100644
index 0000000..756e65d
--- /dev/null
+++ b/debian/patches/use-system-libs.patch
@@ -0,0 +1,13 @@
+Index: node-lex-parser/Makefile
+===================================================================
+--- node-lex-parser.orig/Makefile
++++ node-lex-parser/Makefile
+@@ -5,7 +5,7 @@ install:
+ #	npm install
+ 
+ build:
+-	nodejs ./node_modules/.bin/jison lex.y lex.l
++	nodejs /usr/bin/jison lex.y lex.l
+ 	mv lex.js lex-parser.js
+ 
+ test:
diff --git a/debian/rules b/debian/rules
index 3908954..5818822 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,5 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf node_modules
 	rm -f lex-parser.js