From bd4c214c39dc2953cb923da6432019a9117f9608 Mon Sep 17 00:00:00 2001
From: walker0643 <>
Date: Mon, 7 May 2018 13:20:40 -0400
Subject: [PATCH] bump version to 2.1. remove dependence on git for tarball
 builds.

---
 cmake/Version.cmake  | 20 +++++++++++++-------
 res/barrier2.desktop | 11 -----------
 2 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 res/barrier2.desktop

diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 2f38df2e..4fe8e14b 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.4)
 
 set (BARRIER_VERSION_MAJOR 2)
-set (BARRIER_VERSION_MINOR 0)
+set (BARRIER_VERSION_MINOR 1)
 set (BARRIER_VERSION_PATCH 0)
 
 #
@@ -44,12 +44,18 @@ if (NOT DEFINED BARRIER_REVISION)
     if (DEFINED ENV{GIT_COMMIT})
         string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION)
     else()
-        execute_process (
-            COMMAND git rev-parse --short=8 HEAD
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-            OUTPUT_VARIABLE BARRIER_REVISION
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
+        find_program (GIT_BINARY git)
+        if (GIT_BINARY STREQUAL "GIT_BINARY-NOTFOUND")
+            set (BARRIER_REVISION "00000000")
+            message (WARNING "git not found. revision hash set to ${BARRIER_REVISION}")
+        else()
+            execute_process (
+                COMMAND git rev-parse --short=8 HEAD
+                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                OUTPUT_VARIABLE BARRIER_REVISION
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+            )
+        endif()
     endif()
 endif()
 
diff --git a/res/barrier2.desktop b/res/barrier2.desktop
deleted file mode 100644
index 25aaf519..00000000
--- a/res/barrier2.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Barrier
-Comment=Keyboard and mouse sharing solution
-Path=/usr/bin
-Exec=/usr/bin/barrier2
-Icon=barrier
-Terminal=false
-Categories=Utility;
-Keywords=keyboard;mouse;sharing;network;share;