From 71539170ffaef1189adbccaf3b81cd2fb3e14c7b Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@symless.com>
Date: Thu, 27 Jul 2023 02:32:39 -0700
Subject: [PATCH] Remove redundant Build.properties file and comment
 Version.cmake (#7268)

* Delete Build.properties

* Update Version.cmake

* Update ChangeLog

* Update cmake/Version.cmake

* Move line so comment is clearer
---
 Build.properties    |  7 -------
 ChangeLog           | 21 +++++++++++----------
 cmake/Version.cmake |  4 +++-
 3 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 Build.properties

diff --git a/Build.properties b/Build.properties
deleted file mode 100644
index 758ad6a96..000000000
--- a/Build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Synergy build parameters
-#
-SYNERGY_VERSION_MAJOR = 1
-SYNERGY_VERSION_MINOR = 10
-SYNERGY_VERSION_PATCH = 2
-SYNERGY_VERSION_STAGE = snapshot
diff --git a/ChangeLog b/ChangeLog
index 0b5fc1065..4f91427da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,33 +2,34 @@
 ======
 
 Bug fixes:
-- #7262 Fix backward compatibility for m1 and m2 builds.
-- #7265 Remove extra key press traces for Linux.
+- #7265 Remove extra key press traces for Linux
 
 Enhancements:
-- #7254 Ability to bind synergy client to a network interface.
+- #7262 Backward compatibility for M1 and M2 builds
+- #7254 Ability to bind client to a network interface
+- #7263 Change name of Flatpak uploaded to snapshots
 
 1.14.6
 ======
 
 Bug fixes:
-- #7208 Fix crash on FreeBSD when pressing special keys on a client.
-- #7241 Change the default signature hashing algorithm for sha256.
-- #7242 Fix tls certificate generation for flatpak.
+- #7208 Crash on FreeBSD when pressing special keys on a client
+- #7241 Change the default signature hashing algorithm for sha256
+- #7242 TLS certificate generation for Flatpak
 
 Enhancements:
-- #7222 Ability to initiate non-TLS connection from server
-- #7225 Ability to initiate TLS connection from server
+- #7222 Initiate non-TLS connection from server
+- #7225 Initiate TLS connection from server
 - #7239 Single app for server and client
 - #7248 Firewall exception for client
-- #7250 Add builds for Fedora 37 and 38
+- #7250 Builds for Fedora 37 and 38
 
 1.14.5
 ======
 
 Bug fixes:
 - #7182 Remove unused TLS options from the GUI on client
-- #7186 There are no additional TLS options for all users setting
+- #7186 No additional TLS options for all users setting
 
 Enhancements:
 - #7183 Refactoring for Synergy 3 licenses
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 1753e9e03..2d79b1c54 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -7,9 +7,11 @@ cmake_minimum_required (VERSION 3.4)
 set (SYNERGY_VERSION_MAJOR 1)
 set (SYNERGY_VERSION_MINOR 14)
 set (SYNERGY_VERSION_PATCH 7)
-set (SYNERGY_VERSION_BUILD 1)
 set (SYNERGY_VERSION_STAGE "snapshot")
 
+# CI changes this to the current tag, but doesn't commit
+set (SYNERGY_VERSION_BUILD 1)
+
 #
 # Version from CI
 #