Merge remote-tracking branch 'origin/1.4' into devel

Conflicts:
	Makefile.in

CMakeLists.txt

@@ -378,6 +378,10 @@ endif ()
 ################################################################################
 
 if ((BUILD_PACKAGE STREQUAL "debian") OR (BUILD_PACKAGE STREQUAL "raspbian"))
+  if (BUILD_PACKAGE STREQUAL "raspbian")
+    set(CPACK_SYSTEM_NAME "raspbian")
+  endif ()
+
   set(CPACK_DEBIAN_PACKAGE_SECTION "database")
   set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA 
     "${PROJECT_SOURCE_DIR}/Installation/Debian/postinst;${PROJECT_SOURCE_DIR}/Installation/Debian/preinst;${PROJECT_SOURCE_DIR}/Installation/Debian/postrm;${PROJECT_SOURCE_DIR}/Installation/Debian/prerm;")

Installation/Debian/rc.arangodb

@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 ### BEGIN INIT INFO
 # Provides:          arangodb
@@ -26,7 +26,7 @@ start () {
     test -d $PIDDIR || mkdir $PIDDIR
     chown arangodb $PIDDIR
 
-    if [ "$1" == "--upgrade" ]; then
+    if [ "x$1" == "x--upgrade" ]; then
       $DAEMON -c $CONF $@
     else
       $DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor $@

Installation/Linux/rc.arangod.Centos

@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 #
 # arangod        Startup script for the ArangoDB Server
 #

Installation/Linux/rc.arangod.OpenSuSE

@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Copyright (c) 2011-2012 triAGENS GmbH Cologne, Germany.
 #
 # Author: Achim Brandt <a.brandt@triagens.de>
@@ -47,7 +47,7 @@ start () {
     ARANGO_PIDDIR=`dirname $ARANGO_PIDFILE`
     test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arangodb $ARANGO_PIDDIR)
  
-    if [ "$1" == "--upgrade" ];  then
+    if [ "x$1" == "x--upgrade" ];  then
       $ARANGO_BIN -c $ARANGO_SYSCONFIG $@ 
     else
       startproc $ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$ARANGO_PIDFILE" --supervisor $@ 

Installation/Linux/rc.arangod.Ubuntu

@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 ### BEGIN INIT INFO
 # Provides:          arangodb
@@ -27,7 +27,7 @@ start () {
     test -d $PIDDIR || mkdir $PIDDIR
     chown arangodb $PIDDIR
 
-    if [ "$1" == "--upgrade" ]; then
+    if [ "x$1" == "x--upgrade" ]; then
       $DAEMON -c $CONF $@
     else
       $DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor $@

Makefile.am

@@ -572,7 +572,7 @@ pack-arm:
 
 pack-arm-cmake:
 	cd Build && cmake \
-		-D "BUILD_PACKAGE=debian" \
+		-D "BUILD_PACKAGE=raspbian" \
 		-D "CMAKE_INSTALL_PREFIX=${prefix}" \
 		-D "ETCDIR=${sysconfdir}" \
 		-D "VARDIR=${localstatedir}" \