From d267c7e2667c7b246d86ed8f762a73a89ac75f68 Mon Sep 17 00:00:00 2001 From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Date: Mon, 9 Nov 2020 00:59:02 -0800 Subject: [PATCH] Clean up debian and make linux packaging generic --- Makefile | 8 ++- debian/NEWS | 2 +- debian/changelog | 4 +- debian/control | 4 +- debian/copyright | 69 +++++++++++++++++-- gridtracker.1 | 52 ++++++++++++++ ...gridtracker.desktop => gridtracker.desktop | 2 +- debian/gridtracker.sh => gridtracker.sh | 0 8 files changed, 127 insertions(+), 14 deletions(-) create mode 100644 gridtracker.1 rename debian/gridtracker.desktop => gridtracker.desktop (79%) rename debian/gridtracker.sh => gridtracker.sh (100%) diff --git a/Makefile b/Makefile index 0fdaaaa..008b961 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,13 @@ BIN = $(DESTDIR)/usr/bin LIB = $(DESTDIR)/usr/share/gridtracker APP = $(DESTDIR)/usr/share/applications +MAN = $(DESTDIR)/usr/share/man/man1 all: install: - install -d $(BIN) $(LIB) $(APP) - install -c -m 755 debian/gridtracker.sh $(BIN)/gridtracker - install -c -m 644 debian/gridtracker.desktop $(APP)/gridtracker.desktop + install -d $(BIN) $(LIB) $(APP) $(MAN) + install -c -m 755 gridtracker.sh $(BIN)/gridtracker + install -c -m 644 gridtracker.desktop $(APP)/gridtracker.desktop + install -c -m 644 gridtracker.1 $(MAN) cp -r package.nw/* $(LIB) diff --git a/debian/NEWS b/debian/NEWS index 75821b8..7710db4 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -gridtracker (1.20.1104) unstable; urgency=low +gridtracker (1.20.1107) unstable; urgency=low The old method of creating/editing/copying a GridTracker.desktop file has been deprecated, instead, we install one in /usr/share/applications, diff --git a/debian/changelog b/debian/changelog index a96d965..a2c5d9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ gridtracker (1.20.1107) unstable; urgency=low is BSD 3-clause. [ Paul Traina ] * Disable fit to QTH when in PSK mode - * Higlight confirmed DXCC countries in DXCC report + * Highlight confirmed DXCC countries in DXCC report * Unify worked/confirmed/unworked in WAC/WAS/CQ Zones/ITU Zones reports * In call roster, when requiring LoTW, don't show stations that don't meet time limits. @@ -12,7 +12,7 @@ gridtracker (1.20.1107) unstable; urgency=low [ Sebastian Delmont ] * Improve roster controls * Clean up and pretify HTML and JSON code, reformat code base. - * Make UDP port vaildation behavior clearer, allow recevie on 2238 if + * Make UDP port vaildation behavior clearer, allow receive on 2238 if forwarding enabled. * Improve debugging/developer experience by enabling context menus when using nwjs's SDK. diff --git a/debian/control b/debian/control index 93f1f33..87bde73 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Source: gridtracker Section: hamradio Priority: optional -Maintainer: Tag Loomis +Maintainer: Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Build-Depends: debhelper (>= 12.1) -Standards-Version: 4.5.0 +Standards-Version: 4.3.0 Homepage: http://tagloomis.com/ Package: gridtracker diff --git a/debian/copyright b/debian/copyright index 9f74d85..180e6f3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -37,16 +37,75 @@ License: BSD-3-clause Files: package.nw/lib/moment Source: https://momentjs.com/downloads/ Copyright: Copyright (c) JS Foundation -License: BSD-2-clause +License: MIT-a + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. -Files: package.nw/lib/ol.*, package.nw/lib/shadow.js +Files: package.nw/lib/ol.* package.nw/lib/shadow.js Source: https://github.com/openlayers/openlayers/ Copyright: Copyright (c) 2005-2020 OpenLayers Contributors License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. -Files: package.nw/lib/datepicker, package.nw/lib/dp-dark.css +Files: package.nw/lib/datepicker package.nw/lib/dp-dark.css Source: https://code-boxx.com/simple-datepicker-pure-javascript-css/, https://code-boxx.com/wp-content/uploads/2020/06/datepicker-js.zip Copyright: Copyright (c) Code Boxx -License: BSD-2-clause - +License: MIT-b + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff --git a/gridtracker.1 b/gridtracker.1 new file mode 100644 index 0000000..526cb0b --- /dev/null +++ b/gridtracker.1 @@ -0,0 +1,52 @@ +.TH gridtracker(1) + +.SH NAME +.B gridtracker +- an amateur radio companion + +.SH SYNOPSIS +.B gridtracker + +.SH DESCRIPTION +.B gridtracker +GridTracker is a companion program to WSJT-X/JTDX. It will listen for activity coming from these +programs and display traffic on a map. Additionally, GridTracker has a call roster for filtering +and displaying QSO activity, as well as an extensive logging/lookup/reporting system. + +.SH OPTIONS +none + +.SH FILES +.TP +.I +/usr/bin/gridtracker +.TP +.I +/usr/share/gridtracker +.TP +.I +/usr/share/applications/gridtracker.desktop +.TP +.I +$HOME/Documents/GridTracker +.TP +.I +$HOME/.config/gridtracker + +.SH EXAMPLES +.TP +.BI gridtracker +.TP +.PP +Run gridtracker, no arguments needed. + +.SH COPYRIGHT +.PP +Copyright (c) 2018-2020 Stephen Tag Loomis. All rights reserved. +https://tagloomis.com +Copyright (c) 2020 GridTracker.org. All rights reserved. +Released under BSD 3-Clause License + +.SH +.PP +GridTracker.org gridtracker(1) diff --git a/debian/gridtracker.desktop b/gridtracker.desktop similarity index 79% rename from debian/gridtracker.desktop rename to gridtracker.desktop index 4e16822..cfefa0c 100644 --- a/debian/gridtracker.desktop +++ b/gridtracker.desktop @@ -2,7 +2,7 @@ Name=GridTracker Comment=GridTracker GenericName=GridTracker, a WSJT-X Companion -Exec=nw --enable-speech-dispatcher /usr/share/gridtracker +Exec=gridtracker Icon=/usr/share/gridtracker/gridview.png Encoding=UTF-8 Categories=Network;HamRadio diff --git a/debian/gridtracker.sh b/gridtracker.sh similarity index 100% rename from debian/gridtracker.sh rename to gridtracker.sh