Version bump, pychecker fixes and installation-procedure tweaks.

4 files changed, 31 insertions, 28 deletions

diff --git a/NEWS b/NEWS
index 7c2de4c1..7f9847cb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-* Thu Sep 22 2011 Eric S. Raymond <esr@snark.thyrsus.com> - 3.2~dev In
-  the build recipe, (1) set pkgconfig properly for 64-bit Fedora
+* Wed Oct 25 2011 Eric S. Raymond <esr@snark.thyrsus.com> - 3.2 
+  In the build recipe, (1) set pkgconfig properly for 64-bit Fedora
   systems, (2) clean up various derived files including *.pyc on scons
   -c, (3) add an option to disable stripping of binaries (strip=no),
   (4) for embedded targets, add an option to disable building Python
@@ -7,14 +7,14 @@
   a little clearer, (6) add a force_global option to build gpsd to
   listen to all addresses (rather than just loopback). The packet
   sniffer now accepts NMEA packets with the ECDIS packet leader 'EC'.
-  SBAS satellites are now properly use-flagged in SiRF and UBX skyviews.
-  The -G option now works under IPv6. Cross-build is now officially
-  supported and instructions included.  gpsprof works again and does
-  whole-cycle profiling. gpsd.php has Open Street Map support.  The
-  pp-on-cts option is replaced by a pps_pin option that lets you
-  specify the pin; the default is still DCD. New supported device;
-  the Jackson Labs Fury. The chrpath utility has become a build
-  prerequisite.
+  SBAS satellites are now properly use-flagged in SiRF and UBX
+  skyviews.  The -G option now works under IPv6. Cross-build is now
+  officially supported and instructions included.  gpsprof works again
+  and does whole-cycle profiling. gpsd.php has Open Street Map
+  support.  The pp-on-cts option is replaced by a pps_pin option that
+  lets you specify the pin; the default is still DCD. New supported
+  device; the Jackson Labs Fury. The chrpath utility has become a
+  build prerequisite.
 
 * Sun Aug 28 2011 Eric S. Raymond <esr@snark.thyrsus.com> - 3.1
   The Irene release, rocking you like a hurricane and brought to you
diff --git a/SConstruct b/SConstruct
index 4e2a3043..05b21ea9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1196,7 +1196,7 @@ Utility("cppcheck", ["gpsd.h", "packet_names.h"],
 # Sanity-check Python code. TODO: add xgps for the complete set.
 Utility("pychecker", ["jsongen.py", "maskaudit.py"],
         ['''for f in  gpsprof gpscat gpsfake gegps; do ln -s $$f $$f.py; done; \
-        pychecker --no-callinit jsongen.py leapsecond.py maskaudit.py gpsprof.py gpscat.py gpsfake.py gegps.py gps/*.py;
+        pychecker --no-classattr --no-callinit jsongen.py leapsecond.py maskaudit.py gpsprof.py gpscat.py gpsfake.py gegps.py gps/*.py;
         for f in gpsprof gpscat gpsfake gegps; do rm $$f.py $$f.pyc; done'''])
 
 # Check the documentation for bogons, too
diff --git a/gpsprof b/gpsprof
index 158ae7c4..38240299 100755
--- a/gpsprof
+++ b/gpsprof
@@ -6,7 +6,7 @@
 # Collect and plot latency-profiling data from a running gpsd.
 # Requires gnuplot.
 #
-import sys, os, time, getopt, socket, math, copy, signal, json
+import sys, os, time, getopt, socket, math, copy, signal
 import gps
 
 class Baton:
diff --git a/www/hacking.html.in b/www/hacking.html.in
index 8f1fd484..76356644 100644
--- a/www/hacking.html.in
+++ b/www/hacking.html.in
@@ -1431,23 +1431,26 @@ will have a day or so to get their urgent fixes in.</dd>
 <dd>It will need to be modified in SConstruct.  Make sure the 'dev' 
 suffix is gone.</dd>
 
-<dt>5. Remove revision.h and rebuild leapseconds.cache.</dt>  
-<dd>First, remove revision.h so it will be rebuilt correctly
-for the tarball.  Then, rebuild the leap-second list
-used for rollover checks with 'scons leapseconds.cache' Note: The latter will
-require Internet access, and fail (leaving the existing leap-second
-list in place) if that is not available.</dd>
-
-<dt>6. Fix compiler and scan-build warnings.</dt>
+<dt>5. Remove revision.h (or just do <command>scons -c</command>)</dt>
+<dd>This step ensurered that the release ID in the revision.h that
+goes in the tarball will look right.</dd>
+
+<dt>6. Rebuild leapseconds.cache.</dt>  
+<dd>Rebuild the leap-second list used for rollover checks with 'scons
+leapseconds.cache' Note: The latter will require Internet access, and
+fail (leaving the existing leap-second list in place) if that is not
+available.</dd>
+
+<dt>7. Fix compiler and scan-build warnings.</dt>
 <dd>Look for compiler and <a
 href="http://devel.recluse.de/~bzed/scan-build/gpsd/">scan-build</a>
 warnings and fix them.</dd>
 
-<dt>7. Update the NEWS file</dt>
+<dt>8. Update the NEWS file</dt>
 <dd>Make sure the topmost entry in the changelog portion of
 gpsd.spec.in is up-to-date and properly timestamped.</dd>
 
-<dt>8. Run the regression tests and other checks</dt>
+<dt>9. Run the regression tests and other checks</dt>
 <dd>If it doesn't pass regressions, it isn't ready to ship.
 <ol>
 <li>scons testbuild</li>
@@ -1457,23 +1460,23 @@ gpsd.spec.in is up-to-date and properly timestamped.</dd>
 </ol>
 </dd>
 
-<dt>9.Perform a validation pass on the website content.</dt>
+<dt>10.Perform a validation pass on the website content.</dt>
 <dd>See the instructions near validation-list in the scons recipe.  
 Then upload the corrected pages with <code>scons website</code>.</dd>
 
-<dt>10. Ship to our hosting site</dt>
+<dt>11. Ship to our hosting site</dt>
 <dd>Make the tarball (<code>scons dist</code>), upload it to @SITENAME@,
 (<code>scons upload-release</code>), and notify the announce list.</dd>
 
-<dt>11. Tag the release in git</dt>
-<dd><p><code>scons tag-relese</code> will do it.</p></dd>
+<dt>12. Tag the release in git</dt>
+<dd><p><code>scons tag-release</code> will do it.</p></dd>
 
-<dt>12. Bump the release number and push that commit</dt>
+<dt>13. Bump the release number and push that commit</dt>
 <dd>Bump the release number in SConstruct, adding a '~dev' suffix
 so tarball instances pulled from the repo will be clearly
 distinguishable from the next public release.</dd>
 
-<dt>13. Announce the release</dt>
+<dt>14. Announce the release</dt>
 <dd>Announce the release, and the resumption of regular commits, on
 the dev list.</dd>
 </dl>