Maelstrom: Updated e-mail addresses

From 720c8158ea98b4c654156c50fff342c75c0fadd1 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sat, 22 Oct 2011 09:03:00 -0400
Subject: [PATCH] Updated e-mail addresses

---
 INSTALL                    | 9 ++++++---
 Maelstrom.spec             | 2 +-
 Maelstrom.spec.in          | 2 +-
 README.joystick            | 2 +-
 configure.in               | 2 +-
 maclib/Mac_Compat.h        | 4 +---
 maclib/Mac_FontServ.cpp    | 4 +---
 maclib/Mac_FontServ.h      | 4 +---
 maclib/Mac_Resource.cpp    | 4 +---
 maclib/Mac_Resource.h      | 4 +---
 maclib/Mac_Sound.cpp       | 4 +---
 maclib/Mac_Sound.h         | 4 +---
 maclib/Mac_Wave.cpp        | 4 +---
 maclib/Mac_Wave.h          | 4 +---
 maclib/macbinary.h         | 4 +---
 maclib/macres.cpp          | 4 +---
 maclib/playwave.cpp        | 4 +---
 maclib/snd2wav.cpp         | 4 +---
 main.cpp                   | 2 +-
 netlogic/game.cpp          | 2 +-
 screenlib/SDL_FrameBuf.cpp | 4 +---
 screenlib/SDL_FrameBuf.h   | 4 +---
 22 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/INSTALL b/INSTALL
index f17ab8cd..b7e8e07c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,10 @@
 
-To build and install the game, get the Simple DirectMedia Layer
-library from http://www.devolution.com/~slouken/SDL/ and install
-it.  Then run:
+To build and install the game, get the following libraries and install them:
+http;//www.libsdl.org
+http://www.libsdl.org/projects/SDL_net
+http://www.icculus.org/physfs
+
+Then run:
 	./configure; make; make install
 
 If you are building with Visual C++, unpack VisualC.zip and open
diff --git a/Maelstrom.spec b/Maelstrom.spec
index 50406d3d..3cdc3c70 100644
--- a/Maelstrom.spec
+++ b/Maelstrom.spec
@@ -9,7 +9,7 @@ Name: %{name}
 Version: %{version}
 Release: %{release}
 Source0: %{name}-%{version}.tar.gz
-URL: http://www.devolution.com/~slouken/Maelstrom/
+URL: http://www.libsdl.org/projects/Maelstrom/
 Copyright: GPL
 Group: Games
 BuildRoot: /var/tmp/%{name}-buildroot
diff --git a/Maelstrom.spec.in b/Maelstrom.spec.in
index 1095ccb6..142bab26 100644
--- a/Maelstrom.spec.in
+++ b/Maelstrom.spec.in
@@ -9,7 +9,7 @@ Name: %{name}
 Version: %{version}
 Release: %{release}
 Source0: %{name}-%{version}.tar.gz
-URL: http://www.devolution.com/~slouken/Maelstrom/
+URL: http://www.libsdl.org/projects/Maelstrom/
 Copyright: GPL
 Group: Games
 BuildRoot: /var/tmp/%{name}-buildroot
diff --git a/README.joystick b/README.joystick
index 9f7ac8f8..d852dc30 100644
--- a/README.joystick
+++ b/README.joystick
@@ -7,5 +7,5 @@ accelerate the ship.  The first joystick button fires the ship's weapons
 and the second joystick button activates the shields.
 
 Enjoy!
-	-Sam Lantinga			(slouken@devolution.com)
+	-Sam Lantinga			(slouken@libsdl.org)
 
diff --git a/configure.in b/configure.in
index 75a15fc6..8511cc95 100644
--- a/configure.in
+++ b/configure.in
@@ -61,7 +61,7 @@ if test x$have_SDL_net = xyes; then
 else
     AC_MSG_ERROR([*** Can't find the SDL_net library
 The SDL_net library can be found at:
-http://www.devolution.com/~slouken/SDL/projects/SDL_net/
+http://www.libsdl.org/projects/SDL_net/
 ])
 fi
 
diff --git a/maclib/Mac_Compat.h b/maclib/Mac_Compat.h
index 7d039293..bf2b05ce 100644
--- a/maclib/Mac_Compat.h
+++ b/maclib/Mac_Compat.h
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifndef _Mac_Compat_h
diff --git a/maclib/Mac_FontServ.cpp b/maclib/Mac_FontServ.cpp
index e50320ff..1bf211c7 100644
--- a/maclib/Mac_FontServ.cpp
+++ b/maclib/Mac_FontServ.cpp
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* The Macintosh Font Server module */
diff --git a/maclib/Mac_FontServ.h b/maclib/Mac_FontServ.h
index 3a1ebce7..cd3bd994 100644
--- a/maclib/Mac_FontServ.h
+++ b/maclib/Mac_FontServ.h
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifndef _fontserv_h
diff --git a/maclib/Mac_Resource.cpp b/maclib/Mac_Resource.cpp
index 0a057749..74cf0046 100644
--- a/maclib/Mac_Resource.cpp
+++ b/maclib/Mac_Resource.cpp
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* These are routines to parse a Macintosh Resource Fork file
diff --git a/maclib/Mac_Resource.h b/maclib/Mac_Resource.h
index 2657deb2..578b3dae 100644
--- a/maclib/Mac_Resource.h
+++ b/maclib/Mac_Resource.h
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifndef _Mac_Resource_h
diff --git a/maclib/Mac_Sound.cpp b/maclib/Mac_Sound.cpp
index 4f76405a..1f77e742 100644
--- a/maclib/Mac_Sound.cpp
+++ b/maclib/Mac_Sound.cpp
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #include <signal.h>
diff --git a/maclib/Mac_Sound.h b/maclib/Mac_Sound.h
index cd48ddf7..b1d33e6f 100644
--- a/maclib/Mac_Sound.h
+++ b/maclib/Mac_Sound.h
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* This is a general mixer that takes Macintosh sound resource files
diff --git a/maclib/Mac_Wave.cpp b/maclib/Mac_Wave.cpp
index 2ca30672..df4bacf5 100644
--- a/maclib/Mac_Wave.cpp
+++ b/maclib/Mac_Wave.cpp
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* Microsoft WAVE file loading routines */
diff --git a/maclib/Mac_Wave.h b/maclib/Mac_Wave.h
index d2428046..ff96fee8 100644
--- a/maclib/Mac_Wave.h
+++ b/maclib/Mac_Wave.h
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* A WAVE class that can load itself from WAVE files or Mac 'snd ' resources */
diff --git a/maclib/macbinary.h b/maclib/macbinary.h
index 63997b98..66b6e1aa 100644
--- a/maclib/macbinary.h
+++ b/maclib/macbinary.h
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* This is the general format of a MacBinary archive
diff --git a/maclib/macres.cpp b/maclib/macres.cpp
index 756a9e93..a3bd25d5 100644
--- a/maclib/macres.cpp
+++ b/maclib/macres.cpp
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* Test program to list and extract Macintosh resources from a resource fork */
diff --git a/maclib/playwave.cpp b/maclib/playwave.cpp
index d05d771d..fc683861 100644
--- a/maclib/playwave.cpp
+++ b/maclib/playwave.cpp
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* Very simple WAVE player */
diff --git a/maclib/snd2wav.cpp b/maclib/snd2wav.cpp
index 987eb078..8c07caa0 100644
--- a/maclib/snd2wav.cpp
+++ b/maclib/snd2wav.cpp
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 /* A Macintosh sound resource converter */
diff --git a/main.cpp b/main.cpp
index 8646cda1..2b5f5d6c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,7 +6,7 @@
 /* Ported to Linux  (Spring 1995)				 */
 /* Ported to Win95  (Fall   1996) -- not releasable		 */
 /* Ported to SDL    (Fall   1997)                                */
-/* By Sam Lantinga  (slouken@devolution.com)			 */
+/* By Sam Lantinga  (slouken@libsdl.org)			 */
 /* 								 */
 /* ------------------------------------------------------------- */
 
diff --git a/netlogic/game.cpp b/netlogic/game.cpp
index ff34fe87..ed4af9a2 100644
--- a/netlogic/game.cpp
+++ b/netlogic/game.cpp
@@ -89,7 +89,7 @@ int SelectMovieRect(void)
 
 }
 #endif
-extern int RunFrame(void);	/* The heart of blit.cc */
+extern int RunFrame(void);	/* The heart of blit.cpp */
 
 // Global variables set in this file...
 int	gGameOn;
diff --git a/screenlib/SDL_FrameBuf.cpp b/screenlib/SDL_FrameBuf.cpp
index b45d1206..b5e3d9a5 100644
--- a/screenlib/SDL_FrameBuf.cpp
+++ b/screenlib/SDL_FrameBuf.cpp
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #include <stdio.h>
diff --git a/screenlib/SDL_FrameBuf.h b/screenlib/SDL_FrameBuf.h
index b2432435..6f2d2bf5 100644
--- a/screenlib/SDL_FrameBuf.h
+++ b/screenlib/SDL_FrameBuf.h
@@ -17,9 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Sam Lantinga
-    5635-34 Springhouse Dr.
-    Pleasanton, CA 94588 (USA)
-    slouken@devolution.com
+    slouken@libsdl.org
 */
 
 #ifndef _SDL_FrameBuf_h