Merge branch 'robotastic:master' into multi-site-v1

5 files changed, 27 insertions, 23 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00e49524..254d5e1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,24 @@
 Trunk Recorder ChangeLog
 ========================
 
+### Version 4.5.0
+* Set d_call to null to prevent potential use after free by @galenguyer in https://github.com/robotastic/trunk-recorder/pull/739
+* Documenting maxDuration config param by @EricTendian in https://github.com/robotastic/trunk-recorder/pull/741
+* Conventional recorder info for MQTT and status-server plugins by @taclane in https://github.com/robotastic/trunk-recorder/pull/744
+* Cleanup dropped samples logging. by @tadscottsmith in https://github.com/robotastic/trunk-recorder/pull/745
+* Multiple CMake fixes and version updates to resolve compiler warnings by @galenguyer in https://github.com/robotastic/trunk-recorder/pull/738
+* Log cleanup by @tadscottsmith in https://github.com/robotastic/trunk-recorder/pull/749
+
+### Version 4.4.2
+* Fix logging when all transmissions are removed. by @tadscottsmith in #735
+* Fixes issue mentioned in #691 by @Dygear in #733
+* Improve CSV parsing to allow quoted and escaped fields by @EricTendian in #734
+* Updated Broadcastify Uploader to make it more robust by @robotastic in #736
+
+### Version 4.4.1
+* Fix for #606 by @JoeGilkey in #721
+* Improved Talkgroup Priority Logging by @tadscottsmith in #700
+* Build gr-osmosdr in Docker with multiple Airspy source patch by @EricTendian in #727
 
 ### Version 4.4.0
 * Add support for using a .csv file for adding for conventional channels
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96f43ae0..d1de4afe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,11 +22,11 @@
 ########################################################################
 
 cmake_minimum_required(VERSION 3.2)
-project(Trunk-Recorder LANGUAGES CXX C VERSION "4.4.2")
+project(Trunk-Recorder LANGUAGES CXX C VERSION "4.5.0")
 
-configure_file(cmake.h.in "${PROJECT_SOURCE_DIR}/cmake.h" @ONLY)
+configure_file(cmake.h.in "${PROJECT_BINARY_DIR}/cmake.h" @ONLY)
 ADD_COMPILE_DEFINITIONS(MANUAL_GITINFO="${MANUAL_GITINFO}")
-
+include_directories("${PROJECT_BINARY_DIR}")
 
 # Define the two required variables before including
 # the source code for watching a git repository.
@@ -46,18 +46,9 @@ if(NOT CMAKE_BUILD_TYPE)
 endif(NOT CMAKE_BUILD_TYPE)
 set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
 
-
 # Make sure our local CMake Modules path comes first
 list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
-# Set the version information here
-set(VERSION_MAJOR 4)
-set(VERSION_API   4)
-set(VERSION_ABI   2)
-set(VERSION_PATCH git)
-
-
-
 ########################################################################
 # Compiler specific setup
 ########################################################################
diff --git a/README.md b/README.md
index 1efcc783..c030215f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Trunk Recorder - v4.4.2
+Trunk Recorder - v4.5.0
 =======================
 
 ## Sponsors
diff --git a/cmake.h b/cmake.h
deleted file mode 100644
index c7fec335..00000000
--- a/cmake.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef INCLUDE_GUARD
-#define INCLUDE_GUARD
-
-#define PROJECT_NAME "Trunk-Recorder"
-#define PROJECT_VER  "4.4.2"
-#define PROJECT_VER_MAJOR "4"
-#define PROJECT_VER_MINOR "4"
-#define PTOJECT_VER_PATCH "2"
-
-#endif // INCLUDE_GUARD
diff --git a/cmake.h.in b/cmake.h.in
index 5deb996b..5d1c56fb 100644
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -1,3 +1,8 @@
+//
+// DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED!!!!
+// edit cmake.h.in instead
+//
+
 #ifndef INCLUDE_GUARD
 #define INCLUDE_GUARD