Update COPYING and FSF snail mail address.

diff --git a/COPYING b/COPYING
index a43ea2126fb6b114bff5f8e003ee118e045dacf1..d159169d1050894d3ea3b98e1c965c4058208fe1 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
-                   GNU GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                           Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-\f
-                   GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-\f
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-\f
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-\f
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                           NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                    END OF TERMS AND CONDITIONS
-\f
-       Appendix: How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -335,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

diff --git a/src/common/buffer.c b/src/common/buffer.c
index 1feb98be8be3ecd683fa2bf7397334498643fde7..261fd3945bb56105e1381fd2c64fee07663eaf3f 100644 (file)
--- a/src/common/buffer.c
+++ b/src/common/buffer.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <string.h>

diff --git a/src/common/err.c b/src/common/err.c
index 040bc1172c0d23a60e347633e66187eedf6e0fac..ff1b679a57481e8bf5aeef6e2d0e5149cd89887f 100644 (file)
--- a/src/common/err.c
+++ b/src/common/err.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/fastmem.c b/src/common/fastmem.c
index 7565e78ffaf5b204964249c1da0fc1de57920c8a..3000104b5d0d38b35c1575dfc68301a828663358 100644 (file)
--- a/src/common/fastmem.c
+++ b/src/common/fastmem.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*

diff --git a/src/common/files.c b/src/common/files.c
index c32317ae1f0c596d2207e2208ed61e3d633a6c44..62892b21292f9798c9a6e248fd150264e49fb41d 100644 (file)
--- a/src/common/files.c
+++ b/src/common/files.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdio.h>

diff --git a/src/common/hotkey.c b/src/common/hotkey.c
index bde1d63e8f4bdea0c3e100b1c0be9353f230bad9..25237cb83b31380677478ff72953d33d56aca89c 100644 (file)
--- a/src/common/hotkey.c
+++ b/src/common/hotkey.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/input.c b/src/common/input.c
index ae65d03f3d077780dca04cf36bca840860190591..88fd87fa851ebd9a22639b482bb439c3595a0cbd 100644 (file)
--- a/src/common/input.c
+++ b/src/common/input.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/main.c b/src/common/main.c
index 3320f8b435c6bbecc79e19509ea87c92bdea5c62..8170f70eba5080d7bc13b42bb734fc0181520bbf 100644 (file)
--- a/src/common/main.c
+++ b/src/common/main.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*

diff --git a/src/common/math.c b/src/common/math.c
index 5ff5163230bd4680e55b438dc6168b2c37eb2312..83f0818490fac313b3105bcefd85e42b497ce757 100644 (file)
--- a/src/common/math.c
+++ b/src/common/math.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/object.c b/src/common/object.c
index 676b6c93c572f7e2ed27c49f10111d0571cc48ba..ca40f5e542ea65cb3d56669f084039ef6e94a9b6 100644 (file)
--- a/src/common/object.c
+++ b/src/common/object.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/process.c b/src/common/process.c
index 31c84b7968b35eaf51f713b4d8726cdc5391cb8b..e4cf88e738890d05d2d99b462b3a9d593e368921 100644 (file)
--- a/src/common/process.c
+++ b/src/common/process.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/quetzal.c b/src/common/quetzal.c
index ac06055869bdaed22c9e6eacf55a907dcfce6c86..df3be02e13f3fabee29e243e2cca7eb9f5f56e55 100644 (file)
--- a/src/common/quetzal.c
+++ b/src/common/quetzal.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdio.h>

diff --git a/src/common/redirect.c b/src/common/redirect.c
index b0dfafcb016e644d4463586f4744e4656ca7fa64..7815abfbd11ef54615422d0da4e956c3fb3492b6 100644 (file)
--- a/src/common/redirect.c
+++ b/src/common/redirect.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/screen.c b/src/common/screen.c
index 0de4de9c6981a5bdeb3857d1a763064df076cec8..97b55053c1d2de7df8989d72fd579f5e9ec27119 100644 (file)
--- a/src/common/screen.c
+++ b/src/common/screen.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/sound.c b/src/common/sound.c
index 37c98e93f4aec75eb20980f6010141aba0ba965a..50f2e9e1415e3ffdd82a739e1a440e3072dd8e02 100644 (file)
--- a/src/common/sound.c
+++ b/src/common/sound.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/stream.c b/src/common/stream.c
index 0a3e0769643f2e599779ee96a6d3e7e2c2a498c6..ed37baaafbee937d5adf6a9bc1eaa9a40319426b 100644 (file)
--- a/src/common/stream.c
+++ b/src/common/stream.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/table.c b/src/common/table.c
index eb3a16366d2d75dca7e7c42c47a6f2f91d15023f..192053d23d1907ba2f10c393965c114f7b9a60d7 100644 (file)
--- a/src/common/table.c
+++ b/src/common/table.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/text.c b/src/common/text.c
index a85e0a2f10f656aaf9b08d75141134ff2219d8b1..e1ea02c25fa7e27c43720f675122c317bf94f59d 100644 (file)
--- a/src/common/text.c
+++ b/src/common/text.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/common/variable.c b/src/common/variable.c
index 3e5c6e0c0980cfb6e39d133093f1a0a057257f43..02b533d1a0a777be295d4af9fd815400e7240c68 100644 (file)
--- a/src/common/variable.c
+++ b/src/common/variable.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "frotz.h"

diff --git a/src/curses/ux_audio_none.c b/src/curses/ux_audio_none.c
index f847543eb9b13ad59a836a6418310f729fc2b739..1b5338cd74124ef966cbd813e47222cdef707afd 100644 (file)
--- a/src/curses/ux_audio_none.c
+++ b/src/curses/ux_audio_none.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define __UNIX_PORT_FILE

diff --git a/src/curses/ux_audio_oss.c b/src/curses/ux_audio_oss.c
index db66c8c9c56adc0587d98694db0bcfc770d2d43a..ad5ee5b7ecf03affe42c37ed6d677bf06dda4c84 100644 (file)
--- a/src/curses/ux_audio_oss.c
+++ b/src/curses/ux_audio_oss.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define __UNIX_PORT_FILE

diff --git a/src/curses/ux_file.c b/src/curses/ux_file.c
index 6dc43a4823b99f48d89bdcd04517e33bac8203c8..0340c840e6d64f2b663b704571b69a52c3784025 100644 (file)
--- a/src/curses/ux_file.c
+++ b/src/curses/ux_file.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*

diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c
index efa374d8deec82b00b01fccf956a8fbd2f567bd2..b6f4e1a189b9215c67431c21e7834714a04e6531 100644 (file)
--- a/src/curses/ux_init.c
+++ b/src/curses/ux_init.c
@@ -1,7 +1,7 @@
 /*
  * ux_init.c - Unix interface, initialisation
  *     Galen Hazelwood <galenh@micron.net>
- *     David Griffith <dgriffi@cs.csubak.edu>
+ *     David Griffith <dave@661.org>
  *
  * This file is part of Frotz.
  *
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define __UNIX_PORT_FILE

diff --git a/src/curses/ux_input.c b/src/curses/ux_input.c
index c872e0e8ad832f4e826d053cbdfbfa4e4e36f215..f110f00748f4d7ddad4084c72e9772018ea53b0c 100644 (file)
--- a/src/curses/ux_input.c
+++ b/src/curses/ux_input.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 

diff --git a/src/curses/ux_pic.c b/src/curses/ux_pic.c
index 451a6204c3b3ecb1edc8a2f5f2d4530c52109dac..1fe77a1be3a6e570742a055fe434e05d5627c76f 100644 (file)
--- a/src/curses/ux_pic.c
+++ b/src/curses/ux_pic.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define __UNIX_PORT_FILE

diff --git a/src/curses/ux_screen.c b/src/curses/ux_screen.c
index c736e13869c95fc36b31d222804b336db313217f..52ee4ca21a73da2b196147cdeec842c2c48f9998 100644 (file)
--- a/src/curses/ux_screen.c
+++ b/src/curses/ux_screen.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define __UNIX_PORT_FILE

diff --git a/src/curses/ux_text.c b/src/curses/ux_text.c
index bdce7dcfe6010a3ad6e9163aeb9ea3cb4c98396f..9fa1dbf38e32e1f6157db1415facf9cead58b76c 100644 (file)
--- a/src/curses/ux_text.c
+++ b/src/curses/ux_text.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */