Skip to content

Commit

Permalink
preparing for merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ekarak committed Nov 25, 2015
1 parent a2daa0d commit a592974
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"defines": [
"OPENZWAVE_ETC=<(OZW_ETC)/config",
"OPENZWAVE_DOC=<!@(node -p -e \"'<(OZW_DOC)'.length ? '<(OZW_DOC)' : '/usr/local/share/doc/openzwave'\")",
"OPENZWAVE_SECURITY=<!@(nm <(OZW_LIB_PATH)/libopenzwave.so | grep _ZN9OpenZWave7Manager7AddNodeEjb | wc -l)"
"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)"
],
"link_settings": {
"libraries": [
Expand Down Expand Up @@ -58,7 +58,7 @@
"defines": [
"OPENZWAVE_ETC=<!@(node -p -e \"'<(OZW_ETC)'.length ? '<(OZW_ETC)' : '/usr/local/etc/openzwave'\")",
"OPENZWAVE_DOC=<!@(node -p -e \"'<(OZW_DOC)'.length ? '<(OZW_DOC)' : '/usr/local/share/doc/openzwave'\")",
"OPENZWAVE_SECURITY=<!@(nm <(OZW_LIB_PATH)/libopenzwave.so | grep _ZN9OpenZWave7Manager7AddNodeEjb | wc -l)"
"OPENZWAVE_SECURITY=<!@(find <(OZW_INC) -name ZWSecurity.h | wc -l)"
],
"link_settings": {
"libraries": ["-lopenzwave"]
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "openzwave-shared",
"version": "1.1.4",
"version": "1.1.5",
"description": "Node.JS bindings for OpenZWave including management and security functions",
"main": "./lib/openzwave-shared.js",
"dependencies" : {
Expand All @@ -18,13 +18,14 @@
"keywords": [
"zwave", "z-wave",
"home automation",
"openzwave"
"openzwave", "open-zwave"
],
"author": "Elias Karakoulakis <[email protected]>",
"contributors": [
"Jonathan Perkin <[email protected]> (http://www.perkin.org.uk/)" ,
"Thibaut CONSTANT",
"davide-lr"
"contributors": [
"Jonathan Perkin (http://www.perkin.org.uk/)" ,
"Thibaut CONSTANT",
"davide-lr",
"Luke Hertert (http://werul.com)"
],
"license": {
"type": "ISC",
Expand Down

0 comments on commit a592974

Please sign in to comment.