From 32ed3bbcb348ff664ae0db617606b4ad728cdfb8 Mon Sep 17 00:00:00 2001
From: Torben Hoffmann <thoffmann@basho.com>
Date: Tue, 25 Aug 2015 23:34:56 +0200
Subject: [PATCH 1/2] Fix incorrect depdenecies

* Updated rebar.config and clique.app.src to reflect the actual use in the app.
* Added relax.config that builds a correct release.
---
 .gitignore         | 1 +
 rebar.config       | 3 ++-
 relx.config        | 5 +++++
 src/clique.app.src | 4 +++-
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 relx.config

diff --git a/.gitignore b/.gitignore
index 742dff1..513ca32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .local_dialyzer_plt
 deps/
 ebin/
+_rel
diff --git a/rebar.config b/rebar.config
index 2f26df7..621d826 100644
--- a/rebar.config
+++ b/rebar.config
@@ -12,5 +12,6 @@
 ]}.
 
 {deps, [
-  {cuttlefish, ".*", {git, "git://github.com/basho/cuttlefish.git", {branch, "develop"}}}
+  {cuttlefish, "2.0.4", {git, "git://github.com/basho/cuttlefish.git", {tag, "2.0.4"}}},
+  {webmachine, "1.10.8", {git, "git://github.com/basho/webmachine.git", {tag, "1.10.8"}}}
 ]}.
diff --git a/relx.config b/relx.config
new file mode 100644
index 0000000..b121649
--- /dev/null
+++ b/relx.config
@@ -0,0 +1,5 @@
+{lib_dirs, ["./deps"]}.
+
+{release, {clique, "0.3.3"},
+          ["cuttlefish>=2.0.4",
+           "webmachine>=1.10.8"]}.
\ No newline at end of file
diff --git a/src/clique.app.src b/src/clique.app.src
index 757958c..19268ef 100644
--- a/src/clique.app.src
+++ b/src/clique.app.src
@@ -6,7 +6,9 @@
   {registered, []},
   {applications, [
                   kernel,
-                  stdlib
+                  stdlib,
+                  cuttlefish,
+                  webmachine
                  ]},
   {mod, {clique_app, []}},
   {env, []}

From b971cef07cd3853866a6579c8d0834bb90abdf75 Mon Sep 17 00:00:00 2001
From: Torben Hoffmann <thoffmann@basho.com>
Date: Tue, 1 Sep 2015 14:17:19 +0200
Subject: [PATCH 2/2] Point cuttlefish to th/correct-dependencies branch

---
 rebar.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config b/rebar.config
index 621d826..acd147e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -12,6 +12,6 @@
 ]}.
 
 {deps, [
-  {cuttlefish, "2.0.4", {git, "git://github.com/basho/cuttlefish.git", {tag, "2.0.4"}}},
+  {cuttlefish, "2.*", {git, "git://github.com/basho/cuttlefish.git", {branch, "th/correct-dependencies"}}},
   {webmachine, "1.10.8", {git, "git://github.com/basho/webmachine.git", {tag, "1.10.8"}}}
 ]}.