diff --git a/Makefile.am b/Makefile.am index 5388b025..22a1c13b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,6 @@ # This file is Copyright (c) 2010 by the GPSD project # BSD terms apply: see the file COPYING in the distribution root for details. # -# $Id$ # Exclude Subversion state from the tarball. Needed because we # grab the test directory wholesale. Hack appropriately when and if we diff --git a/README b/README index f3bd7280..b1688b14 100644 --- a/README +++ b/README @@ -1,5 +1,3 @@ -$Id$ - COPYRIGHT ========= diff --git a/TODO b/TODO index 33d6159e..fb9f8162 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,3 @@ -$Id$ - This is the gpsd to-do list. If you're viewing it with Emacs, try doing Ctl-C Ctl-t and browsing through the outline headers. Ctl-C Ctl-a will unfold them again. diff --git a/Tachometer.c b/Tachometer.c index 01ffb8d1..e252ed62 100644 --- a/Tachometer.c +++ b/Tachometer.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * Tachometer Widget Implementation * diff --git a/Tachometer.h b/Tachometer.h index 69c75e1d..a80cd4ff 100644 --- a/Tachometer.h +++ b/Tachometer.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/TachometerP.h b/TachometerP.h index 8ea8592b..401c3cfa 100644 --- a/TachometerP.h +++ b/TachometerP.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/autogen.sh b/autogen.sh index ac37ebaf..b7a557c9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # Automakeversion AM_1=1 diff --git a/bits.c b/bits.c index 9d90790d..e2e2e901 100644 --- a/bits.c +++ b/bits.c @@ -1,5 +1,5 @@ -/* $Id$ - * +/* bits.c - bitfield extraction code + * * This file is Copyright (c)2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. * diff --git a/bits.h b/bits.h index a2f2df0e..908cca02 100644 --- a/bits.h +++ b/bits.h @@ -1,11 +1,3 @@ -/* $Id$ - * - * This file is Copyright (c)2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - */ -#ifndef _GPSD_BITS_H_ -#define _GPSD_BITS_H_ - /* * bits.h - extract binary data from message buffer * @@ -26,6 +18,8 @@ * This file is Copyright (c)2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ +#ifndef _GPSD_BITS_H_ +#define _GPSD_BITS_H_ #include diff --git a/bsd-base64.c b/bsd-base64.c index 67bbb352..90fbe64f 100644 --- a/bsd-base64.c +++ b/bsd-base64.c @@ -1,6 +1,4 @@ -/* $Id$ */ /* $OpenBSD: base64.c,v 1.3 1997/11/08 20:46:55 deraadt Exp $ */ - /* * Copyright (c) 1996 by Internet Software Consortium. * diff --git a/bsd-base64.h b/bsd-base64.h index 9b1992b4..8ff1217d 100644 --- a/bsd-base64.h +++ b/bsd-base64.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c)2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/cgps.c b/cgps.c index 91968d92..4a9ac556 100644 --- a/cgps.c +++ b/cgps.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * Copyright (c) 2005 Jeff Francis * BSD terms apply: see the filr COPYING in the distribution root for details. diff --git a/configure.ac b/configure.ac index 50e7aaf7..e96938b6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,3 @@ -dnl $Id$ dnl This file is Copyright (c)2010 by the GPSD project dnl BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/contrib/ashctl.c b/contrib/ashctl.c index a2e39d44..10975899 100644 --- a/contrib/ashctl.c +++ b/contrib/ashctl.c @@ -1,4 +1,4 @@ -/* $Id$ +/* * This file is Copyright (c)2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/contrib/maxsats.pl b/contrib/maxsats.pl index 69639e83..6475b2db 100755 --- a/contrib/maxsats.pl +++ b/contrib/maxsats.pl @@ -1,5 +1,4 @@ #!/usr/bin/perl -# $Id$ # Copyright (c) 2008 Chris Kuethe # diff --git a/contrib/motosend.c b/contrib/motosend.c index 922206f3..db3c3ce7 100644 --- a/contrib/motosend.c +++ b/contrib/motosend.c @@ -1,4 +1,4 @@ -/* $Id$ +/* * This file is Copyright (c)2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/crc24q.c b/crc24q.c index a741153f..0cb88a68 100644 --- a/crc24q.c +++ b/crc24q.c @@ -1,8 +1,4 @@ -/* $Id$ - * - * This file is Copyright (c) 2008,2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - * +/* * This is an implementation of the CRC-24Q cyclic redundancy checksum * used by Qualcomm, RTCM104V3, and PGP 6.5.1. According to the RTCM104V3 * standard, it uses the error polynomial @@ -27,6 +23,8 @@ * Note that this version has a seed of 0 wired in. The RTCM104V3 standard * requires this. * + * This file is Copyright (c) 2008,2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. */ #include diff --git a/crc24q.h b/crc24q.h index 49e6670c..8ad6f0ce 100644 --- a/crc24q.h +++ b/crc24q.h @@ -1,4 +1,4 @@ -/* $Id$ +/* Interface for CRC-24Q cyclic redundancy chercksum code * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. @@ -6,7 +6,6 @@ #ifndef _CRC24Q_H_ #define _CRC24Q_H_ -/* Interface for CRC-24Q cyclic redundancy chercksum code */ extern void crc24q_sign(unsigned char *data, int len); diff --git a/devtools/ais.py b/devtools/ais.py index 03550a2a..49c784de 100755 --- a/devtools/ais.py +++ b/devtools/ais.py @@ -1034,4 +1034,4 @@ def parse_ais_messages(source, scaled=False, skiperr=False, verbose=0): print "%d\t%d" % (msgtype, frequencies[msgtype]) except KeyboardInterrupt: pass -# $Id$ +# End diff --git a/devtools/leapsecond.py b/devtools/leapsecond.py index a47a8434..8c1e5ab2 100755 --- a/devtools/leapsecond.py +++ b/devtools/leapsecond.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# $Id$ # # Get the current leap-second value. This is the offset between UTC and # GPS time, which changes occasionally due to variations in the Earth's diff --git a/driver_aivdm.c b/driver_aivdm.c index 78a593fe..634a900a 100644 --- a/driver_aivdm.c +++ b/driver_aivdm.c @@ -1,8 +1,4 @@ -/* $Id$ */ /* - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - * * Driver for AIS/AIVDM messages. * * See the file AIVDM.txt on the GPSD website for documentation and references. @@ -10,6 +6,9 @@ * Code for message types 1-15, 18-21, and 24 has been tested against * live data with known-good decodings. Code for message types 16-17, * 22-23, and 25-26 has not. + * + * This file is Copyright (c) 2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. */ #include #include diff --git a/driver_evermore.c b/driver_evermore.c index 291185bf..5aeba9ea 100644 --- a/driver_evermore.c +++ b/driver_evermore.c @@ -1,7 +1,4 @@ -/* $Id$ - * - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. +/* * * This is the gpsd driver for EverMore GPSes operating in binary mode. * About the only thing this gives us that NMEA won't is TDOP. @@ -112,6 +109,9 @@ * *10 *02 *04 *38 8d c5 *10 *03 * 8d indicates that message 0x8d was sent; * c5 is EverMore checksum, other bytes are fixed + * + * This file is Copyright (c) 2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. */ #include diff --git a/driver_garmin.c b/driver_garmin.c index 3f2222be..bee9751c 100644 --- a/driver_garmin.c +++ b/driver_garmin.c @@ -1,8 +1,4 @@ -/* $Id$ - * - * 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 contains two drivers for Garmin receivers and some code * shared by both drivers. * @@ -76,6 +72,9 @@ * TODO: * * ?? Add probe function for Serial Binary to start PVT output. + * + * This file is Copyright (c) 2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. */ #define __USE_POSIX199309 1 diff --git a/driver_garmin_txt.c b/driver_garmin_txt.c index e0466fc1..732efbc0 100644 --- a/driver_garmin_txt.c +++ b/driver_garmin_txt.c @@ -1,8 +1,4 @@ -/* $Id$ - * - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - * +/* * Handle the Garmin simple text format supported by some Garmins. * Tested with the 'Garmin eTrex Legend' device working in 'Text Out' mode. * @@ -26,6 +22,10 @@ * vdop * magnetic variation * satellite information + * + * This file is Copyright (c) 2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. + * */ /*************************************************** diff --git a/driver_italk.c b/driver_italk.c index 3919a544..03b3ebba 100644 --- a/driver_italk.c +++ b/driver_italk.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. * diff --git a/driver_italk.h b/driver_italk.h index a8792fe4..df88fe0c 100644 --- a/driver_italk.h +++ b/driver_italk.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/driver_navcom.c b/driver_navcom.c index 23589f73..b8857965 100644 --- a/driver_navcom.c +++ b/driver_navcom.c @@ -1,8 +1,4 @@ -/* $Id$ - * - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - * +/* * Driver for Navcom receivers using propietary NCT messages, a binary protocol. * * Vendor website: http://www.navcomtech.com/ @@ -29,6 +25,9 @@ * 0xef: Clock Drift and Offset * * By Diego Berge. Contact via web form at http://www.navlost.eu/contact + * + * This file is Copyright (c) 2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. */ #include diff --git a/driver_nmea.c b/driver_nmea.c index 69f28222..f80fac36 100644 --- a/driver_nmea.c +++ b/driver_nmea.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/driver_oncore.c b/driver_oncore.c index 890d447d..1033421a 100644 --- a/driver_oncore.c +++ b/driver_oncore.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/driver_proto.c b/driver_proto.c index aea62995..5a6b3a25 100644 --- a/driver_proto.c +++ b/driver_proto.c @@ -1,8 +1,4 @@ -/* $Id$ - * - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - * +/* * A prototype driver. Doesn't run, doesn't even compile. * * For new driver authors: replace "_PROTO_" and "_proto_" with the name of @@ -33,6 +29,10 @@ * libgpsd_core.c * packet.c * packet_states.h + * + * This file is Copyright (c) 2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. + * */ #include diff --git a/driver_rtcm2.c b/driver_rtcm2.c index 2c6ab82f..aff0c2c9 100644 --- a/driver_rtcm2.c +++ b/driver_rtcm2.c @@ -1,9 +1,5 @@ -/* $Id$ */ /***************************************************************************** -This file is Copyright (c) 2010 by the GPSD project -BSD terms apply: see the file COPYING in the distribution root for details. - This is a decoder for RTCM-104 2.x, an obscure and complicated serial protocol used for broadcasting pseudorange corrections from differential-GPS reference stations. The applicable @@ -51,6 +47,9 @@ about the serial interface format was gleaned from studying the output of a beacon receiver test program made available on Starlink's website. +This file is Copyright (c) 2010 by the GPSD project +BSD terms apply: see the file COPYING in the distribution root for details. + *****************************************************************************/ #include diff --git a/driver_rtcm2.h b/driver_rtcm2.h index f1481e6b..b918d619 100644 --- a/driver_rtcm2.h +++ b/driver_rtcm2.h @@ -1,11 +1,3 @@ -/* $Id$ - * - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - */ -#ifndef _GPSD_RTCM2_H_ -#define _GPSD_RTCM2_H_ - /***************************************************************************** This is a decoder for RTCM-104 2.x, an obscure and complicated serial @@ -55,8 +47,14 @@ about the serial interface format was gleaned from studying the output of a beacon receiver test program made available on Starlink's website. +This file is Copyright (c) 2010 by the GPSD project +BSD terms apply: see the file COPYING in the distribution root for details. + *****************************************************************************/ +#ifndef _GPSD_RTCM2_H_ +#define _GPSD_RTCM2_H_ + /* * Structures for interpreting words in an RTCM-104 2.x message (after * parity checking and removing inversion). Note, these structures diff --git a/driver_rtcm3.c b/driver_rtcm3.c index 99795c9d..c87d03e7 100644 --- a/driver_rtcm3.c +++ b/driver_rtcm3.c @@ -1,9 +1,5 @@ -/* $Id$ */ /***************************************************************************** -This file is Copyright (c) 2010 by the GPSD project -BSD terms apply: see the file COPYING in the distribution root for details. - This is a decoder for RTCM-104 3.x, a serial protocol used for broadcasting pseudorange corrections from differential-GPS reference stations. The applicable specification is RTCM 10403.1: RTCM Paper @@ -26,6 +22,9 @@ passing RTCM corrections to a GPS, which normally should just be passed an entire correction packet for processing by their internal firmware. +This file is Copyright (c) 2010 by the GPSD project +BSD terms apply: see the file COPYING in the distribution root for details. + *****************************************************************************/ #include diff --git a/driver_sirf.c b/driver_sirf.c index 459b43e9..82b3d23d 100644 --- a/driver_sirf.c +++ b/driver_sirf.c @@ -1,8 +1,4 @@ -/* $Id$ - * - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - * +/* * This is the gpsd driver for SiRF GPSes operating in binary mode. * It also handles uBlox, a SiRF derivative. * @@ -26,6 +22,9 @@ * "[When we need RINEX data, we can get it from] SiRF Message #5. * If it's no longer implemented on your receiver, messages * 7, 28, 29 and 30 will give you the same information." + * + * This file is Copyright (c) 2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. */ #include diff --git a/driver_superstar2.c b/driver_superstar2.c index 6daa25b5..1c78aaf3 100644 --- a/driver_superstar2.c +++ b/driver_superstar2.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/driver_superstar2.h b/driver_superstar2.h index 29031a70..30416bbf 100644 --- a/driver_superstar2.h +++ b/driver_superstar2.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/driver_tsip.c b/driver_tsip.c index 2220a80a..a3aeceac 100644 --- a/driver_tsip.c +++ b/driver_tsip.c @@ -1,10 +1,9 @@ -/* $Id$ +/* + * Handle the Trimble TSIP packet format + * by Rob Janssen, PE1CHL. * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. - * - * Handle the Trimble TSIP packet format - * by Rob Janssen, PE1CHL. */ #include #include diff --git a/driver_ubx.c b/driver_ubx.c index 037de270..e15d6287 100644 --- a/driver_ubx.c +++ b/driver_ubx.c @@ -1,9 +1,9 @@ -/* $Id$ +/* + * UBX driver * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. * - * UBX driver */ #include diff --git a/driver_ubx.h b/driver_ubx.h index 22dd15f2..fa8018b8 100644 --- a/driver_ubx.h +++ b/driver_ubx.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details */ diff --git a/driver_zodiac.c b/driver_zodiac.c index 27c8b733..a9599cef 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -1,9 +1,8 @@ -/* $Id$ +/* + * Handle the Rockwell binary packet format supported by the old Zodiac chipset * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. - * - * Handle the Rockwell binary packet format supported by the old Zodiac chipset */ #include #include diff --git a/drivers.c b/drivers.c index c089e5c4..dcbd7226 100644 --- a/drivers.c +++ b/drivers.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/geoid.c b/geoid.c index cf63592b..d97802f3 100644 --- a/geoid.c +++ b/geoid.c @@ -1,12 +1,11 @@ -/* $Id$ - * - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - * +/* * geoid.c -- ECEF to WGS84 conversions, including ellipsoid-to-MSL height * * Geoid separation code by Oleg Gusev, from data by Peter Dana. * ECEF conversion by Rob Janssen. + * + * This file is Copyright (c) 2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. */ #include diff --git a/gps.h b/gps.h index d2093dfc..92df9a96 100644 --- a/gps.h +++ b/gps.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/gps/fake.py b/gps/fake.py index ab448cb9..e6446ba6 100644 --- a/gps/fake.py +++ b/gps/fake.py @@ -1,9 +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. """ -$Id$ - -This file is Copyright (c) 2010 by the GPSD project -BSD terms apply: see the file COPYING in the distribution root for details. - gpsfake.py -- classes for creating a controlled test environment around gpsd. The gpsfake(1) regression tester shipped with gpsd is a trivial wrapper diff --git a/gps/gps.py b/gps/gps.py index 9029b46c..fcfadd58 100755 --- a/gps/gps.py +++ b/gps/gps.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# $Id$ # # This file is Copyright (c) 2010 by the GPSD project # BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/gpscat.in b/gpscat.in index 6d1e62f9..eb22454b 100644 --- a/gpscat.in +++ b/gpscat.in @@ -62,9 +62,6 @@ if __name__ == '__main__': elif switch == '-h': sys.stderr.write("usage: gpscat [-s speed] serial-port\n") raise SystemExit, 0 - elif switch == '-V': - sys.stderr.write("gpscat at revision $Rev$\n") - raise SystemExit, 0 tty = os.open(arguments[0], os.O_RDWR) if speed != None: diff --git a/gpscat.xml b/gpscat.xml index 7ca9b818..33666474 100644 --- a/gpscat.xml +++ b/gpscat.xml @@ -103,13 +103,6 @@ getter changes. Display program usage and exit. - - --V - -Display program version and exit. - - Specifying -s 4800N1 is frequently helpful with unknown diff --git a/gpsclient.c b/gpsclient.c index b8d234b0..b75e2335 100644 --- a/gpsclient.c +++ b/gpsclient.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. * diff --git a/gpsctl.c b/gpsctl.c index 475f92b3..c4dda615 100644 --- a/gpsctl.c +++ b/gpsctl.c @@ -1,9 +1,8 @@ -/* $Id$ +/* gpsctl.c -- tweak the control settings on a GPS * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. * - * gpsctl.c -- tweak the control settings on a GPS */ #include #include diff --git a/gpsd.c b/gpsd.c index a399e721..22dad8e7 100644 --- a/gpsd.c +++ b/gpsd.c @@ -1,10 +1,9 @@ -/* $Id$ +/* + * This is the main sequence of the gpsd daemon. The IO dos[atcher, main + * select loop, and user command handling lives here. * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. - * - * This is the main sequence of the gpsd daemon. The IO dos[atcher, main - * select loop, and user command handling lives here. */ #include #include "gpsd_config.h" diff --git a/gpsd.h-head b/gpsd.h-head index 912eec7d..830f16de 100644 --- a/gpsd.h-head +++ b/gpsd.h-head @@ -4,7 +4,6 @@ * BSD terms apply: see the file COPYING in the distribution root for details. */ -/* $Id$ */ #ifndef _GPSD_H_ #define _GPSD_H_ diff --git a/gpsd.h-tail b/gpsd.h-tail index 10133e58..ac8a8769 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -5,8 +5,6 @@ */ #endif /* GPSD_CONFIG_H */ -/* $Id$ */ - /* constants for the VERSION response */ #define GPSD_PROTO_MAJOR_VERSION 3 /* bump on incompatible changes */ #define GPSD_PROTO_MINOR_VERSION 1 /* bump on compatible changes */ diff --git a/gpsd.hotplug b/gpsd.hotplug index 6b9fbeb0..afa74f24 100755 --- a/gpsd.hotplug +++ b/gpsd.hotplug @@ -1,5 +1,4 @@ #!/usr/bin/python -# $Id$ # # This file is Copyright (c) 2010 by the GPSD project # BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/gpsd.hotplug.wrapper b/gpsd.hotplug.wrapper index 4be45663..17d74cbc 100644 --- a/gpsd.hotplug.wrapper +++ b/gpsd.hotplug.wrapper @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # # This file is Copyright (c) 2010 by the GPSD project # BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/gpsd.php b/gpsd.php index cb1c0ba1..ce24ad24 100644 --- a/gpsd.php +++ b/gpsd.php @@ -1,6 +1,5 @@ @@ -395,7 +394,6 @@ function write_html($resp){ $gmap_body = 'onload="Load()" onunload="GUnload()"'; $gmap_code = gen_gmap_code(); } - $svn ='$Rev$'; $part1 = << This script is distributed by the GPSD project.
-{$svn}
diff --git a/gpsd.rules b/gpsd.rules index 3680e577..6cd7ee09 100644 --- a/gpsd.rules +++ b/gpsd.rules @@ -1,5 +1,4 @@ # udev rules for gpsd -# $Id$ # # This file is Copyright (c) 2010 by the GPSD project # BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/gpsd.usermap b/gpsd.usermap index 4566cea8..10498147 100644 --- a/gpsd.usermap +++ b/gpsd.usermap @@ -1,5 +1,4 @@ # Hotplug device map for GPSD -# $Id$ # # This file is Copyright (c) 2010 by the GPSD project # BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/gpsd.xml b/gpsd.xml index 55e2f3f7..06504503 100644 --- a/gpsd.xml +++ b/gpsd.xml @@ -740,7 +740,7 @@ will assert the VERSION_SET bit in the top-level set member. Here's an example: -{"class":"VERSION","version":"2.40dev","rev":$Id$,"proto_major":3,"proto_minor":1} +{"class":"VERSION","version":"2.40dev","rev":"06f62e14eae9886cde907dae61c124c53eb1101f","proto_major":3,"proto_minor":1} diff --git a/gpsd_dbus.c b/gpsd_dbus.c index 747369ec..f8ed9edc 100644 --- a/gpsd_dbus.c +++ b/gpsd_dbus.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/gpsd_dbus.h b/gpsd_dbus.h index 933b1db1..e89fc948 100644 --- a/gpsd_dbus.h +++ b/gpsd_dbus.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/gpsd_report.c b/gpsd_report.c index ef38878d..94081aa9 100644 --- a/gpsd_report.c +++ b/gpsd_report.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/gpsdclient.c b/gpsdclient.c index 8c8e4b3a..4da9495f 100644 --- a/gpsdclient.c +++ b/gpsdclient.c @@ -1,9 +1,8 @@ -/* $Id$ +/* + * gpsdclient.c -- support functions for GPSD clients * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. - * - * gpsdclient.c -- support functions for GPSD clients */ #include #include diff --git a/gpsdclient.h b/gpsdclient.h index 50d14345..dc984f6b 100644 --- a/gpsdclient.h +++ b/gpsdclient.h @@ -1,9 +1,9 @@ -/* $Id$ +/* + * gpsdclient.h -- common functions for GPSD clients * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. * - * gpsdclient.h -- common functions for GPSD clients */ #ifndef _GPSD_GPSDCLIENT_H_ diff --git a/gpsdecode.c b/gpsdecode.c index 445fbbf1..36e27f3e 100644 --- a/gpsdecode.c +++ b/gpsdecode.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ @@ -501,7 +500,7 @@ int main(int argc, char **argv) break; case 'V': - (void)fprintf(stderr, "gpsdecode revision $Id$ \n"); + (void)fprintf(stderr, "gpsdecode revision " VERSION "\n"); exit(0); case '?': diff --git a/gpsmon.c b/gpsmon.c index 3fa895ac..3e62f065 100644 --- a/gpsmon.c +++ b/gpsmon.c @@ -1,9 +1,8 @@ -/* $Id$ +/* + * The generic GPS packet monitor. * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. - * - * The generic GPS packet monitor. */ #include #include diff --git a/gpsmon.h b/gpsmon.h index 09b5f5c3..32cf3e7b 100644 --- a/gpsmon.h +++ b/gpsmon.h @@ -1,6 +1,4 @@ /* gpsmon.h -- what monitor capabuilities look like - * - * $Id$ * * By Eric S. Raymond, 2009 * This file is Copyright (c) 2010 by the GPSD project diff --git a/gpspacket.c b/gpspacket.c index 1dc5b31f..45c56d98 100644 --- a/gpspacket.c +++ b/gpspacket.c @@ -1,9 +1,9 @@ -/* $Id$ +/* + * Python binding for the packet.c module. * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. * - * Python binding for the packet.c module. */ #include diff --git a/gpspipe.c b/gpspipe.c index 6481ebaf..91a4771d 100644 --- a/gpspipe.c +++ b/gpspipe.c @@ -1,8 +1,4 @@ -/* $Id$ - * - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - * +/* * gpspipe * * a simple program to connect to a gpsd daemon and dump the received data @@ -21,8 +17,10 @@ * gpspipe -wr * * Original code by: Gary E. Miller . Cleanup by ESR. - * All rights given to the gpsd project to release under whatever open source - * license they use. A thank you would be nice if you use this code. + * + * This file is Copyright (c) 2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. + * */ #include diff --git a/gpssim.py b/gpssim.py index 1b4219e3..20080a50 100644 --- a/gpssim.py +++ b/gpssim.py @@ -1,5 +1,3 @@ -# $Id$ -# # This file is Copyright (c) 2010 by the GPSD project # BSD terms apply: see the file COPYING in the distribution root for details. """ diff --git a/gpsutils.c b/gpsutils.c index 9a291718..ddd86236 100644 --- a/gpsutils.c +++ b/gpsutils.c @@ -1,6 +1,4 @@ /* gpsutils.c -- code shared between low-level and high-level interfaces - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/gpxlogger.c b/gpxlogger.c index cec6382e..5df009e1 100644 --- a/gpxlogger.c +++ b/gpxlogger.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ @@ -21,6 +20,7 @@ #endif /* S_SPLINT_S */ #include "gps.h" #include "gpsdclient.h" +#include "revision.h" /************************************************************************** * @@ -367,7 +367,7 @@ int main (int argc, char** argv) "WARNING: track timeout is an hour or more!\n"); break; case 'V': - (void)fprintf(stderr, "gpxlogger revision $Id$ \n"); + (void)fprintf(stderr, "gpxlogger revision " REVISION "\n"); exit(0); default: usage(); diff --git a/hex.c b/hex.c index a6b12993..25d40ee9 100644 --- a/hex.c +++ b/hex.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/isgps.c b/isgps.c index 94cdbb59..15fbc746 100644 --- a/isgps.c +++ b/isgps.c @@ -1,8 +1,3 @@ -/* $Id$ - * - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - */ /***************************************************************************** This is a decoder for the unnamed protocol described in IS-GPS-200, @@ -58,6 +53,9 @@ handing GPS and RTCM decoding. You are not expected to understand any of this. +This file is Copyright (c) 2010 by the GPSD project +BSD terms apply: see the file COPYING in the distribution root for details. + *****************************************************************************/ #include diff --git a/json.c b/json.c index 83ebdc89..fa665ca5 100644 --- a/json.c +++ b/json.c @@ -1,8 +1,3 @@ -/* $Id$ - * - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - */ /**************************************************************************** NAME @@ -52,6 +47,10 @@ If you initialize the offset fields with the correct offsetof() calls, everything will work. Strings are suppported but all string storage has to be inline in the struct. +PERMISSIONS + This file is Copyright (c) 2010 by the GPSD project + BSD terms apply: see the file COPYING in the distribution root for details. + ***************************************************************************/ #include #include diff --git a/json.h b/json.h index 26e7d982..1d928ee1 100644 --- a/json.h +++ b/json.h @@ -1,6 +1,4 @@ /* Structures for JSON parsing using only fixed-extent memory - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/lcdgps.c b/lcdgps.c index 429e1f99..ab327005 100644 --- a/lcdgps.c +++ b/lcdgps.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * Copyright (c) 2005 Jeff Francis * @@ -78,6 +77,7 @@ #include "gps.h" #include "gpsdclient.h" +#include "revision.h" /* Macro for declaring function arguments unused. */ #if defined(__GNUC__) @@ -410,7 +410,7 @@ int main(int argc, char *argv[]) while ((option = getopt(argc, argv, "Vhl:su:")) != -1) { switch (option) { case 'V': - (void)fprintf(stderr, "$Id$\n"); + (void)fprintf(stderr, "lcdgs revision " REVISION "\n"); exit(0); case 'h': default: diff --git a/libgps_core.c b/libgps_core.c index 1030ed5d..ac6b0ca3 100644 --- a/libgps_core.c +++ b/libgps_core.c @@ -1,6 +1,4 @@ /* libgps.c -- client interface library for the gpsd daemon - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/libgpsd_core.c b/libgpsd_core.c index bd1aabd1..971d600e 100644 --- a/libgpsd_core.c +++ b/libgpsd_core.c @@ -1,6 +1,4 @@ /* libgpsd_core.c -- direct access to GPSes on serial or USB devices. - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/libgpsmm.cpp b/libgpsmm.cpp index f505efd9..f289d95e 100644 --- a/libgpsmm.cpp +++ b/libgpsmm.cpp @@ -1,4 +1,3 @@ -/* $Id$ */ /* * Copyright (C) 2005 Alfredo Pironti * diff --git a/libgpsmm.h b/libgpsmm.h index d51fe532..0b95afa5 100644 --- a/libgpsmm.h +++ b/libgpsmm.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef _GPSD_GPSMM_H_ #define _GPSD_GPSMM_H_ diff --git a/monitor_italk.c b/monitor_italk.c index 478e3d24..26a683c7 100644 --- a/monitor_italk.c +++ b/monitor_italk.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/monitor_nmea.c b/monitor_nmea.c index 51e35d45..fb11e76d 100644 --- a/monitor_nmea.c +++ b/monitor_nmea.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * nmeamon.c - gpsmon support for NMEA devices. * diff --git a/monitor_oncore.c b/monitor_oncore.c index b9e08e36..6cb81527 100644 --- a/monitor_oncore.c +++ b/monitor_oncore.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * OnCore object for the GPS packet monitor. * diff --git a/monitor_proto.c b/monitor_proto.c index 08c78ae3..55f4e916 100644 --- a/monitor_proto.c +++ b/monitor_proto.c @@ -1,11 +1,9 @@ -/* $Id$ +/* + * Prototype file for a gpsmon monitor object. * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ -/* - * Prototype file for a gpsmon monitor object. - */ #include #include #include diff --git a/monitor_sirf.c b/monitor_sirf.c index 9e0f5df7..e4794a56 100644 --- a/monitor_sirf.c +++ b/monitor_sirf.c @@ -1,10 +1,9 @@ -/* $Id$ +/* + * SiRF object for the GPS packet monitor. * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. * - * SiRF object for the GPS packet monitor. - * */ #include #include diff --git a/monitor_superstar2.c b/monitor_superstar2.c index 54582129..725e271d 100644 --- a/monitor_superstar2.c +++ b/monitor_superstar2.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/monitor_ubx.c b/monitor_ubx.c index c3543559..68e7b979 100644 --- a/monitor_ubx.c +++ b/monitor_ubx.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/net_dgpsip.c b/net_dgpsip.c index 8c27cb30..9f839bf3 100644 --- a/net_dgpsip.c +++ b/net_dgpsip.c @@ -1,6 +1,4 @@ /* net_dgpsip.c -- gather and dispatch DGPS data from DGPSIP servers - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/net_gnss_dispatch.c b/net_gnss_dispatch.c index 58ece1c6..c8b5a7d1 100644 --- a/net_gnss_dispatch.c +++ b/net_gnss_dispatch.c @@ -1,6 +1,4 @@ /* net_gnss_dispatch.c -- common interface to a number of Network GNSS services - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/net_ntrip.c b/net_ntrip.c index 526bd181..7702f7ff 100644 --- a/net_ntrip.c +++ b/net_ntrip.c @@ -1,6 +1,4 @@ /* net_ntrip.c -- gather and dispatch DGNSS data from Ntrip broadcasters - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/netlib.c b/netlib.c index 3730c0fe..d4ce51ca 100644 --- a/netlib.c +++ b/netlib.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/ntpshm.c b/ntpshm.c index 5fae6bb4..57bcdd6b 100644 --- a/ntpshm.c +++ b/ntpshm.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * ntpshm.c - put time information in SHM segment for xntpd * struct shmTime and getShmTime from file in the xntp distribution: diff --git a/packet.c b/packet.c index c8486f6e..986181a8 100644 --- a/packet.c +++ b/packet.c @@ -1,4 +1,3 @@ -/* $Id$ */ /**************************************************************************** NAME: diff --git a/packet_states.h b/packet_states.h index 99845b51..311f4c33 100644 --- a/packet_states.h +++ b/packet_states.h @@ -1,4 +1,3 @@ -/* $Id$ */ /* edit packet_states.h to add new packet types. */ GROUND_STATE, /* we don't know what packet type to expect */ diff --git a/pseudonmea.c b/pseudonmea.c index 5de07257..db4697bf 100644 --- a/pseudonmea.c +++ b/pseudonmea.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/serial.c b/serial.c index c86d0833..8485d408 100644 --- a/serial.c +++ b/serial.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/setup.py b/setup.py index 773295a3..fe518232 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,3 @@ -# $Id$ -# # This file is Copyright (c) 2010 by the GPSD project # BSD terms apply: see the file COPYING in the distribution root for details. # diff --git a/srecord.c b/srecord.c index 1cfdbf02..37e7155c 100644 --- a/srecord.c +++ b/srecord.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * Copyright (c) 2005 Chris Kuethe * diff --git a/strl.c b/strl.c index baca1fcf..214f1617 100644 --- a/strl.c +++ b/strl.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/subframe.c b/subframe.c index c4ada36f..38dd4331 100644 --- a/subframe.c +++ b/subframe.c @@ -1,6 +1,4 @@ /* subframe.c -- interpret satellite subframe data. - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/test_bits.c b/test_bits.c index 66ce6c62..a225dfc0 100644 --- a/test_bits.c +++ b/test_bits.c @@ -1,6 +1,4 @@ /* test harness for bits.h - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/test_float.c b/test_float.c index b4043860..6271cedd 100644 --- a/test_float.c +++ b/test_float.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/test_geoid.c b/test_geoid.c index 4347e5da..5d428a59 100644 --- a/test_geoid.c +++ b/test_geoid.c @@ -1,6 +1,4 @@ /* test driver for the ECEF to WGS84 conversions in geoid.c - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/test_gpsmm.cpp b/test_gpsmm.cpp index 22dc9273..45114c73 100644 --- a/test_gpsmm.cpp +++ b/test_gpsmm.cpp @@ -1,4 +1,3 @@ -/* $Id$ */ /* * Copyright (C) 2005 Alfredo Pironti * diff --git a/test_json.c b/test_json.c index 76a290c1..6b7a2ace 100644 --- a/test_json.c +++ b/test_json.c @@ -1,6 +1,4 @@ /* json.c - unit test for JSON partsing into fixed-extent structures - * - * $Id$ * * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. diff --git a/test_mkgmtime.c b/test_mkgmtime.c index c269e32f..679d66c4 100644 --- a/test_mkgmtime.c +++ b/test_mkgmtime.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/test_packet.c b/test_packet.c index 8c63e8ca..1acd69ea 100644 --- a/test_packet.c +++ b/test_packet.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is Copyright (c) 2010 by the GPSD project * BSD terms apply: see the file COPYING in the distribution root for details. */ diff --git a/test_trig.c b/test_trig.c index 3be098a3..760dd0e7 100644 --- a/test_trig.c +++ b/test_trig.c @@ -1,5 +1,3 @@ -/* $Id$ */ - /* * Copyright (c) 2006 Chris Kuethe * Copyright (c) 2009 BBN Technologies (Greg Troxel) diff --git a/timebase.h b/timebase.h index 3d5e3c3d..e34cbc60 100644 --- a/timebase.h +++ b/timebase.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef _GPSD_TIMEBASE_H_ #define _GPSD_TIMEBASE_H_ diff --git a/www/gps_report.cgi b/www/gps_report.cgi index 94056831..061f388e 100644 --- a/www/gps_report.cgi +++ b/www/gps_report.cgi @@ -510,7 +510,6 @@ EOF } print "\n
\n"; -print '$Id$'; print $query->end_html; diff --git a/xgpsspeed.c b/xgpsspeed.c index d3cb39bb..c9b7d622 100644 --- a/xgpsspeed.c +++ b/xgpsspeed.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* GPS speedometer as a wrapper around an Athena widget Tachometer * - Derrick J Brashear *