From c687e87e7a756a99559304f7f6f57d2f03dfa2de Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Mon, 2 Mar 2020 21:48:16 +0100
Subject: [PATCH] imageinfo: add clean packag names, add fallback for missing
 built date

---
 src/gui/imageinfo.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp
index d5b842995..2f38d3445 100644
--- a/src/gui/imageinfo.cpp
+++ b/src/gui/imageinfo.cpp
@@ -45,7 +45,7 @@
 #ifdef VCS
 #include "version.h"
 #endif
-#include <gui/buildinfo.h>
+#include "buildinfo.h"
 #define LICENSEDIR DATADIR "/neutrino/license/"
 #define POLICY_DIR DATADIR "/neutrino/policy/"
 #ifdef ENABLE_LUA
@@ -307,11 +307,14 @@ void CImageInfo::InitInfoData()
 
 	config.loadConfig(VERSION_FILE);
 
+	string builddate = "";
 #ifdef BUILT_DATE
-	const char * builddate = BUILT_DATE;
+	builddate = BUILT_DATE;
 #else
-	const char * builddate = config.getString("builddate", "n/a").c_str();
+	builddate = config.getString("builddate", "").c_str();
 #endif
+	if (builddate.empty())
+		builddate = PACKAGE_VERSION_DATE;
 
 	string version_string = config.getString("version", "");
 
@@ -365,18 +368,20 @@ void CImageInfo::InitInfoData()
 		v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_CREATOR), creator});
 
 	//gui
-	v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_GUI), config.getString("gui", PACKAGE_STRING)});
+	v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_GUI), config.getString("gui", PACKAGE_NAME)});
 
 #ifdef VCS
 	//gui vcs
 	v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS),	VCS});
+#else
+	v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS),	PACKAGE_VERSION_GIT});
 #endif
 
 #if USE_STB_HAL
 	hal_libversion_t ver;
 	hal_get_lib_version(&ver);
 	//libstb-hal version
-	v_info.push_back({"libstb-hal:", ver.vStr});
+	v_info.push_back({"libstb-hal:", ver.vName});
 	//libstb-hal git status
 	v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), ver.vGitDescribe});
 #endif