[pitivi] pitivi: Use version from git so user has more info about what is actually running

[Thibault Saunier <tsaunier src gnome org>]

commit a2ecfd7f532b0d8151d8108073e3eb3af93ecaae
Author: Thibault Saunier <tsaunier gnome org>
Date:   Sat Jun 18 09:14:09 2016 -0400

    pitivi: Use version from git so user has more info about what is actually running
    
    This implies we will now on tag release with the exact version number
    and not some extra RELEASE_XXX name (which is what should always have
    been done anyway)
    
    Reviewed-by: Alex Băluț <alexandru balut gmail com>
    Differential Revision: https://phabricator.freedesktop.org/D1093

 configure.ac           |    1 +
 pitivi/configure.py.in |    1 +
 pitivi/mainwindow.py   |    8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 534a29a..656d9e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 AC_CONFIG_MACRO_DIR([m4])
 
 AS_AC_EXPAND(LIBDIR, $libdir)
+AS_AC_EXPAND(GITVERSION, m4_esyscmd_s([git describe --always]))
 AC_MSG_NOTICE(Storing library files in $LIBDIR)
 
 AS_AC_EXPAND(DATADIR, $datadir)
diff --git a/pitivi/configure.py.in b/pitivi/configure.py.in
index 1a6d3f8..83979af 100644
--- a/pitivi/configure.py.in
+++ b/pitivi/configure.py.in
@@ -35,6 +35,7 @@ def in_devel():
 
 LIBDIR = '@LIBDIR@'
 PKGDATADIR = '@DATADIR@/@PACKAGE@'
+GITVERSION = '@GITVERSION@'
 VERSION = '@VERSION@'
 APPNAME = '@PACKAGE_NAME@'
 APPURL = 'http://www.pitivi.org/'
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index c1bf51b..7bd73df 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -35,8 +35,8 @@ from pitivi.configure import APPNAME
 from pitivi.configure import APPURL
 from pitivi.configure import get_pixmap_dir
 from pitivi.configure import get_ui_dir
+from pitivi.configure import GITVERSION
 from pitivi.configure import in_devel
-from pitivi.configure import VERSION
 from pitivi.dialogs.prefs import PreferencesDialog
 from pitivi.effects import EffectListWidget
 from pitivi.mediafilespreviewer import PreviewWidget
@@ -603,13 +603,13 @@ class MainWindow(Gtk.ApplicationWindow, Loggable):
         abt.set_website(APPURL)
 
         if in_devel():
-            version_str = _("Development version")
+            version_str = _("Development version: %s" % GITVERSION)
         elif not self.app.isLatest():
             version_str = _("Version %(cur_ver)s — %(new_ver)s is available" %
-                            {"cur_ver": VERSION,
+                            {"cur_ver": GITVERSION,
                              "new_ver": self.app.getLatest()})
         else:
-            version_str = _("Version %s" % VERSION)
+            version_str = _("Version %s" % GITVERSION)
         abt.set_version(version_str)
 
         comments = ["",