From c2c774fcc8ae34bdbcdd8d187530b41c478637cf Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Tue, 30 Aug 2016 11:23:01 +0200
Subject: [PATCH 1/3] Pass arguments along to build.sh

---
 scripts/build-deb.sh  | 1 +
 scripts/build-nsis.sh | 3 ++-
 scripts/build-rpm.sh  | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh
index dab317f859..f946e43aff 100755
--- a/scripts/build-deb.sh
+++ b/scripts/build-deb.sh
@@ -14,5 +14,6 @@ cd ${DIR}/..
     --buildDir build-deb \
     --targetDir /var/tmp/ \
     --jemalloc \
+    $@
 
 cd ${DIR}/..
diff --git a/scripts/build-nsis.sh b/scripts/build-nsis.sh
index 8949937a66..faf3e6dd71 100644
--- a/scripts/build-nsis.sh
+++ b/scripts/build-nsis.sh
@@ -11,6 +11,7 @@ cd ${DIR}/..
     --msvc \
     --buildDir /cygdrive/c/b/y/ \
     --package NSIS \
-    --targetDir /var/tmp/ 
+    --targetDir /var/tmp/ \
+    $@
 
 cd ${DIR}/..
diff --git a/scripts/build-rpm.sh b/scripts/build-rpm.sh
index a55221e601..0a298651fd 100755
--- a/scripts/build-rpm.sh
+++ b/scripts/build-rpm.sh
@@ -13,5 +13,6 @@ cd ${DIR}/..
     --buildDir build-rpm \
     --targetDir /var/tmp/ \
     --jemalloc \
+    $@
 
 cd ${DIR}/..

From 9b21d403eab8424b3a917def04246bb5c20bbf3f Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Tue, 30 Aug 2016 12:57:08 +0200
Subject: [PATCH 2/3] We mustn't use minuses in the releases since that will
 collide later on with packaging.

---
 Installation/release.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Installation/release.sh b/Installation/release.sh
index 4813c13050..5e56cc0a24 100755
--- a/Installation/release.sh
+++ b/Installation/release.sh
@@ -50,6 +50,11 @@ fi
 
 VERSION="$1"
 
+if echo ${VERSION} | grep -q -- '-'; then
+    echo "${VERSION} mustn't contain minuses! "
+    exit 1
+fi
+
 if git tag | grep -q "^v$VERSION$";  then
   echo "$0: version $VERSION already defined"
   exit 1

From 1c34b564ed3ef96c631d52462ff12c85a4e7681f Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Tue, 30 Aug 2016 14:39:48 +0200
Subject: [PATCH 3/3] Fix release matching for alpha/beta versions

---
 js/client/modules/@arangodb/index.js | 2 +-
 js/server/modules/@arangodb/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/client/modules/@arangodb/index.js b/js/client/modules/@arangodb/index.js
index bb05a23c88..ddcb9c4413 100644
--- a/js/client/modules/@arangodb/index.js
+++ b/js/client/modules/@arangodb/index.js
@@ -105,7 +105,7 @@ exports.plainServerVersion = function () {
       devel = version.match(/(.*)((alpha|beta|devel|rc)[0-9]*)$/);
 
       if (devel !== null) {
-        version = devel[1];
+        version = devel[1] + '0';
       }
     }
 
diff --git a/js/server/modules/@arangodb/index.js b/js/server/modules/@arangodb/index.js
index 0c656af4a1..971b4e1a50 100644
--- a/js/server/modules/@arangodb/index.js
+++ b/js/server/modules/@arangodb/index.js
@@ -86,7 +86,7 @@ exports.plainServerVersion = function () {
     devel = version.match(/(.*)((alpha|beta|devel|rc)[0-9]*)$/);
 
     if (devel !== null) {
-      version = devel[1];
+      version = devel[1] + '0';;
     }
   }