From 9ca0f6bfc9eda8f7009646664fd8e5abc2120c4a Mon Sep 17 00:00:00 2001
From: Mike Blume <mike@loggly.com>
Date: Mon, 13 Aug 2012 10:36:12 -0700
Subject: [PATCH] insert hash in package version

---
 git/package.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git/package.sh b/git/package.sh
index 8d5fb0d..b01d574 100644
--- a/git/package.sh
+++ b/git/package.sh
@@ -13,6 +13,7 @@ name="$(sh $basedir/name.sh)"
 branch=$(sh $basedir/current-branch.sh)
 upstream=$(sh $basedir/upstream.sh)
 revision="$(sh $basedir/last-commit-timestamp.sh $upstream)"
+hash="$(git show --oneline | head -n 1 | cut -d ' ' -f 1)"
 
 dir=build
 sh $basedir/pristine-checkout.sh $branch $dir
@@ -27,6 +28,6 @@ prefix="/opt/loggly/$name"
 [ -f $dir/build.xml ] && (cd $dir; ant artifact)
 
 pkgname=loggly-$name
-pkgversion=$revision.$branch
+pkgversion=$revision.$hash.$branch
 echo "Building deb package for $pkgname=$pkgversion"
 fpm -s dir -t deb --prefix $prefix -n $pkgname -v $pkgversion -C $dir "$@"