Merge branch 'master' into 'macos-scripts'

# Conflicts:
#   .gitignore

.gitignore

@@ -3,8 +3,7 @@ dist
 debian/gridtracker
 debian/.debhelper
 debian/files
-debian/nwjs
-debian/nwjs-sdk
+debian/gridtracker
 debian/*-stamp
 debian/*.substvars
 debian/tmp

debian/changelog

@@ -1,4 +1,10 @@
-gridtracker (1.20.0927) stable; urgency=medium
+gridtracker (1.20.0927+repack1) unstable; urgency=high
+
+  * Clean up nw execution in .desktop and .sh file.
+
+ -- Paul Traina <216482-pleasantone@users.noreply.gitlab.com>  Wed, 07 Oct 2020 09:16:02 -0700
+
+gridtracker (1.20.0927) unstable; urgency=medium
 
   [ Tag Loomis ]
   * Author release 1.20.0927

debian/gridtracker.desktop

@@ -2,8 +2,7 @@
 Name=GridTracker
 Comment=GridTracker
 GenericName=GridTracker, a WSJT-X Companion
-Path=/usr/lib/nwjs
-Exec=/usr/lib/nwjs/nw --enable-speech-dispatcher /usr/share/gridtracker
+Exec=nw --enable-speech-dispatcher /usr/share/gridtracker
 Icon=/usr/share/gridtracker/gridview.png
 Encoding=UTF-8
 Categories=Network;HamRadio

debian/gridtracker.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/bin/nw --enable-speech-dispatcher /usr/share/gridtracker $@
+exec nw --enable-speech-dispatcher /usr/share/gridtracker $@