Browse Source

merge spelling in one patch; rename files to *.patch

master
Boian Bonev 2 months ago
parent
commit
3e17a1fe3b
6 changed files with 272 additions and 351 deletions
  1. +13
    -21
      debian/patches/change-table-format.patch
  2. +0
    -0
      debian/patches/desktop-add-keywords.patch
  3. +4
    -5
      debian/patches/series
  4. +255
    -59
      debian/patches/spelling.patch
  5. +0
    -266
      debian/patches/spelling2
  6. +0
    -0
      debian/patches/unify-udev-rules.patch

debian/patches/change-table-format → debian/patches/change-table-format.patch View File

@@ -1,25 +1,17 @@
From: Boian Bonev <bbonev@ipacct.com>
Date: Tue, 21 Jul 2020 00:54:58 +0300
Subject: change-table-format

commit 9c8de8ac54ae7abf5d51d0c60bbb5e8eb40dfb1c
Author: Boian Bonev <bbonev@ipacct.com>
Date: Mon Jul 20 21:23:02 2020 +0300

Rework table formatting:
- remove indentation from split <entry> lines
- remote <para> from inside <entry>
- split lines that cause problems with 80 columns
this fixes auto-formatting of table cells, checked by:
LC_ALL=en_US.UTF-8 MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z ./man/gpsd_json.5 > /dev/null
<para> inside <entry> causes the resulting cell to start with an empty line
Suggested-by: lintian
---
man/gpsd_json.xml | 2046 +++++++++++++++++++++++++++--------------------------
1 file changed, 1039 insertions(+), 1007 deletions(-)
Description: change-table-format
Rework table formatting:
- remove indentation from split <entry> lines
- remote <para> from inside <entry>
- split lines that cause problems with 80 columns
.
this fixes auto-formatting of table cells, checked by:
LC_ALL=en_US.UTF-8 MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z ./man/gpsd_json.5 > /dev/null
.
<para> inside <entry> causes the resulting cell to start with an empty line
.
Suggested-by: lintian
Forwarded: accepted

diff --git a/man/gpsd_json.xml b/man/gpsd_json.xml
index 481c120..9baff42 100644

debian/patches/desktop-add-keywords → debian/patches/desktop-add-keywords.patch View File


+ 4
- 5
debian/patches/series View File

@@ -3,9 +3,8 @@ gpsd_hotplug_rules_disable_generic_serial_converters
ignore-test-xgps_deps_check
fix-soname
lp-1879272-gpsd-Quote-the-activated-timestamp-in-the-json-paylo.patch
unify-udev-rules
spelling1
spelling2
desktop-add-keywords
change-table-format
unify-udev-rules.patch
spelling.patch
desktop-add-keywords.patch
change-table-format.patch
increase-timespec-len.patch

debian/patches/spelling1 → debian/patches/spelling.patch View File

@@ -1,63 +1,7 @@
From: Boian Bonev <bbonev@ipacct.com>
Date: Tue, 21 Jul 2020 00:54:57 +0300
Subject: spelling1

commit 0c47b03d1cc476ac55575e4fe9c6871d60278598
Author: Boian Bonev <bbonev@ipacct.com>
Date: Thu Jul 16 00:47:58 2020 +0300

Fix typos
Siggested-by: lintian, codespell
---
.travis.yml | 2 +-
SConstruct | 2 +-
TODO | 2 +-
build.adoc | 2 +-
contrib/README | 4 ++--
contrib/ntpoffset | 2 +-
contrib/skyview.php | 2 +-
contrib/skyview2svg | 2 +-
driver_evermore.c | 2 +-
driver_garmin.c | 2 +-
driver_garmin_txt.c | 2 +-
driver_nmea0183.c | 2 +-
driver_nmea2000.c | 6 +++---
driver_rtcm2.c | 2 +-
driver_rtcm3.c | 2 +-
driver_sirf.c | 6 +++---
driver_skytraq.c | 2 +-
driver_tsip.c | 8 ++++----
driver_ubx.c | 2 +-
driver_zodiac.c | 2 +-
example_aiogps.py | 2 +-
geoid.c | 2 +-
gps.h | 4 ++--
gpscap.ini | 8 ++++----
gpsd.c | 2 +-
gpsfake | 2 +-
gpsprof | 6 +++---
json.c | 2 +-
jsongen.py | 2 +-
libgps_core.c | 2 +-
libgps_json.c | 4 ++--
man/gpsrinex.xml | 2 +-
man/srec.xml | 2 +-
monitor_proto.c | 2 +-
monitor_tnt.c | 2 +-
net_ntrip.c | 2 +-
packet.c | 6 +++---
ppscheck.c | 2 +-
ppsthread.c | 10 +++++-----
regress-driver | 2 +-
repo/upload | 2 +-
subframe.c | 4 ++--
tests/test_nmea2000 | 4 ++--
timebase.c | 2 +-
timespec.h | 4 ++--
ubxtool | 22 +++++++++++-----------
zerk | 14 +++++++-------
47 files changed, 87 insertions(+), 87 deletions(-)
Description: Fix typos
Siggested-by: lintian, codespell
Forwarded: accepted

diff --git a/.travis.yml b/.travis.yml
index 2eeaf3f..61a2608 100644
@@ -794,6 +738,15 @@ index bae3bb6..8eb8b64 100644
* you can not just store one or two almanacs for each sat */
almp->toa = ((words[3] >> 16) & 0x0000FF);
almp->l_toa = almp->toa << 12;
@@ -837,7 +837,7 @@
} else {
/* unknown page */
GPSD_LOG(LOG_PROG, &session->context->errout,
- "50B: SF:5-%d data_id %d uknown page\n",
+ "50B: SF:5-%d data_id %d unknown page\n",
subp->pageid, subp->data_id);
return 0;
}
diff --git a/tests/test_nmea2000 b/tests/test_nmea2000
index d154ef2..92f6ce5 100755
--- a/tests/test_nmea2000
@@ -985,3 +938,246 @@ index 4186042..f79a22c 100755
"OAF": {"command": send_get_oaf,
"help": "poll all OAF options"},
"RESET": {"command": send_reset,
diff --git a/contrib/README b/contrib/README
index ea19a5c..8c7370c 100644
--- a/contrib/README
+++ b/contrib/README
@@ -7,7 +7,7 @@ of the skyview.
gpssnmp a tool to return some SNMP values from the running local gpsd.
-clock_test is used to test the latency of the system call clock_getttime().
+clock_test is used to test the latency of the system call clock_gettime().
binlog and binreplay are probably only useful for people developing
drivers for new protocols, when gpsfake does not yet know what to do
diff --git a/devtools/easyinverse.pl b/devtools/easyinverse.pl
index 29d42eb..87a4a23 100755
--- a/devtools/easyinverse.pl
+++ b/devtools/easyinverse.pl
@@ -3,7 +3,7 @@
# From: Reuben Settergren <rjs@jhu.edu>
#
# I wrote a perl script to randomly generate matrices with smallish integers,
-# and test for a suitable determinant (typically +/-1), and ouput the matrix
+# and test for a suitable determinant (typically +/-1), and output the matrix
# and its inverse.
#
# There are switches to make it -s[ymmetric] and/or -d[iagonally strong],
diff --git a/devtools/get_geoid_table.py b/devtools/get_geoid_table.py
index 6dac25c..40d636e 100755
--- a/devtools/get_geoid_table.py
+++ b/devtools/get_geoid_table.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""Simple program to exact 5x5 geoid seperations in EGM2008
+"""Simple program to exact 5x5 geoid separations in EGM2008
from GeoidEval for use in geoidc"""
import sys
diff --git a/devtools/tablegen.py b/devtools/tablegen.py
index b8a3ed3..46657cd 100755
--- a/devtools/tablegen.py
+++ b/devtools/tablegen.py
@@ -153,7 +153,7 @@ def make_driver_code(wfp):
def make_structure(wfp):
- # Write a structure definition correponding to the table.
+ # Write a structure definition corresponding to the table.
global structname
record = after is None
baseindent = 8
diff --git a/doc/explan_driver_nmea.c.xml b/doc/explan_driver_nmea.c.xml
index edb1ca8..dfdc2ee 100644
--- a/doc/explan_driver_nmea.c.xml
+++ b/doc/explan_driver_nmea.c.xml
@@ -59,7 +59,7 @@
the sentence time and this fix time are different, we have started a
new cycle of observation, so update the sentence time and the store
the CYCLE_START_SET flag.</para><para>Whatever the number of fields,
- store the fix co-ordinates via <function>do_lat_lon()</function>,
+ store the fix coordinates via <function>do_lat_lon()</function>,
store the speed and the track and save the corresponding
flags.</para><para>Return the local aggregated flags to allow the
main copy in the session data to be updated.</para></entry>
@@ -122,7 +122,7 @@
<row>
<entry><function>static gps_mask_t processGPGSV(int count, char *field[], struct gps_device_t *session)</function></entry>
<entry><para>Check if the sentence has too few fields or the wrong
- number fo fields. In this case, clear the data for all satellites
+ number of fields. In this case, clear the data for all satellites
and return with an error indication.</para><para>Start to parse the
sentence. First, note how many sentences are to be expected to
complete the data transfer.</para><para>If the sentence number is
diff --git a/doc/explan_geoid.c.xml b/doc/explan_geoid.c.xml
index 79f7535..9bed181 100644
--- a/doc/explan_geoid.c.xml
+++ b/doc/explan_geoid.c.xml
@@ -7,7 +7,7 @@
<thead>
<row>
- <entry>Functions:-</entry><entry>Provides conversion between the ECEF and WGS84 co-ordinate reference systems.</entry>
+ <entry>Functions:-</entry><entry>Provides conversion between the ECEF and WGS84 coordinate reference systems.</entry>
</row>
</thead>
@@ -24,13 +24,13 @@
</row>
<row>
<entry><function>double wgs84_separation(double lat, double lon)</function></entry>
- <entry><para>This is used by drivers to get the separation of MSL from the WGS84 datum at a pair of Latitude/Longitude co-ordinates. The data is in a pre-defined table.</para></entry>
+ <entry><para>This is used by drivers to get the separation of MSL from the WGS84 datum at a pair of Latitude/Longitude coordinates. The data is in a pre-defined table.</para></entry>
</row>
<row>
<entry><function>void ecef_to_wgs84fix(struct gps_data_t *gpsdata, double x,
double y, double z, double vx, double vy, double vz)</function></entry>
- <entry><para>This does exactly what it says! Co-ordinate system
+ <entry><para>This does exactly what it says! Coordinate system
conversion from ecef to the wgs84 equivalent.</para></entry>
</row>
<row>
diff --git a/doc/explan_gpsd.c.xml b/doc/explan_gpsd.c.xml
index 05c08fc..03b1508 100644
--- a/doc/explan_gpsd.c.xml
+++ b/doc/explan_gpsd.c.xml
@@ -37,7 +37,7 @@
of 0 (on an unsuccessful <function>fork()</function> there is no
child), so this value is used as the trigger to do the following
useful stuff.</para><para>First, the child tries to create a new
- session, returning -1 if unable to do so. If succesful, it will have
+ session, returning -1 if unable to do so. If successful, it will have
inherited the exiting parent's session.</para><para>Next switch to
the root directory and try to open <quote>/dev/null</quote>. If that
succeeds, force stdin, stdout and stderr to duplicate the fd of
diff --git a/doc/explan_packet.c.xml b/doc/explan_packet.c.xml
index e7f0207..4427461 100644
--- a/doc/explan_packet.c.xml
+++ b/doc/explan_packet.c.xml
@@ -24,7 +24,7 @@
against the definitions of all the packet structures known to
<application>gpsd</application> and, if possible, sets a new packet
state.</para><para>If the state is <quote>xxx_RECOGNIZED</quote>,
- the packet_parse routine will despatch the packet to the appropriate
+ the packet_parse routine will dispatch the packet to the appropriate
driver.</para></entry>
</row>
<row>
diff --git a/gps/aiogps.py b/gps/aiogps.py
index 7c2ff31..37bc109 100644
--- a/gps/aiogps.py
+++ b/gps/aiogps.py
@@ -20,7 +20,7 @@ Python versions >= 3.6 and provides the following benefits:
- support for connection keep-alive (using the TCP keep alive mechanism)
- support for automatic re-connection;
- configurable connection parameters;
- - configurable exeption handling (internally or by application);
+ - configurable exception handling (internally or by application);
- logging support (logger name: 'gps.aiogps').
The use of timeouts, keepalive and automatic reconnection make possible easy
@@ -111,7 +111,7 @@ class aiogps(gps): # pylint: disable=R0902
error is raised to the user;
- number > 0: delay until next reconnection attempt (seconds).
alive_opts: options related to detection of disconnections.
- Two mecanisms are supported: TCP keepalive (default, may not be
+ Two mechanisms are supported: TCP keepalive (default, may not be
available on all platforms) and Rx timeout, through the
following options:
- rx_timeout: Rx timeout (seconds). Set to None to disable.
diff --git a/gps/client.py b/gps/client.py
index 0e30e6c..1c7338d 100644
--- a/gps/client.py
+++ b/gps/client.py
@@ -77,7 +77,7 @@ class gpscommon(object):
msg = str(e) + ' (to {}:{})'.format(host, port)
sys.stderr.write("error: {}\n".format(msg.strip()))
self.close()
- raise # propogate error to caller
+ raise # propagate error to caller
def close(self):
"Close the gpsd socket"
diff --git a/gps/clienthelpers.py b/gps/clienthelpers.py
index a2a35a6..975e7ca 100644
--- a/gps/clienthelpers.py
+++ b/gps/clienthelpers.py
@@ -356,7 +356,7 @@ GEOID_DELTA = [
# This table is wmm2015. Values obtained from MagneticField, part of
# geographiclib., by using devtools/get_mag_var_table.py
#
-# magvar[][] has the magnetic variation (declination), in hundreths of
+# magvar[][] has the magnetic variation (declination), in hundredths of
# a degree, on a 5 degree by 5 * degree grid for the entire planet.
#
# This table is duplicated in geoid.c. Keep them in sync.
diff --git a/man/gpsd.xml b/man/gpsd.xml
index 941b00e..9ee9fef 100644
--- a/man/gpsd.xml
+++ b/man/gpsd.xml
@@ -752,7 +752,7 @@ if the device speed is not matched to the GPS speed.</para>
<para>Generation of position error estimates (eph, epv, epd, eps, epc)
from the incomplete data handed back by GPS reporting protocols
involves both a lot of mathematical black art and fragile
-device-dependent assumptions. This code has been bug-prone in tbe
+device-dependent assumptions. This code has been bug-prone in the
past and problems may still lurk there.</para>
<para>AIDVM decoding of types 16-17, 22-23, and 25-26 is unverified.</para>
diff --git a/man/ppscheck.xml b/man/ppscheck.xml
index 8a5bdc1..767a71c 100644
--- a/man/ppscheck.xml
+++ b/man/ppscheck.xml
@@ -67,7 +67,7 @@ be the device monitored. </para>
<para>Each output line is the second and nanosecond parts of a timestamp
followed by the names of the handshake signals then asserted. Off
-transitions may generate lines with no signals aserted. </para>
+transitions may generate lines with no signals asserted. </para>
<para>If you don't see output within a second, use gpsmon or some other
equivalent tool to check that your device has a satellite lock and is
diff --git a/man/ubxtool.xml b/man/ubxtool.xml
index a8333f4..9dff66b 100644
--- a/man/ubxtool.xml
+++ b/man/ubxtool.xml
@@ -391,7 +391,7 @@ options.</para>
<para>Configuring u-blox GPS with the traditional configuration
messages is fraught with problems. Many configuration messages
interact in odd ways. Something as simple as changing the serial
-port speed requires you to read the curent configuration using
+port speed requires you to read the current configuration using
UBX-CFG-PRT for the proper port, merging in the change, the
writing back the changed UBX-CFG-PRT message. Or just guessing
at the current configuration and overwriting it all.</para>
diff --git a/test/daemon/myguide-3100.log b/test/daemon/myguide-3100.log
index f6b8e66..2eb5f68 100644
--- a/test/daemon/myguide-3100.log
+++ b/test/daemon/myguide-3100.log
@@ -4,9 +4,9 @@
# Description: Car-dash GPS
# Submitter: Gleb Smirnoff <glebius@glebius.int.ru>
# Date: 2011-03-23
-# Notes: Contains initial segement of no fix followed by stationary fix.
+# Notes: Contains initial segment of no fix followed by stationary fix.
# The 3100 has been end-of-lifed but is still found in the wild.
-# No database entry for this yet, we haven'y been able to find
+# No database entry for this yet, we haven't been able to find
# out enough about it.
#
# The no fix segment has GPRMC with lat/lon/alt, followed by GPGSA,
diff --git a/zerk b/zerk
index f79a22c..4f9e8cf 100755
--- a/zerk
+++ b/zerk
@@ -648,7 +648,7 @@ class greis(object):
return s + '\n'
def msg_TC(self, payload):
- "[TC] decode, CA/L1 Continous Tracking Time"
+ "[TC] decode, CA/L1 Continuous Tracking Time"
s = " tt"
for i in range(0, len(payload) - 1, 2):

+ 0
- 266
debian/patches/spelling2 View File

@@ -1,266 +0,0 @@
From: Boian Bonev <bbonev@ipacct.com>
Date: Tue, 21 Jul 2020 00:54:58 +0300
Subject: spelling2

---
contrib/README | 2 +-
devtools/easyinverse.pl | 2 +-
devtools/get_geoid_table.py | 2 +-
devtools/tablegen.py | 2 +-
doc/explan_driver_nmea.c.xml | 4 ++--
doc/explan_geoid.c.xml | 6 +++---
doc/explan_gpsd.c.xml | 2 +-
doc/explan_packet.c.xml | 2 +-
gps/aiogps.py | 4 ++--
gps/client.py | 2 +-
gps/clienthelpers.py | 2 +-
man/gpsd.xml | 2 +-
man/ppscheck.xml | 2 +-
man/ubxtool.xml | 2 +-
test/daemon/myguide-3100.log | 4 ++--
zerk | 2 +-
16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/contrib/README b/contrib/README
index ea19a5c..8c7370c 100644
--- a/contrib/README
+++ b/contrib/README
@@ -7,7 +7,7 @@ of the skyview.
gpssnmp a tool to return some SNMP values from the running local gpsd.
-clock_test is used to test the latency of the system call clock_getttime().
+clock_test is used to test the latency of the system call clock_gettime().
binlog and binreplay are probably only useful for people developing
drivers for new protocols, when gpsfake does not yet know what to do
diff --git a/devtools/easyinverse.pl b/devtools/easyinverse.pl
index 29d42eb..87a4a23 100755
--- a/devtools/easyinverse.pl
+++ b/devtools/easyinverse.pl
@@ -3,7 +3,7 @@
# From: Reuben Settergren <rjs@jhu.edu>
#
# I wrote a perl script to randomly generate matrices with smallish integers,
-# and test for a suitable determinant (typically +/-1), and ouput the matrix
+# and test for a suitable determinant (typically +/-1), and output the matrix
# and its inverse.
#
# There are switches to make it -s[ymmetric] and/or -d[iagonally strong],
diff --git a/devtools/get_geoid_table.py b/devtools/get_geoid_table.py
index 6dac25c..40d636e 100755
--- a/devtools/get_geoid_table.py
+++ b/devtools/get_geoid_table.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""Simple program to exact 5x5 geoid seperations in EGM2008
+"""Simple program to exact 5x5 geoid separations in EGM2008
from GeoidEval for use in geoidc"""
import sys
diff --git a/devtools/tablegen.py b/devtools/tablegen.py
index b8a3ed3..46657cd 100755
--- a/devtools/tablegen.py
+++ b/devtools/tablegen.py
@@ -153,7 +153,7 @@ def make_driver_code(wfp):
def make_structure(wfp):
- # Write a structure definition correponding to the table.
+ # Write a structure definition corresponding to the table.
global structname
record = after is None
baseindent = 8
diff --git a/doc/explan_driver_nmea.c.xml b/doc/explan_driver_nmea.c.xml
index edb1ca8..dfdc2ee 100644
--- a/doc/explan_driver_nmea.c.xml
+++ b/doc/explan_driver_nmea.c.xml
@@ -59,7 +59,7 @@
the sentence time and this fix time are different, we have started a
new cycle of observation, so update the sentence time and the store
the CYCLE_START_SET flag.</para><para>Whatever the number of fields,
- store the fix co-ordinates via <function>do_lat_lon()</function>,
+ store the fix coordinates via <function>do_lat_lon()</function>,
store the speed and the track and save the corresponding
flags.</para><para>Return the local aggregated flags to allow the
main copy in the session data to be updated.</para></entry>
@@ -122,7 +122,7 @@
<row>
<entry><function>static gps_mask_t processGPGSV(int count, char *field[], struct gps_device_t *session)</function></entry>
<entry><para>Check if the sentence has too few fields or the wrong
- number fo fields. In this case, clear the data for all satellites
+ number of fields. In this case, clear the data for all satellites
and return with an error indication.</para><para>Start to parse the
sentence. First, note how many sentences are to be expected to
complete the data transfer.</para><para>If the sentence number is
diff --git a/doc/explan_geoid.c.xml b/doc/explan_geoid.c.xml
index 79f7535..9bed181 100644
--- a/doc/explan_geoid.c.xml
+++ b/doc/explan_geoid.c.xml
@@ -7,7 +7,7 @@
<thead>
<row>
- <entry>Functions:-</entry><entry>Provides conversion between the ECEF and WGS84 co-ordinate reference systems.</entry>
+ <entry>Functions:-</entry><entry>Provides conversion between the ECEF and WGS84 coordinate reference systems.</entry>
</row>
</thead>
@@ -24,13 +24,13 @@
</row>
<row>
<entry><function>double wgs84_separation(double lat, double lon)</function></entry>
- <entry><para>This is used by drivers to get the separation of MSL from the WGS84 datum at a pair of Latitude/Longitude co-ordinates. The data is in a pre-defined table.</para></entry>
+ <entry><para>This is used by drivers to get the separation of MSL from the WGS84 datum at a pair of Latitude/Longitude coordinates. The data is in a pre-defined table.</para></entry>
</row>
<row>
<entry><function>void ecef_to_wgs84fix(struct gps_data_t *gpsdata, double x,
double y, double z, double vx, double vy, double vz)</function></entry>
- <entry><para>This does exactly what it says! Co-ordinate system
+ <entry><para>This does exactly what it says! Coordinate system
conversion from ecef to the wgs84 equivalent.</para></entry>
</row>
<row>
diff --git a/doc/explan_gpsd.c.xml b/doc/explan_gpsd.c.xml
index 05c08fc..03b1508 100644
--- a/doc/explan_gpsd.c.xml
+++ b/doc/explan_gpsd.c.xml
@@ -37,7 +37,7 @@
of 0 (on an unsuccessful <function>fork()</function> there is no
child), so this value is used as the trigger to do the following
useful stuff.</para><para>First, the child tries to create a new
- session, returning -1 if unable to do so. If succesful, it will have
+ session, returning -1 if unable to do so. If successful, it will have
inherited the exiting parent's session.</para><para>Next switch to
the root directory and try to open <quote>/dev/null</quote>. If that
succeeds, force stdin, stdout and stderr to duplicate the fd of
diff --git a/doc/explan_packet.c.xml b/doc/explan_packet.c.xml
index e7f0207..4427461 100644
--- a/doc/explan_packet.c.xml
+++ b/doc/explan_packet.c.xml
@@ -24,7 +24,7 @@
against the definitions of all the packet structures known to
<application>gpsd</application> and, if possible, sets a new packet
state.</para><para>If the state is <quote>xxx_RECOGNIZED</quote>,
- the packet_parse routine will despatch the packet to the appropriate
+ the packet_parse routine will dispatch the packet to the appropriate
driver.</para></entry>
</row>
<row>
diff --git a/gps/aiogps.py b/gps/aiogps.py
index 7c2ff31..37bc109 100644
--- a/gps/aiogps.py
+++ b/gps/aiogps.py
@@ -20,7 +20,7 @@ Python versions >= 3.6 and provides the following benefits:
- support for connection keep-alive (using the TCP keep alive mechanism)
- support for automatic re-connection;
- configurable connection parameters;
- - configurable exeption handling (internally or by application);
+ - configurable exception handling (internally or by application);
- logging support (logger name: 'gps.aiogps').
The use of timeouts, keepalive and automatic reconnection make possible easy
@@ -111,7 +111,7 @@ class aiogps(gps): # pylint: disable=R0902
error is raised to the user;
- number > 0: delay until next reconnection attempt (seconds).
alive_opts: options related to detection of disconnections.
- Two mecanisms are supported: TCP keepalive (default, may not be
+ Two mechanisms are supported: TCP keepalive (default, may not be
available on all platforms) and Rx timeout, through the
following options:
- rx_timeout: Rx timeout (seconds). Set to None to disable.
diff --git a/gps/client.py b/gps/client.py
index 0e30e6c..1c7338d 100644
--- a/gps/client.py
+++ b/gps/client.py
@@ -77,7 +77,7 @@ class gpscommon(object):
msg = str(e) + ' (to {}:{})'.format(host, port)
sys.stderr.write("error: {}\n".format(msg.strip()))
self.close()
- raise # propogate error to caller
+ raise # propagate error to caller
def close(self):
"Close the gpsd socket"
diff --git a/gps/clienthelpers.py b/gps/clienthelpers.py
index a2a35a6..975e7ca 100644
--- a/gps/clienthelpers.py
+++ b/gps/clienthelpers.py
@@ -356,7 +356,7 @@ GEOID_DELTA = [
# This table is wmm2015. Values obtained from MagneticField, part of
# geographiclib., by using devtools/get_mag_var_table.py
#
-# magvar[][] has the magnetic variation (declination), in hundreths of
+# magvar[][] has the magnetic variation (declination), in hundredths of
# a degree, on a 5 degree by 5 * degree grid for the entire planet.
#
# This table is duplicated in geoid.c. Keep them in sync.
diff --git a/man/gpsd.xml b/man/gpsd.xml
index 941b00e..9ee9fef 100644
--- a/man/gpsd.xml
+++ b/man/gpsd.xml
@@ -752,7 +752,7 @@ if the device speed is not matched to the GPS speed.</para>
<para>Generation of position error estimates (eph, epv, epd, eps, epc)
from the incomplete data handed back by GPS reporting protocols
involves both a lot of mathematical black art and fragile
-device-dependent assumptions. This code has been bug-prone in tbe
+device-dependent assumptions. This code has been bug-prone in the
past and problems may still lurk there.</para>
<para>AIDVM decoding of types 16-17, 22-23, and 25-26 is unverified.</para>
diff --git a/man/ppscheck.xml b/man/ppscheck.xml
index 8a5bdc1..767a71c 100644
--- a/man/ppscheck.xml
+++ b/man/ppscheck.xml
@@ -67,7 +67,7 @@ be the device monitored. </para>
<para>Each output line is the second and nanosecond parts of a timestamp
followed by the names of the handshake signals then asserted. Off
-transitions may generate lines with no signals aserted. </para>
+transitions may generate lines with no signals asserted. </para>
<para>If you don't see output within a second, use gpsmon or some other
equivalent tool to check that your device has a satellite lock and is
diff --git a/man/ubxtool.xml b/man/ubxtool.xml
index a8333f4..9dff66b 100644
--- a/man/ubxtool.xml
+++ b/man/ubxtool.xml
@@ -391,7 +391,7 @@ options.</para>
<para>Configuring u-blox GPS with the traditional configuration
messages is fraught with problems. Many configuration messages
interact in odd ways. Something as simple as changing the serial
-port speed requires you to read the curent configuration using
+port speed requires you to read the current configuration using
UBX-CFG-PRT for the proper port, merging in the change, the
writing back the changed UBX-CFG-PRT message. Or just guessing
at the current configuration and overwriting it all.</para>
diff --git a/test/daemon/myguide-3100.log b/test/daemon/myguide-3100.log
index f6b8e66..2eb5f68 100644
--- a/test/daemon/myguide-3100.log
+++ b/test/daemon/myguide-3100.log
@@ -4,9 +4,9 @@
# Description: Car-dash GPS
# Submitter: Gleb Smirnoff <glebius@glebius.int.ru>
# Date: 2011-03-23
-# Notes: Contains initial segement of no fix followed by stationary fix.
+# Notes: Contains initial segment of no fix followed by stationary fix.
# The 3100 has been end-of-lifed but is still found in the wild.
-# No database entry for this yet, we haven'y been able to find
+# No database entry for this yet, we haven't been able to find
# out enough about it.
#
# The no fix segment has GPRMC with lat/lon/alt, followed by GPGSA,
diff --git a/zerk b/zerk
index f79a22c..4f9e8cf 100755
--- a/zerk
+++ b/zerk
@@ -648,7 +648,7 @@ class greis(object):
return s + '\n'
def msg_TC(self, payload):
- "[TC] decode, CA/L1 Continous Tracking Time"
+ "[TC] decode, CA/L1 Continuous Tracking Time"
s = " tt"
for i in range(0, len(payload) - 1, 2):

debian/patches/unify-udev-rules → debian/patches/unify-udev-rules.patch View File


Loading…
Cancel
Save