From 743c3dee32f1911e0273852f18fc249ff757f513 Mon Sep 17 00:00:00 2001 From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Date: Wed, 7 Oct 2020 09:14:32 -0700 Subject: [PATCH 1/3] Grab nw from the user path --- debian/gridtracker.desktop | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/gridtracker.desktop b/debian/gridtracker.desktop index e59e085..4e16822 100644 --- a/debian/gridtracker.desktop +++ b/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 From cd6a48ee1ec53ea0ca18de0b425af0033d9bb751 Mon Sep 17 00:00:00 2001 From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Date: Wed, 7 Oct 2020 09:31:49 -0700 Subject: [PATCH 2/3] Remove last vestages of nwjs --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7841564..32698bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ -debian/gridtracker debian/.debhelper debian/files -debian/nwjs -debian/nwjs-sdk +debian/gridtracker debian/*-stamp debian/*.substvars debian/tmp From b201aa43d4b18908ce0c61b98b3649fbbcb96463 Mon Sep 17 00:00:00 2001 From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Date: Wed, 7 Oct 2020 09:32:04 -0700 Subject: [PATCH 3/3] Repackage debian --- debian/changelog | 8 +++++++- debian/gridtracker.sh | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 70e54b8..a712d03 100644 --- a/debian/changelog +++ b/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 diff --git a/debian/gridtracker.sh b/debian/gridtracker.sh index 1b14caf..249df1d 100644 --- a/debian/gridtracker.sh +++ b/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 $@