From: Eric S. Raymond <esr@thyrsus.com>
Date: Fri, 17 Feb 2012 02:46:10 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.berlios.de/gitroot/sst
X-Git-Tag: 2.2~115
X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=commitdiff_plain;h=b039f9f202f3a7774e5daa92f8cd0ed9940045a8;hp=097ac6ffc1531b44d06767be40045795a92321e5

Merge branch 'master' of ssh://git.berlios.de/gitroot/sst
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..85f7995
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+sst.pyc
+doc/sst.6
+doc/sst.doc
+doc/sst-doc.txt
+www/sst-doc.html
diff --git a/Makefile b/Makefile
index f04a38d..147e1f3 100644
--- a/Makefile
+++ b/Makefile
@@ -37,4 +37,5 @@ clean:
 	rm -f *.6 MANIFEST index.html SHIPPER.*
 
 release: sst-$(VERS).tar.gz sst.html
-	shipper -u -m -t; make clean
+	shipper -u -t; make clean
+	cd www; upload
diff --git a/NEWS b/NEWS
index 17657ea..a551ced 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 			SST2K project news.
 
+2.1 @ 2012-02-16
+    Packaging fixes, pychecker cleanup, cope with Freshmeat name changes.
+
 2.0 @ 2010-11-30
     Game code moved to Python. Many bug fixes.
 
diff --git a/control b/control
index b6ffbf8..02370be 100644
--- a/control
+++ b/control
@@ -4,7 +4,7 @@
 Package: sst
 XBS-Freshmeat-Name: strek
 
-Destinations: ~,berlios,freshmeat
+Destinations: ~,berlios,freecode
 
 Description: Super Star Trek, a timeless classic of computer games
  Save the Federation from the invading Klingons!  Visit exotic planets and
diff --git a/doc/HACKING b/doc/HACKING
index 0babf5c..32bccdc 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -191,7 +191,7 @@ probability of being damaged."
 This is one place where OPTION_PLAIN does not restore the original
 behavior, which was equiprobable damage across all devices.  If we
 wanted that, we'd return randrange(NDEVICES) and have done with it.
-Also, in the original game, DNAVYS and DCOMPTR were the same device.
+Also, in the original game, DNAVSYS and DCOMPTR were the same device.
 
 Instead, we use a table of weights similar to the one from BSD Trek.
 BSD doesn't have the shuttle, shield controller, death ray, or probes.
diff --git a/doc/Makefile b/doc/Makefile
index 11d93db..6d5909d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,4 @@
-# From this directory, distribute rge following files:
+# From this directory, distribute the following files:
 # HACKING makehelp.py sst-doc.xml sst-layer.xsl sst.xml
 
 sst.6: sst.xml
diff --git a/doc/sst-doc.xml b/doc/sst-doc.xml
index c50cd83..a7469a7 100644
--- a/doc/sst-doc.xml
+++ b/doc/sst-doc.xml
@@ -1883,7 +1883,7 @@ command descriptions, and changed some logic in sst.c to match.
 <listitem><para>
 I've cleaned up a lot of grubby FORTRANisms in the code internals &mdash;
 used sizeof(), replaced magic numeric constants with #defines,
-that sort of thing.
+that sort of thing.  Later I translated the code from C to Python.
 </para></listitem>
 <listitem><para>
 I fixed a surprising number of typos in the code and documentation.
diff --git a/sst.py b/sst.py
index 35d1433..bf13aa9 100755
--- a/sst.py
+++ b/sst.py
@@ -13,7 +13,7 @@ on how to modify (and how not to modify!) this code.
 """
 import os, sys, math, curses, time, readline, cPickle, random, copy, gettext, getpass
 
-version="2.0"
+version="2.1"
 
 docpath  	= (".", "../doc", "/usr/share/doc/sst")
 
@@ -6369,3 +6369,5 @@ if __name__ == '__main__':
         if logfp:
             logfp.close()
         print ""
+
+# End.