From 5d60b049228e1b2c8cceb0e9da21b519e509f1a4 Mon Sep 17 00:00:00 2001
From: Johan Lorenzo <jlorenzo@mozilla.com>
Date: Thu, 21 Apr 2016 14:22:33 +0200
Subject: [PATCH] Make foxbox build against the in-tree openzwave-adapter

---
 Cargo.lock |  3 +--
 Cargo.toml | 13 +++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 273dc3fc..1342432c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,7 +24,7 @@ dependencies = [
  "nix 0.5.1-pre (git+https://github.com/nix-rust/nix.git?rev=138080)",
  "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-sys 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "openzwave-adapter 0.1.0 (git+https://github.com/fxbox/openzwave-adapter)",
+ "openzwave-adapter 0.1.0",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.1.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "router 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -671,7 +671,6 @@ dependencies = [
 [[package]]
 name = "openzwave-adapter"
 version = "0.1.0"
-source = "git+https://github.com/fxbox/openzwave-adapter#99e4291f19bab5d25dca56d370ec441d84893819"
 dependencies = [
  "foxbox_taxonomy 0.1.2 (git+https://github.com/fxbox/taxonomy.git)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 626b61e7..505f7208 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,18 +15,20 @@ default = ["authentication"]
 authentication = []
 
 [dependencies]
+foxbox_thinkerbell = { path = "components/thinkerbell/" }
+openzwave-adapter = { path = "components/openzwave-adapter/" }
+foxbox_taxonomy = { git = "https://github.com/fxbox/taxonomy.git" }
+foxbox_users = { git = "https://github.com/fxbox/users.git", rev = "1033e08" }
+multicast_dns = { git = "https://github.com/fxbox/multicast-dns.git", rev = "a6e4bcc" }
+iron-cors = { git = "https://github.com/fxbox/iron-cors.git", rev = "96ede73" }
+
 chrono = "0.2.19"
 clippy = "0.0.63"
 docopt = "0.6.78"
 docopt_macros = "0.6.80"
 env_logger = "0.3.2"
-foxbox_taxonomy = { git = "https://github.com/fxbox/taxonomy.git" }
-foxbox_thinkerbell = { path = "components/thinkerbell/" }
-foxbox_users = { git = "https://github.com/fxbox/users.git", rev = "1033e08" }
 get_if_addrs = "0.3.1"
 hyper = "0.7.2"
-multicast_dns = { git = "https://github.com/fxbox/multicast-dns.git", rev = "a6e4bcc" }
-iron-cors = { git = "https://github.com/fxbox/iron-cors.git", rev = "96ede73" }
 mktemp = "0.1.2"
 libc = "0.2.7"
 log = "0.3"
@@ -35,7 +37,6 @@ mount = "0.0.10"
 nix = { git = "https://github.com/nix-rust/nix.git", rev = "138080" } # Until 0.5.1 is released
 openssl = "0.7.6"
 openssl-sys = "0.7.6"
-openzwave-adapter = { git = "https://github.com/fxbox/openzwave-adapter" }
 rand = "0.3"
 router = "0.1.0"
 rust-crypto = "0.2.34"