diff options
| author | Micah Anderson <micah@riseup.net> | 2014-01-17 15:55:08 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2014-01-17 15:55:08 -0500 |
| commit | 29f3beeeed69c71d28ad435795066577734973a4 (patch) | |
| tree | 4cd1985b67964c8e02a9637cc8dc2cdb70c26e57 | |
| parent | 32bbf35789a0c80d3c261df8aa411f302157770e (diff) | |
refresh patches
| -rw-r--r-- | debian/patches/disable_embedded_rebar | 14 | ||||
| -rw-r--r-- | debian/patches/disable_embedded_scons | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches/disable_embedded_rebar b/debian/patches/disable_embedded_rebar index 95677029..bbad6adf 100644 --- a/debian/patches/disable_embedded_rebar +++ b/debian/patches/disable_embedded_rebar @@ -1,7 +1,7 @@ Index: cloudant_bigcouch/configure =================================================================== ---- cloudant_bigcouch.orig/configure 2014-01-17 07:06:10.581791425 -0500 -+++ cloudant_bigcouch/configure 2014-01-17 07:06:10.577791533 -0500 +--- cloudant_bigcouch.orig/configure 2014-01-17 15:53:41.428890160 -0500 ++++ cloudant_bigcouch/configure 2014-01-17 15:53:41.424890268 -0500 @@ -88,4 +88,4 @@ done @@ -10,8 +10,8 @@ Index: cloudant_bigcouch/configure +rebar get-deps && rebar update-deps && cat rel/bigcouch.config Index: cloudant_bigcouch/deps/ibrowse/Makefile =================================================================== ---- cloudant_bigcouch.orig/deps/ibrowse/Makefile 2014-01-17 07:06:10.581791425 -0500 -+++ cloudant_bigcouch/deps/ibrowse/Makefile 2014-01-17 07:06:10.577791533 -0500 +--- cloudant_bigcouch.orig/deps/ibrowse/Makefile 2014-01-17 15:53:41.428890160 -0500 ++++ cloudant_bigcouch/deps/ibrowse/Makefile 2014-01-17 15:53:41.424890268 -0500 @@ -1,17 +1,17 @@ IBROWSE_VSN = $(shell sed -n 's/.*{vsn,.*"\(.*\)"}.*/\1/p' src/ibrowse.app.src) @@ -35,15 +35,15 @@ Index: cloudant_bigcouch/deps/ibrowse/Makefile -s ibrowse_test verify_chunked_streaming \ Index: cloudant_bigcouch/Makefile =================================================================== ---- cloudant_bigcouch.orig/Makefile 2014-01-17 07:06:05.041940708 -0500 -+++ cloudant_bigcouch/Makefile 2014-01-17 07:06:35.241126925 -0500 +--- cloudant_bigcouch.orig/Makefile 2014-01-17 15:53:41.428890160 -0500 ++++ cloudant_bigcouch/Makefile 2014-01-17 15:54:02.736315986 -0500 @@ -18,23 +18,23 @@ compile: @echo "==> couchjs (compile)" @cd couchjs && python scons/scons.py - @./rebar compile + @rebar compile - @cat $(appfile) | sed s/%VSN%/`echo 1.1.1-792-gc8a44ff`/ > $(appfile) + @sed -i 's/%VSN%/1.1.1-792-gc8a44ff/' $(appfile) clean: @echo "==> couchjs (clean)" diff --git a/debian/patches/disable_embedded_scons b/debian/patches/disable_embedded_scons index 91f57399..f14372dd 100644 --- a/debian/patches/disable_embedded_scons +++ b/debian/patches/disable_embedded_scons @@ -1,7 +1,7 @@ Index: cloudant_bigcouch/Makefile =================================================================== ---- cloudant_bigcouch.orig/Makefile 2014-01-17 07:09:37.100226333 -0500 -+++ cloudant_bigcouch/Makefile 2014-01-17 07:10:27.906857239 -0500 +--- cloudant_bigcouch.orig/Makefile 2014-01-17 15:54:08.920149349 -0500 ++++ cloudant_bigcouch/Makefile 2014-01-17 15:54:24.039741918 -0500 @@ -17,13 +17,13 @@ appfile = apps/couch/ebin/couch.app compile: @@ -9,7 +9,7 @@ Index: cloudant_bigcouch/Makefile - @cd couchjs && python scons/scons.py + @cd couchjs && /usr/bin/scons @rebar compile - @cat $(appfile) | sed s/%VSN%/`echo 1.1.1-792-gc8a44ff`/ > $(appfile) + @sed -i 's/%VSN%/1.1.1-792-gc8a44ff/' $(appfile) clean: @echo "==> couchjs (clean)" |