From 0bcb227dc7ca314075cde83b6956a58dc3d5fdf0 Mon Sep 17 00:00:00 2001 From: "Gary E. Miller" Date: Mon, 19 Nov 2018 16:36:14 -0800 Subject: LICENSE: Update license's to be more consistent. No functional changes. --- contrib/SConstruct | 3 +++ contrib/ashctl.c | 4 ++-- contrib/binlog.c | 5 +++-- contrib/binreplay.c | 7 ++++--- contrib/clock_test.c | 3 +++ contrib/gpssnmp.c | 6 +++--- contrib/lla2ecef.c | 5 +++-- contrib/maxsats.pl | 3 +++ contrib/motosend.c | 4 ++-- contrib/ntpoffset | 2 ++ contrib/ntpshmviz | 2 ++ contrib/skyview.php | 3 +++ contrib/skyview2svg | 4 +++- contrib/webgps.py | 3 +++ 14 files changed, 39 insertions(+), 15 deletions(-) diff --git a/contrib/SConstruct b/contrib/SConstruct index 6487a54e..9760b26c 100644 --- a/contrib/SConstruct +++ b/contrib/SConstruct @@ -4,6 +4,9 @@ # tinkering with their gear. # Note that ../gpsd_config.h is required and is built separately +# +# This file is Copyright (c) 2010-2018 by the GPSD project +# SPDX-License-Identifier: BSD-2-clause ashctl = Program("ashctl", "ashctl.c") diff --git a/contrib/ashctl.c b/contrib/ashctl.c index f396faa0..8917fa5e 100644 --- a/contrib/ashctl.c +++ b/contrib/ashctl.c @@ -1,6 +1,6 @@ /* - * This file is Copyright (c)2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. + * This file is Copyright (c) 2010-2018 by the GPSD project + * SPDX-License-Identifier: BSD-2-clause */ #include #include diff --git a/contrib/binlog.c b/contrib/binlog.c index 059fe425..67043abd 100644 --- a/contrib/binlog.c +++ b/contrib/binlog.c @@ -1,5 +1,6 @@ -/* This file is Copyright (c)2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. +/* + * This file is Copyright (c) 2010-2018 by the GPSD project + * SPDX-License-Identifier: BSD-2-clause */ #include #include diff --git a/contrib/binreplay.c b/contrib/binreplay.c index 063f5de4..2f676d9a 100644 --- a/contrib/binreplay.c +++ b/contrib/binreplay.c @@ -1,7 +1,8 @@ -/* This file is Copyright (c)2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - * +/* * Stuff the contents of a specified file into a specified tty. + * + * This file is Copyright (c) 2010-2018 by the GPSD project + * SPDX-License-Identifier: BSD-2-clause */ #include #include diff --git a/contrib/clock_test.c b/contrib/clock_test.c index 904c9678..cd91f389 100644 --- a/contrib/clock_test.c +++ b/contrib/clock_test.c @@ -3,6 +3,9 @@ * * Compile: gcc clock_test.c -lm -o clock_test * + * Written by: Gary E. Miller + * This file is Copyright (c) 2018 by the GPSD project + * SPDX-License-Identifier: BSD-2-clause */ #include /* for getopt() */ diff --git a/contrib/gpssnmp.c b/contrib/gpssnmp.c index d06fe108..d9ccf3e7 100644 --- a/contrib/gpssnmp.c +++ b/contrib/gpssnmp.c @@ -1,13 +1,13 @@ /* gpssnmp - poll local gpsd for SNMP variables * + * To build this: + * gcc -o gpssnmp gpssnmp.c -lgps + * * Copyright (c) 2016 David Taylor * * Copyright (c)2018 by the GPSD project * SPDX-License-Identifier: BSD-2-clause * - * To build this: - * gcc -o gpssnmp gpssnmp.c -lgps - * */ #include diff --git a/contrib/lla2ecef.c b/contrib/lla2ecef.c index 56c68184..3d6252a4 100644 --- a/contrib/lla2ecef.c +++ b/contrib/lla2ecef.c @@ -1,5 +1,6 @@ -/* This file is Copyright (c)2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. +/* + * This file is Copyright (c) 2010-2018 by the GPSD project + * SPDX-License-Identifier: BSD-2-clause */ #include #include diff --git a/contrib/maxsats.pl b/contrib/maxsats.pl index 6475b2db..41887dae 100755 --- a/contrib/maxsats.pl +++ b/contrib/maxsats.pl @@ -13,6 +13,9 @@ # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# This file is Copyright (c) 2008-2018 by the GPSD project +# SPDX-License-Identifier: BSD-2-clause use strict; use warnings; diff --git a/contrib/motosend.c b/contrib/motosend.c index c1d555d3..995a26df 100644 --- a/contrib/motosend.c +++ b/contrib/motosend.c @@ -1,6 +1,6 @@ /* - * This file is Copyright (c)2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. + * This file is Copyright (c) 2010-2018 by the GPSD project + * SPDX-License-Identifier: BSD-2-clause */ #include #include diff --git a/contrib/ntpoffset b/contrib/ntpoffset index ef97c7ce..a8876805 100755 --- a/contrib/ntpoffset +++ b/contrib/ntpoffset @@ -4,6 +4,8 @@ # For instructions on how to use this script, see the GPSD Time # Service HOWTO in this distrubution. # +# This file is Copyright (c) 2010-2018 by the GPSD project +# SPDX-License-Identifier: BSD-2-clause awk ' /127\.127\.28\.0/ { sum += $5 * 1000; cnt++; } END { print sum / cnt; } diff --git a/contrib/ntpshmviz b/contrib/ntpshmviz index 9613c7c0..c0b32d79 100755 --- a/contrib/ntpshmviz +++ b/contrib/ntpshmviz @@ -9,6 +9,8 @@ Written by Keane Wolter # 1. Add exit button so the user does not need to do -w # 2. Allow for a continuous stream of data to be graphed # +# This file is Copyright (c) 2010-2018 by the GPSD project +# SPDX-License-Identifier: BSD-2-clause from __future__ import absolute_import, print_function, division diff --git a/contrib/skyview.php b/contrib/skyview.php index 340e86c8..6d7cac1d 100755 --- a/contrib/skyview.php +++ b/contrib/skyview.php @@ -14,6 +14,9 @@ # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# This file is Copyright (c) 2010-2018 by the GPSD project +# SPDX-License-Identifier: BSD-2-clause // This program originally read a logfile of filtered gpsd messages, // type Y. The gpsd protocal changed in 2.90, since when this became diff --git a/contrib/skyview2svg b/contrib/skyview2svg index a4b87abe..79cf8007 100644 --- a/contrib/skyview2svg +++ b/contrib/skyview2svg @@ -10,9 +10,11 @@ example usage: For GPSD JSON format see: http://www.catb.org/gpsd/gpsd_json.html """ -# SPDX-License-Identifier: BSD-2-clause # This code runs compatibly under Python 2 and 3.x for x >= 2. # Preserve this property! +# +# This file is Copyright (c) 2010-2018 by the GPSD project +# SPDX-License-Identifier: BSD-2-clause from __future__ import absolute_import, print_function, division import datetime diff --git a/contrib/webgps.py b/contrib/webgps.py index b10a465c..b9aabdd1 100755 --- a/contrib/webgps.py +++ b/contrib/webgps.py @@ -37,6 +37,9 @@ If this file is present on start of webgps.py, it is loaded. This allows to restart webgps.py without losing accumulated satellite tracks. """ +# This file is Copyright (c) 2010-2018 by the GPSD project +# SPDX-License-Identifier: BSD-2-clause + from __future__ import absolute_import, print_function, division import math -- cgit v1.2.1