From: Christian Dywan <christian@twotoasts.de>
Date: Wed, 14 Jul 2010 21:48:45 +0000 (+0200)
Subject: Use 'git describe' to generate the git version string
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5a4023a7d40184cd270d43fe5b59191b87e87b5;p=midori

Use 'git describe' to generate the git version string
---

diff --git a/wscript b/wscript
index c21dc807..ae358ab8 100644
--- a/wscript
+++ b/wscript
@@ -35,9 +35,9 @@ APPNAME = 'midori'
 VERSION = str (major) + '.' + str (minor) + '.' + str (micro)
 
 try:
-    git = Utils.cmd_output (['git', 'rev-parse', '--short', 'HEAD'], silent=True)
+    git = Utils.cmd_output (['git', 'describe'], silent=True)
     if git:
-        VERSION = (VERSION + '-' + git).strip ()
+        VERSION = git
 except:
     pass