From e5c487fd9ec36053525c98d4a9674717042bb34c Mon Sep 17 00:00:00 2001
From: Ulrich Eckhardt <uli@uli-eckhardt.de>
Date: Tue, 27 Feb 2018 18:57:47 +0100
Subject: Add git version information

---
 HISTORY        |  7 +++++++
 Makefile       | 10 +++++++---
 po/menuorg.pot |  4 ++--
 src/Version.h  |  6 +++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/HISTORY b/HISTORY
index 4b43576..1700f2c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -73,3 +73,10 @@ VDR Plugin 'menuorg' Revision History
 
 - Minor fix in member initialization (thx to by Lars Hanisch)
 - Correctly link shared libs (thx to by Lars Hanisch)
+
+2017-02-27: Version 0.5.x
+
+- Fix file not found error message during compile.
+- Fix close of OSD on deletion of a recording (tx to clausmuus).
+- Add git tag information to plugin version
+
diff --git a/Makefile b/Makefile
index 4b8b901..f822c3a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,12 @@
 
 PLUGIN = menuorg
 
-### The version number of this plugin (taken from the main source file):
+### The version number of this plugin (taken from Version.h):
 
-VERSION = $(shell grep 'static const char VERSION\[\] =' src/Version.h | awk '{ print $$6 }' | sed -e 's/[";]//g')
+VERSION = $(shell grep 'static const char VERSION\[\] =' src/Version.h | \
+			grep -v GIT | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+GIT_REV = $(shell git describe --always 2>/dev/null)
 
 ### The directory environment:
 
@@ -48,7 +51,8 @@ INCLUDES += `pkg-config glibmm-2.4 --cflags`
 LIBS +=  `pkg-config libxml++-2.6 --libs`
 LIBS +=  `pkg-config glibmm-2.4 --libs`
 
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' \
+	$(if $(GIT_REV), -DGIT_REV='"$(GIT_REV)"')
 
 ### The source files (add further files here):
 
diff --git a/po/menuorg.pot b/po/menuorg.pot
index f9c926f..7e64ba3 100644
--- a/po/menuorg.pot
+++ b/po/menuorg.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-menuorg 0.5.1\n"
+"Project-Id-Version: vdr-menuorg 0.5.2\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-02-27 18:31+0100\n"
+"POT-Creation-Date: 2018-02-27 18:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/Version.h b/src/Version.h
index e8c5eaf..735b5ef 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -24,6 +24,10 @@
 #ifndef ___VERSION_H
 #define ___VERSION_H
 
-static const char VERSION[] = "0.5.1";
+#ifndef GIT_REV
+static const char VERSION[] = "0.5.2";
+#else
+static const char VERSION[] = GIT_REV;
+#endif
 
 #endif
-- 
cgit v1.2.3