improvements in deb packaging (compliance with current standards, etc)

* set DEBEMAIL;
* move deb/debian/vars.config to ..;
* add missing build dependency on libpam0g-dev;
* rm /var/lib/riak on purge.

Author: Andrei Zavada

rebar.config

@@ -161,7 +161,7 @@
     ]},
     {deb, [
         {relx, [
-            {overlay_vars, "debian/vars.config"},
+            {overlay_vars, "rel/pkg/deb/vars.config"},
             {overlay, [
                 {template, "rel/files/riak", "usr/bin/riak"}
             ]},

rel/pkg/deb/Makefile

@@ -2,6 +2,8 @@ export
 
 TAR_VERSION = $(shell git describe --tags | sed -e 's/\([0-9.]*\-[0-9]*\)-.*/\1/')
 
+DEBEMAIL = $(shell git config user.email)
+
 default:
 	mkdir -p $(BASE_DIR)/rel/pkg/out/$(PKG_ID)/debian
 	cp -R $(BASE_DIR)/rel/pkg/deb/debian/* $(BASE_DIR)/rel/pkg/out/$(PKG_ID)/debian
@@ -18,7 +20,7 @@ default:
 			-e RELEASE=$(PKG_BUILD) \
             -e REBAR=$(REBAR) \
 		-i -uc -us -b
-	
+
 	mkdir -p $(BASE_DIR)/rel/pkg/packages
 	cd $(BASE_DIR)/rel/pkg/out && mv *.deb ../packages
 	cd $(BASE_DIR)/rel/pkg/packages && \

rel/pkg/deb/debian/compat

@@ -1 +1 @@
-7
+10

rel/pkg/deb/debian/control

@@ -2,7 +2,7 @@ Source: riak
 Section: net
 Priority: extra
 Maintainer: packaging <[email protected]>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), libpam0g-dev
 Standards-Version: 3.9.3
 Homepage: riak.com
 

rel/pkg/deb/debian/install

@@ -2,7 +2,8 @@ rel/riak/lib usr/lib/riak
 rel/riak/share usr/lib/riak
 rel/riak/erts* usr/lib/riak
 rel/riak/releases usr/lib/riak
+rel/riak/bin/riak-* usr/sbin
+rel/riak/usr/bin/riak usr/sbin
 rel/riak/bin usr/lib/riak
 rel/riak/etc/* etc/riak
 rel/riak/data/* var/lib/riak
-rel/riak/usr/bin/* usr/sbin

rel/pkg/deb/debian/postinst

@@ -22,6 +22,7 @@ fi
 for i in lib log; do
     chown -R riak:riak /var/$i/riak
 done
+chown -R riak:riak /etc/riak
 
 case "$1" in
     configure)

rel/pkg/deb/debian/postrm

@@ -25,6 +25,9 @@ case "$1" in
         if [ -d /var/log/riak ]; then
                 rm -r /var/log/riak
         fi
+        if [ -d /var/lib/riak ]; then
+                rm -rf /var/lib/riak
+        fi
         if [ -d /var/run/riak ]; then
                 rm -r /var/run/riak
         fi

rel/pkg/deb/debian/vars.config renamed to rel/pkg/deb/vars.config

@@ -1,6 +1,8 @@
 %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
 %% ex: ft=erlang ts=4 sw=4 et
 
+{rel_vsn, "3.0.9.1"}.
+
 %% Platform-specific installation paths
 {platform_bin_dir,  "/usr/lib/riak/bin"}.
 {platform_data_dir, "/var/lib/riak"}.
@@ -17,8 +19,8 @@
 {runner_user,        "riak"}.
 {runner_lib_dir,     "/usr/lib/riak/lib"}.
 {runner_patch_dir,   "/usr/lib/riak/lib/patches"}.
-{pipe_dir,           "/tmp/riak/"}.
-{pid_dir,            "/run/riak/"}.
+{pipe_dir,           "/tmp/riak"}.
+{pid_dir,            "/run/riak"}.
 {package_replacement_line, ""}.
 {package_conflicts_line, ""}.