From f8a86d118649b8b7172b5b81a5aa373ec09aa94d Mon Sep 17 00:00:00 2001
From: "A. Maitland Bottoms" <bottoms@debian.org>
Date: Sat, 17 Oct 2020 22:21:12 -0400
Subject: [PATCH 4/6] debian version

Show Debian package version information in the About box.
---
 CMakeLists.txt      | 10 ++++++++--
 src/fdmdv2_main.cpp | 10 ++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 584ce7e..fbfc055 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,12 @@ endif(NOT CMAKE_BUILD_TYPE)
 # Work around for not using a svn working copy.
 #add_definitions(-D_NO_AUTOTOOLS_)
 
+set(DEB_VERSION "" CACHE STRING "Debian packages build with this setting")
+
+if (NOT (${DEB_VERSION} STREQUAL ""))
+  add_definitions(-DDEB_VERSION="${DEB_VERSION}")
+  message(STATUS "Debian FreeDV version: ${DEB_VERSION}")
+else()
 #
 # Find the git hash if this is a working copy.
 #
@@ -90,7 +96,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git)
 else()
         add_definitions(-DGIT_HASH="None")
 endif()
-
+endif()
 
 # Set default build flags.
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
@@ -254,7 +260,7 @@ else(CODEC2_BUILD_DIR)
     message(STATUS "Looking for codec2...")
     # 'CONFIG' removed due to incompatibility with cmake version
     # in Ubuntu 12.04 (Precise) -- Stuart Longland
-    find_package(codec2 QUIET)
+    find_package(codec2)
     if(codec2_FOUND)
         get_target_property(CODEC2_LIBRARY codec2 LOCATION)
         get_target_property(CODEC2_INCLUDE_DIRS codec2 INTERFACE_INCLUDE_DIRECTORIES)
diff --git a/src/fdmdv2_main.cpp b/src/fdmdv2_main.cpp
index 8450cbe..12b1dfd 100644
--- a/src/fdmdv2_main.cpp
+++ b/src/fdmdv2_main.cpp
@@ -2621,12 +2621,10 @@ void MainFrame::OnHelpAbout(wxCommandEvent& event)
 
                 wxT("GNU Public License V2.1\n\n")
                 wxT("Copyright (c) David Witten KD0EAG and David Rowe VK5DGR\n\n")
-                wxT("freedv-gui version: %s\n")
-                wxT("freedv-gui git hash: %s\n")
-                wxT("codec2 git hash: %s\n")
-                wxT("lpcnet git hash: %s\n"),
-                FREEDV_VERSION, FREEDV_VERSION, GIT_HASH, freedv_get_hash(), lpcnet_get_hash());
-                
+		wxT("FreeDV API Version: %d\n")
+		wxT("Debian package version: %s\n"),
+                FREEDV_VERSION, freedv_get_version(), DEB_VERSION);
+
     wxMessageBox(msg, wxT("About"), wxOK | wxICON_INFORMATION, this);
 }
 
-- 
2.20.1

