[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 9bcbfe0fa48aba1da806fecfea79e3aa2d7bdb27

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit a0ea99f37b74d99bad9c30f2153fab0cb55041fa
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Tue Nov 29 10:37:24 2011 +0100

    use git describe to stamp the development version
    
    use 'git describe --tags --dirty' for a better development
    version stamp
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/Makefile b/Makefile
index ce6ac2b..c190762 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ site27 = $(libdir)/python2.7/dist-packages
 etcdir = $(prefix)/etc
 distribution=${shell dpkg-parsechangelog | sed -n 's/^Distribution: *//p'}
 ifeq ($(distribution),UNRELEASED)
-version=${shell echo "`dpkg-parsechangelog | sed -n 's/^Version: *//p'`~`date +%Y%m%d%H%M`"}
+version=${shell echo "`dpkg-parsechangelog | sed -n 's/^Version: *//p'`~`date +%Y%m%d%H%M`~`git describe --tags --dirty`"}
 else
 version=${shell dpkg-parsechangelog | sed -n 's/^Version: *//p'}
 endif

-- 
piuparts git repository