diff -wu maelstrom-1.4.3-L3.0.6/dialog.h maelstrom-1.4.3-L3.0.6/dialog.h
--- maelstrom-1.4.3-L3.0.6/dialog.h
+++ maelstrom-1.4.3-L3.0.6/dialog.h
@@ -401,11 +401,11 @@
 		for ( radio=&radio_list; radio->next; radio=radio->next )
 			/* Loop to end of radio box list */;
 /* Which is ANSI C++? */
-#ifdef linux
-		radio->next = new struct Mac_RadioList::radio;
-#else
+//#ifdef linux
+//		radio->next = new struct Mac_RadioList::radio;
+//#else
 		radio->next = new struct radio;
-#endif
+//#endif
 		radio = radio->next;
 		radio->label = Fontserv->TextImage(text, Font,
 							STYLE_NORM, 0, 0, 0);
diff -wu maelstrom-1.4.3-L3.0.6/myerror.cpp maelstrom-1.4.3-L3.0.6/myerror.cpp
--- maelstrom-1.4.3-L3.0.6/myerror.cpp
+++ maelstrom-1.4.3-L3.0.6/myerror.cpp
@@ -10,7 +10,7 @@
 #include <errno.h>
 
 
-void error(char *fmt, ...)
+void error(const char *fmt, ...)
 {
 	char mesg[BUFSIZ];
 	va_list ap;
@@ -21,7 +21,7 @@
 	va_end(ap);
 }
 
-void mesg(char *fmt, ...)
+void mesg(const char *fmt, ...)
 {
 	char mesg[BUFSIZ];
 	va_list ap;
@@ -32,7 +32,7 @@
 	va_end(ap);
 }
 
-void myperror(char *msg)
+void myperror(const char *msg)
 {
 	char buffer[BUFSIZ];
 
diff -wu maelstrom-1.4.3-L3.0.6/main.cpp maelstrom-1.4.3-L3.0.6/main.cpp
--- maelstrom-1.4.3-L3.0.6/main.cpp
+++ maelstrom-1.4.3-L3.0.6/main.cpp
@@ -20,7 +20,7 @@
 extern int DoInitializations(Uint32 video_flags);		/* init.cc */
 
 static char *Version =
-"Maelstrom v1.4.3 (GPL version 3.0.6) -- 10/19/2002 by Sam Lantinga\n";
+(char*)"Maelstrom v1.4.3 (GPL version 3.0.6) -- 10/19/2002 by Sam Lantinga\n";
 
 // Global variables set in this file...
 int	gStartLives;
@@ -192,6 +192,7 @@
 	}
 
 	/* Parse command line arguments */
+	video_flags &= ~SDL_FULLSCREEN;
 	for ( progname=argv[0]; --argc; ++argv ) {
 		if ( strcmp(argv[1], "-fullscreen") == 0 ) {
 			video_flags |= SDL_FULLSCREEN;
@@ -370,7 +371,7 @@
 						
 				/* -- Create a screen dump of high scores */
 				case SDLK_F3:
-					screen->ScreenDump("ScoreDump",
+					screen->ScreenDump((char*)"ScoreDump",
 							64, 48, 298, 384);
 					break;
 
@@ -515,14 +516,14 @@
 		error("Can't use New York (18) font! -- Exiting.\n");
 		exit(255);
 	}
-	DrawText(xOff+5, botDiv+22, "Name", bigfont, STYLE_ULINE,
+	DrawText(xOff+5, botDiv+22, (char*)"Name", bigfont, STYLE_ULINE,
 						0xFF, 0xFF, 0x00);
 	sRt = xOff+185;
-	DrawText(sRt, botDiv+22, "Score", bigfont, STYLE_ULINE,
+	DrawText(sRt, botDiv+22, (char*)"Score", bigfont, STYLE_ULINE,
 						0xFF, 0xFF, 0x00);
 	sRt += fontserv->TextWidth("Score", bigfont, STYLE_ULINE);
 	wRt = xOff+245;
-	DrawText(wRt, botDiv+22, "Wave", bigfont, STYLE_ULINE,
+	DrawText(wRt, botDiv+22, (char*)"Wave", bigfont, STYLE_ULINE,
 						0xFF, 0xFF, 0x00);
 	wRt += fontserv->TextWidth("Wave", bigfont, STYLE_ULINE)-10;
 
@@ -558,7 +559,7 @@
 	}
 	delete font;
 
-	DrawText(xOff+5, botDiv+46+(10*18)+3, "Last Score: ", 
+	DrawText(xOff+5, botDiv+46+(10*18)+3, (char*)"Last Score: ", 
 					bigfont, STYLE_NORM, 0xFF, 0xFF, 0xFF);
 	snprintf(buffer, sizeof(buffer), "%d", GetScore());
 	sw = fontserv->TextWidth("Last Score: ", bigfont, STYLE_NORM);
@@ -571,50 +572,50 @@
 
 	pt.h = rightDiv + 10;
 	pt.v = yOff + 10;
-	DrawKey(&pt, "P", " Start playing Maelstrom", RunPlayGame);
+	DrawKey(&pt, (char*)"P", (char*)" Start playing Maelstrom", RunPlayGame);
 
 	pt.h = rightDiv + 10;
 	pt.v += offset;
-	DrawKey(&pt, "C", " Configure the game controls", RunConfigureControls);
+	DrawKey(&pt, (char*)"C", (char*)" Configure the game controls", RunConfigureControls);
 
 	pt.h = rightDiv + 10;
 	pt.v += offset;
-	DrawKey(&pt, "Z", " Zap the high scores", RunZapScores);
+	DrawKey(&pt, (char*)"Z", (char*)" Zap the high scores", RunZapScores);
 
 	pt.h = rightDiv + 10;
 	pt.v += offset;
-	DrawKey(&pt, "A", " About Maelstrom...", RunDoAbout);
+	DrawKey(&pt, (char*)"A", (char*)" About Maelstrom...", RunDoAbout);
 
 	pt.v += offset;
 
 	pt.h = rightDiv + 10;
 	pt.v += offset;
-	DrawKey(&pt, "Q", " Quit Maelstrom", RunQuitGame);
+	DrawKey(&pt, (char*)"Q", (char*)" Quit Maelstrom", RunQuitGame);
 
 	pt.h = rightDiv + 10;
 	pt.v += offset;
-	DrawKey(&pt, "0", " ", DecrementSound);
+	DrawKey(&pt, (char*)"0", (char*)" ", DecrementSound);
 
 	if ( (font = fontserv->NewFont("Geneva", 9)) == NULL ) {
 		error("Can't use Geneva font! -- Exiting.\n");
 		exit(255);
 	}
-	DrawText(pt.h+gKeyIcon->w+3, pt.v+19, "-",
+	DrawText(pt.h+gKeyIcon->w+3, pt.v+19, (char*)"-",
 				font, STYLE_NORM, 0xFF, 0xFF, 0x00);
 
 	pt.h = rightDiv + 50;
-	DrawKey(&pt, "8", " Set Sound Volume", IncrementSound);
+	DrawKey(&pt, (char*)"8", (char*)" Set Sound Volume", IncrementSound);
 
 /* -- Draw the credits */
 
-	DrawText(xOff+5+68, yOff+5+127, "Port to Linux by Sam Lantinga",
+	DrawText(xOff+5+68, yOff+5+127, (char*)"Port to Linux by Sam Lantinga",
 				font, STYLE_BOLD, 0xFF, 0xFF, 0x00);
-	DrawText(rightDiv+10, yOff+259, "©1992-4 Ambrosia Software, Inc.",
+	DrawText(rightDiv+10, yOff+259, (char*)"©1992-4 Ambrosia Software, Inc.",
 				font, STYLE_BOLD, 0xFF, 0xFF, 0xFF);
 
 /* -- Draw the version number */
 
-	DrawText(xOff+20, yOff+151, VERSION_STRING,
+	DrawText(xOff+20, yOff+151, (char*)VERSION_STRING,
 				font, STYLE_NORM, 0xFF, 0xFF, 0xFF);
 	delete font;
 
diff -wu maelstrom-1.4.3-L3.0.6/config.guess maelstrom-1.4.3-L3.0.6/config.guess
--- maelstrom-1.4.3-L3.0.6/config.guess
+++ maelstrom-1.4.3-L3.0.6/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-07-02'
+timestamp='2008-01-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -161,6 +161,7 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -329,7 +330,7 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -531,7 +532,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -780,7 +781,7 @@
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +791,18 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[3456]*)
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
-    EM64T:Interix*:[3456]*)
+	    EM64T | authenticamd)
 	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -829,7 +836,14 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -950,6 +964,9 @@
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1225,15 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1458,9 +1484,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff -wu maelstrom-1.4.3-L3.0.6/config.sub maelstrom-1.4.3-L3.0.6/config.sub
--- maelstrom-1.4.3-L3.0.6/config.sub
+++ maelstrom-1.4.3-L3.0.6/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-07-02'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -276,6 +276,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| score \
 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -323,7 +324,7 @@
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@@ -368,9 +369,13 @@
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -442,6 +447,14 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -474,8 +487,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -667,6 +680,14 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -682,6 +703,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -808,6 +833,14 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -909,6 +942,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -920,6 +957,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1009,6 +1049,10 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1214,7 +1258,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1366,6 +1410,9 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
         spu-*)
 		os=-elf
 		;;
@@ -1406,6 +1453,9 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
diff -wu maelstrom-1.4.3-L3.0.6/maclib/Mac_Resource.cpp maelstrom-1.4.3-L3.0.6/maclib/Mac_Resource.cpp
--- maelstrom-1.4.3-L3.0.6/maclib/Mac_Resource.cpp
+++ maelstrom-1.4.3-L3.0.6/maclib/Mac_Resource.cpp
@@ -194,7 +194,7 @@
 		dirname = filename;
 		*(basename++) = '\0';
 	} else {
-		dirname = "";
+		dirname = (char*)"";
 		basename = filename;
 	}
 
@@ -268,7 +268,7 @@
 	/* Try to open the Macintosh resource fork */
 	errstr = NULL;
 	if ( (filep=Open_MacRes(&filename, &base)) == NULL ) {
-		error("Couldn't open resource file '%s'", filename);
+		error((char*)"Couldn't open resource file '%s'", filename);
 		return;
 	} else {
 		/* Open_MacRes() passes back the real name of resource file */
@@ -277,7 +277,7 @@
 	fseek(filep, base, SEEK_SET);
 
 	if ( ! fread(&Header, sizeof(Header), 1, filep) ) {
-		error("Couldn't read resource info from '%s'", filename);
+		error((char*)"Couldn't read resource info from '%s'", filename);
 		return;
 	}
 	bytesex32(Header.res_length);
@@ -288,7 +288,7 @@
 
 	fseek(filep, base+Header.map_offset, SEEK_SET);
 	if ( ! fread(&Map, sizeof(Map), 1, filep) ) {
-		error("Couldn't read resource info from '%s'", filename);
+		error((char*)"Couldn't read resource info from '%s'", filename);
 		return;
 	}
 	bytesex16(Map.types_offset);
@@ -306,7 +306,7 @@
 	fseek(filep, base+Header.map_offset+Map.types_offset+2, SEEK_SET);
 	for ( i=0; i<num_types; ++i ) {
 		if ( ! fread(&type_ent, sizeof(type_ent), 1, filep) ) {
-			error("Couldn't read resource info from '%s'",
+			error((char*)"Couldn't read resource info from '%s'",
 								filename);
 			delete[] ref_offsets;
 			return;
@@ -332,7 +332,7 @@
 								SEEK_SET);
 		for ( n=0; n<Resources[i].count; ++n ) {
 			if ( ! fread(&ref_ent, sizeof(ref_ent), 1, filep) ) {
-				error("Couldn't read resource info from '%s'",
+				error((char*)"Couldn't read resource info from '%s'",
 								filename);
 				delete[] ref_offsets;
 				return;
@@ -434,7 +434,7 @@
 			return(ids);
 		}
 	}
-	error("Couldn't find resources of type '%s'", res_type);
+	error((char*)"Couldn't find resources of type '%s'", res_type);
 	return(NULL);
 }
 
@@ -451,7 +451,7 @@
 			}
 		}
 	}
-	error("Couldn't find resource of type '%s', id %hu", res_type, id);
+	error((char*)"Couldn't find resource of type '%s', id %hu", res_type, id);
 	return(NULL);
 }
 
@@ -478,7 +478,7 @@
 					d->data = new Uint8[d->length];
 					if (!fread(d->data,d->length,1,filep)) {
 						delete[] d->data;
-						error("Couldn't read %d bytes", d->length);
+						error((char*)"Couldn't read %d bytes", d->length);
 						delete d;
 						return(NULL);
 					}
@@ -488,7 +488,7 @@
 			}
 		}
 	}
-	error("Couldn't find resource of type '%s', id %hu", res_type, id);
+	error((char*)"Couldn't find resource of type '%s', id %hu", res_type, id);
 	return(NULL);
 }
 
@@ -515,7 +515,7 @@
 					d->data = new Uint8[d->length];
 					if (!fread(d->data,d->length,1,filep)) {
 						delete[] d->data;
-						error("Couldn't read %d bytes", d->length);
+						error((char*)"Couldn't read %d bytes", d->length);
 						delete d;
 						return(NULL);
 					}
@@ -525,7 +525,7 @@
 			}
 		}
 	}
-	error("Couldn't find resource of type '%s', name %s", res_type, name);
+	error((char*)"Couldn't find resource of type '%s', name %s", res_type, name);
 	return(NULL);
 }
 
diff -wu maelstrom-1.4.3-L3.0.6/load.h maelstrom-1.4.3-L3.0.6/load.h
--- maelstrom-1.4.3-L3.0.6/load.h
+++ maelstrom-1.4.3-L3.0.6/load.h
@@ -88,9 +88,9 @@
 	}
 
 	const char *Path(const char *filename) {
-		char *directory;
+	  const char *directory;
 
-		directory = getenv("MAELSTROM_LIB");
+		directory = getenv((const char*)"MAELSTROM_LIB");
 		if ( directory == NULL ) {
 			directory = LIBDIR;
 #ifndef macintosh
diff -wu maelstrom-1.4.3-L3.0.6/netlogic/netplay.cpp maelstrom-1.4.3-L3.0.6/netlogic/netplay.cpp
--- maelstrom-1.4.3-L3.0.6/netlogic/netplay.cpp
+++ maelstrom-1.4.3-L3.0.6/netlogic/netplay.cpp
@@ -210,7 +210,7 @@
 		}
 		/* Add ourselves if needed */
 		if ( gNumPlayers == 0 ) {
-			AddPlayer("1");
+			AddPlayer((char*)"1");
 			gNumPlayers = 1;
 			FoundUs = 1;
 		}
@@ -506,16 +506,16 @@
 	char *message = NULL;
 
 	/* Our address server connection is through TCP */
-	Message("Connecting to Address Server");
+	Message((char*)"Connecting to Address Server");
 	sock = SDLNet_TCP_Open(&ServAddr);
 	if ( sock == NULL ) {
-		ErrorMessage("Connection failed");
+		ErrorMessage((char*)"Connection failed");
 		return(-1);
 	}
 	socketset = SDLNet_AllocSocketSet(1);
 	if ( socketset == NULL ) {
 		status = -1;
-		message = "Couldn't create socket set";
+		message = (char*)"Couldn't create socket set";
 		goto done;
 	}
 	SDLNet_TCP_AddSocket(socketset, sock);
@@ -528,11 +528,11 @@
 	len += 1;
 	if ( SDLNet_TCP_Send(sock, sendbuf, len) != len ) {
 		status = -1;
-		message = "Socket write error";
+		message = (char*)"Socket write error";
 		goto done;
 	}
 
-	Message("Waiting for other players");
+	Message((char*)"Waiting for other players");
 	status = 0;
 	len = 0;
 	lenread = 0;
@@ -558,7 +558,7 @@
 		if ( len <= 0 ) {
 			waiting = 0;
 			status = -1;
-			message = "Error reading player addresses";
+			message = (char*)"Error reading player addresses";
 			continue;
 		}
 		lenread += len;
@@ -570,7 +570,7 @@
 		if ( netbuf[0] <= 1 ) {
 			waiting = 0;
 			status = -1;
-			message = "Error: Short server packet!";
+			message = (char*)"Error: Short server packet!";
 			continue;
 		}
 		switch ( netbuf[1] ) {
@@ -699,7 +699,7 @@
 
 		/* We are guaranteed that there is data here */
 		if ( SDLNet_UDP_Recv(gNetFD, &sent) <= 0 ) {
-			ErrorMessage("Network error receiving packets");
+			ErrorMessage((char*)"Network error receiving packets");
 			return(-1);
 		}
 
@@ -755,7 +755,7 @@
 		return(AlertServer(Wave, Lives, Turbo));
 
 	/* Get ready to wait for server */
-	Message("Awaiting Player 1 (server)");
+	Message((char*)"Awaiting Player 1 (server)");
 	sent.data = netbuf;
 	sent.maxlen = sizeof(netbuf);
 
@@ -776,7 +776,7 @@
 
 		/* We are guaranteed that there is data here */
 		if ( SDLNet_UDP_Recv(gNetFD, &sent) <= 0 ) {
-			ErrorMessage("Network error receiving packets");
+			ErrorMessage((char*)"Network error receiving packets");
 			return(-1);
 		}
 
diff -wu maelstrom-1.4.3-L3.0.6/netlogic/game.cpp maelstrom-1.4.3-L3.0.6/netlogic/game.cpp
--- maelstrom-1.4.3-L3.0.6/netlogic/game.cpp
+++ maelstrom-1.4.3-L3.0.6/netlogic/game.cpp
@@ -200,24 +200,24 @@
 		screen->DrawLine(0, gStatusLine, SCREEN_WIDTH-1, 
 							gStatusLine, ourWhite);
 		x = 3;
-		i = DrawText(x, gStatusLine+11, "Score:", geneva, STYLE_BOLD,
+		i = DrawText(x, gStatusLine+11, (char*)"Score:", geneva, STYLE_BOLD,
 						30000>>8, 30000>>8, 0xFF);
 		x += (i+70);
-		i = DrawText(x, gStatusLine+11, "Shield:", geneva, STYLE_BOLD,
+		i = DrawText(x, gStatusLine+11, (char*)"Shield:", geneva, STYLE_BOLD,
 						30000>>8, 30000>>8, 0xFF);
 		x += (i+70);
-		i = DrawText(x, gStatusLine+11, "Wave:", geneva, STYLE_BOLD,
+		i = DrawText(x, gStatusLine+11, (char*)"Wave:", geneva, STYLE_BOLD,
 						30000>>8, 30000>>8, 0xFF);
 		x += (i+30);
-		i = DrawText(x, gStatusLine+11, "Lives:", geneva, STYLE_BOLD,
+		i = DrawText(x, gStatusLine+11, (char*)"Lives:", geneva, STYLE_BOLD,
 						30000>>8, 30000>>8, 0xFF);
 		x += (i+30);
-		DrawText(x, gStatusLine+11, "Bonus:", geneva, STYLE_BOLD,
+		DrawText(x, gStatusLine+11, (char*)"Bonus:", geneva, STYLE_BOLD,
 						30000>>8, 30000>>8, 0xFF);
 		/* Heh, DOOM style frag count */
 		if ( gNumPlayers > 1 ) {
 			x = 530;
-			i = DrawText(x, gStatusLine+11, "Frags:", geneva,
+			i = DrawText(x, gStatusLine+11, (char*)"Frags:", geneva,
 					STYLE_BOLD, 30000>>8, 30000>>8, 0xFF);
 			fragoff = x+i+4;
 		}
@@ -795,7 +795,7 @@
 		newyork_height = fontserv->TextHeight(newyork);
 		x = (SCREEN_WIDTH-(fontserv->TextWidth("Enter your name: ",
 						newyork, STYLE_NORM)*2))/2;
-		x += DrawText(x, 300, "Enter your name: ",
+		x += DrawText(x, 300, (char*)"Enter your name: ",
 				newyork, STYLE_NORM, 30000>>8, 30000>>8, 0xFF);
 		screen->Update();
 
@@ -907,14 +907,14 @@
 	/* -- Draw the bonus */
 	sw = fontserv->TextWidth("Bonus Score:     ", geneva, STYLE_BOLD);
 	x = ((SCREEN_WIDTH - sw) / 2) - 20;
-	DrawText(x, 200, "Bonus Score:     ", geneva, STYLE_BOLD,
+	DrawText(x, 200, (char*)"Bonus Score:     ", geneva, STYLE_BOLD,
 						30000>>8, 30000>>8, 0xFF);
 	xt = x+sw;
 
 	/* -- Draw the score */
 	sw = fontserv->TextWidth("Score:     ", geneva, STYLE_BOLD);
 	x = ((SCREEN_WIDTH - sw) / 2) - 3;
-	DrawText(x, 220, "Score:     ", geneva, STYLE_BOLD,
+	DrawText(x, 220, (char*)"Score:     ", geneva, STYLE_BOLD,
 						30000>>8, 30000>>8, 0xFF);
 	xs = x+sw;
 	screen->Update();
diff -wu maelstrom-1.4.3-L3.0.6/Maelstrom-netd.c maelstrom-1.4.3-L3.0.6/Maelstrom-netd.c
--- maelstrom-1.4.3-L3.0.6/Maelstrom-netd.c
+++ maelstrom-1.4.3-L3.0.6/Maelstrom-netd.c
@@ -2,6 +2,7 @@
 /* Here we go... */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <errno.h>
diff -wu maelstrom-1.4.3-L3.0.6/netscore.cpp maelstrom-1.4.3-L3.0.6/netscore.cpp
--- maelstrom-1.4.3-L3.0.6/netscore.cpp
+++ maelstrom-1.4.3-L3.0.6/netscore.cpp
@@ -24,7 +24,7 @@
 	unsigned int  keynums[KEY_LEN];
 	char netbuf[1024], *crc;
 
-	remote = Goto_ScoreServer(SCORE_HOST, SCORE_PORT);
+	remote = Goto_ScoreServer((char*)SCORE_HOST, SCORE_PORT);
 	if ( remote == NULL ) {
 		error(
 		"Warning: Couldn't connect to Maelstrom Score Server.\r\n");
@@ -121,7 +121,7 @@
 	int  i;
 	char netbuf[1024], *ptr;
 
-	remote = Goto_ScoreServer(SCORE_HOST, SCORE_PORT);
+	remote = Goto_ScoreServer((char*)SCORE_HOST, SCORE_PORT);
 	if ( remote == NULL ) {
 		error(
 		"Warning: Couldn't connect to Maelstrom Score Server.\r\n");
diff -wu maelstrom-1.4.3-L3.0.6/screenlib/SDL_FrameBuf.cpp maelstrom-1.4.3-L3.0.6/screenlib/SDL_FrameBuf.cpp
--- maelstrom-1.4.3-L3.0.6/screenlib/SDL_FrameBuf.cpp
+++ maelstrom-1.4.3-L3.0.6/screenlib/SDL_FrameBuf.cpp
@@ -103,12 +103,12 @@
 	//video_flags |= SDL_ANYFORMAT;
 	screenfg = SDL_SetVideoMode(width, height, 8, video_flags);
 	if ( screenfg == NULL ) {
-		SetError("Couldn't set %dx%d video mode: %s", 
+		SetError((char*)"Couldn't set %dx%d video mode: %s", 
 					width, height, SDL_GetError());
 		return(-1);
 	}
 	FocusFG();
-	PrintSurface("Created foreground", screenfg);
+	PrintSurface((char*)"Created foreground", screenfg);
 
 	/* Create the background */
 	screenbg = SDL_CreateRGBSurface(screen->flags, screen->w, screen->h,
@@ -117,10 +117,10 @@
 					screen->format->Gmask,
 					screen->format->Bmask, 0);
 	if ( screenbg == NULL ) {
-		SetError("Couldn't create background: %s", SDL_GetError());
+		SetError((char*)"Couldn't create background: %s", SDL_GetError());
 		return(-1);
 	}
-	PrintSurface("Created background", screenbg);
+	PrintSurface((char*)"Created background", screenbg);
 
 	/* Create a dirty rectangle map of the screen */
 	dirtypitch = LOWER_PREC(width);
@@ -639,7 +639,7 @@
 		}
 		retval = SDL_SaveBMP(dump, file);
 		if ( retval < 0 ) {
-			SetError("%s", SDL_GetError());
+			SetError((char*)"%s", SDL_GetError());
 		}
 		FreeImage(dump);
 	} else {
@@ -662,7 +662,7 @@
 					screenfg->format->Gmask,
 					screenfg->format->Bmask, 0);
 	if ( artwork == NULL ) {
-		SetError("Couldn't create artwork: %s", SDL_GetError());
+		SetError((char*)"Couldn't create artwork: %s", SDL_GetError());
 		return(NULL);
 	}
 
@@ -845,12 +845,11 @@
 			newlist = new SDL_Rect[updatemax+UPDATE_CHUNK];
 			memcpy(newlist,updatelist,updatelen*sizeof(SDL_Rect));
 			/* Update the dirty rectangle map with the new list */
-			for ( i=0; i<dirtymaplen; ++i ) {
-				if ( dirtymap[i] != NULL ) {
-					dirtymap[i] = (SDL_Rect *)(
-					((long)dirtymap[i]-(long)updatelist) +
-								(long)newlist
-					);
+			for ( i=0; i<dirtymaplen; ++i ) 
+			  {
+			    if ( dirtymap[i] != NULL ) 
+			      {
+				dirtymap[i] = (SDL_Rect *)(((long)dirtymap[i] - (long)updatelist) + (long)newlist);
 				}
 			}
 			delete[] updatelist;
diff -wu maelstrom-1.4.3-L3.0.6/init.cpp maelstrom-1.4.3-L3.0.6/init.cpp
--- maelstrom-1.4.3-L3.0.6/init.cpp
+++ maelstrom-1.4.3-L3.0.6/init.cpp
@@ -784,7 +784,7 @@
 		error("Fatal: %s\n", screen->Error());
 		return(-1);
 	}
-	screen->SetCaption("Maelstrom");
+	screen->SetCaption((char*)"Maelstrom");
 	atexit(CleanUp);		// Need to reset this under X11 DGA
 	SDL_FreeSurface(icon);
 
diff -wu maelstrom-1.4.3-L3.0.6/controls.cpp maelstrom-1.4.3-L3.0.6/controls.cpp
--- maelstrom-1.4.3-L3.0.6/controls.cpp
+++ maelstrom-1.4.3-L3.0.6/controls.cpp
@@ -40,16 +40,16 @@
 
 	/* Add "arrow" to the arrow keys */
 	if ( strcmp(name, "up") == 0 ) {
-		name = "up arrow";
+		name = (char *)"up arrow";
 	} else
 	if ( strcmp(name, "down") == 0 ) {
-		name = "down arrow";
+		name = (char *)"down arrow";
 	} else
 	if ( strcmp(name, "right") == 0 ) {
-		name = "right arrow";
+		name = (char *)"right arrow";
 	} else
 	if ( strcmp(name, "left") == 0 ) {
-		name = "left arrow";
+		name = (char *)"left arrow";
 	}
 	/* Make the key names uppercased */
 	for ( starting = 1; *name; ++name ) {
@@ -75,9 +75,9 @@
 
 	if ( (home=getenv("HOME")) == NULL ) {
 		if ( strcmp(CUR_DIR, DIR_SEP) != 0 ) {
-			home = CUR_DIR;
+			home = (char *)CUR_DIR;
 		} else {
-			home="";
+			home = (char *)"";
 		}
 	}
 	if ( fname ) {
@@ -95,7 +95,7 @@
 	FILE *data;
 
 	/* Open our control data file */
-	data = OpenData("r", &datafile);
+	data = OpenData((char *)"r", &datafile);
 	if ( data == NULL ) {
 		return;
 	}
@@ -119,14 +119,14 @@
 	FILE *data;
 
 	/* Don't clobber existing joystick data */
-	if ( (data=OpenData("r", NULL)) != NULL ) {
-		newmode = "r+";
+	if ( (data=OpenData((char *)"r", NULL)) != NULL ) {
+		newmode = (char *)"r+";
 		fclose(data);
 	} else
-		newmode = "w";
+		newmode = (char*)"w";
 
 	if ( (data=OpenData(newmode, &datafile)) == NULL ) {
-		error("Warning: Couldn't save controls to %s\n", datafile);
+		error((char*)"Warning: Couldn't save controls to %s\n", datafile);
 		return;
 	}
 
@@ -157,14 +157,14 @@
 	int  yoffset;
 	SDLKey *control;
 } checkboxes[] = {
-	{ "Fire",	0*BOX_HEIGHT+0*SP, &newcontrols.gFireControl },
-	{ "Thrust",	1*BOX_HEIGHT+1*SP, &newcontrols.gThrustControl },
-	{ "Shield",	2*BOX_HEIGHT+2*SP, &newcontrols.gShieldControl },
-	{ "Turn Clockwise", 3*BOX_HEIGHT+3*SP, &newcontrols.gTurnRControl },
-	{ "Turn Counter-Clockwise",
+	{ (char*)"Fire",	0*BOX_HEIGHT+0*SP, &newcontrols.gFireControl },
+	{ (char*)"Thrust",	1*BOX_HEIGHT+1*SP, &newcontrols.gThrustControl },
+	{ (char*)"Shield",	2*BOX_HEIGHT+2*SP, &newcontrols.gShieldControl },
+	{ (char*)"Turn Clockwise", 3*BOX_HEIGHT+3*SP, &newcontrols.gTurnRControl },
+	{ (char*)"Turn Counter-Clockwise",
 			4*BOX_HEIGHT+4*SP, &newcontrols.gTurnLControl },
-	{ "Pause",	5*BOX_HEIGHT+5*SP, &newcontrols.gPauseControl },
-	{ "Abort Game",	6*BOX_HEIGHT+6*SP, &newcontrols.gQuitControl },
+	{ (char*)"Pause",	5*BOX_HEIGHT+5*SP, &newcontrols.gPauseControl },
+	{ (char*)"Abort Game",	6*BOX_HEIGHT+6*SP, &newcontrols.gQuitControl },
 };
 
 static int X=0;
@@ -281,11 +281,11 @@
 #endif
 	valid = 0;
 	cancel = new Mac_Button(291, 265, BUTTON_WIDTH, BUTTON_HEIGHT,
-				"Cancel", chicago, fontserv, Cancel_callback);
+				(char*)"Cancel", chicago, fontserv, Cancel_callback);
 	dialog->Add_Dialog(cancel);
 	okay = new Mac_Button(291+BUTTON_WIDTH+26, 265, 
 					BUTTON_WIDTH, BUTTON_HEIGHT,
-				"OK", chicago, fontserv, OK_callback);
+				(char*)"OK", chicago, fontserv, OK_callback);
 	dialog->Add_Dialog(okay);
 	memcpy(&newcontrols, &controls, sizeof(controls));
 	radiobuttons = new Mac_RadioList(&currentbox, X+266, Y+75,
@@ -422,7 +422,7 @@
 					/* Special key --
 						Do a screen dump here.
 					 */
-					screen->ScreenDump("ScreenShot",
+					screen->ScreenDump((char*)"ScreenShot",
 								0, 0, 0, 0);
 #ifdef MOVIE_SUPPORT
 				} else if ( key == XK_F5 ) {
@@ -496,12 +496,12 @@
 void ShowDawn(void)
 {
 	static char *D_text[6] = {
-		"No eternal reward will forgive us",
-		"now",
-		    "for",
-		        "wasting",
-		                "the",
-		                    "dawn."
+		(char*)"No eternal reward will forgive us",
+		(char*)"now",
+		    (char*)"for",
+		        (char*)"wasting",
+		                (char*)"the",
+		                    (char*)"dawn."
 	};
 	MFont *chicago;
 	SDL_Surface *splash, *text[6];
@@ -541,7 +541,7 @@
 		x += (text[i]->w+2);
 	}
 	OK = new Mac_DefaultButton(210, 160, 90, BUTTON_HEIGHT,
-						"OK", chicago, fontserv, NULL);
+						(char*)"OK", chicago, fontserv, NULL);
 	dialog->Add_Dialog(OK);
 
 	/* Run the dialog box */
diff -wu maelstrom-1.4.3-L3.0.6/scores.cpp maelstrom-1.4.3-L3.0.6/scores.cpp
--- maelstrom-1.4.3-L3.0.6/scores.cpp
+++ maelstrom-1.4.3-L3.0.6/scores.cpp
@@ -38,7 +38,7 @@
 		if ( NetLoadScores() == 0 )
 			return;
 		else {
-			mesg("Using local score file\n\n");
+			mesg((char *)"Using local score file\n\n");
 			gNetScores = 0;
 		}
 	}
@@ -146,11 +146,11 @@
 	dialog->Add_Image(splash, 4, 4);
 	do_clear = 0;
 	clear = new Mac_Button(99, 74, BUTTON_WIDTH, BUTTON_HEIGHT,
-				"Clear", chicago, fontserv, Clear_callback);
+				(char*)"Clear", chicago, fontserv, Clear_callback);
 	dialog->Add_Dialog(clear);
 	cancel = new Mac_DefaultButton(99+BUTTON_WIDTH+14, 74, 
 				BUTTON_WIDTH, BUTTON_HEIGHT,
-				"Cancel", chicago, fontserv, Cancel_callback);
+				(char*)"Cancel", chicago, fontserv, Cancel_callback);
 	dialog->Add_Dialog(cancel);
 
 	/* Run the dialog box */
@@ -185,17 +185,17 @@
 
 int GetStartLevel(void)
 {
-	static char    *Ltext1 = 
+	static const char    *Ltext1 = 
 			"Enter the level to start from (1-40).  This";
-	static char    *Ltext2 = 
+	static const char    *Ltext2 = 
 			"disqualifies you from a high score...";
-	static char    *Ltext3 = "Level:";
-	static char    *Ltext4 = "Lives:";
+	static const char    *Ltext3 = "Level:";
+	static const char    *Ltext4 = "Lives:";
 	MFont *chicago;
 	Maclike_Dialog *dialog;
 	SDL_Surface *splash;
 	SDL_Surface *text1, *text2, *text3, *text4;
-	static char *turbotext = "Turbofunk On";
+	static char *turbotext = (char*)"Turbofunk On";
 	int x, y, X, Y;
 	Mac_Button *doit;
 	Mac_Button *cancel;
@@ -204,8 +204,8 @@
 	int startlevel=10, startlives=5, turbofunk=0;
 
 	/* Set up all the components of the dialog box */
-	if ( (chicago = fontserv->NewFont("Chicago", 12)) == NULL ) {
-		error("Can't use Chicago font!\n");
+	if ( (chicago = fontserv->NewFont((const char*)"Chicago", 12)) == NULL ) {
+		error((const char*)"Can't use Chicago font!\n");
 		return(0);
 	}
 	if ( (splash = GetCIcon(screen, 103)) == NULL ) {
@@ -228,10 +228,10 @@
 	dialog->Add_Image(text2, x, y);
 	do_level = 0;
 	cancel = new Mac_Button(166, 96, 73, BUTTON_HEIGHT,
-				"Cancel", chicago, fontserv, Cancel2_callback);
+				(char *)"Cancel", chicago, fontserv, Cancel2_callback);
 	dialog->Add_Dialog(cancel);
 	doit = new Mac_DefaultButton(166+73+14, 96, BUTTON_WIDTH, BUTTON_HEIGHT,
-				"Do it!", chicago, fontserv, Level_callback);
+				(char *)"Do it!", chicago, fontserv, Level_callback);
 	dialog->Add_Dialog(doit);
 	numeric_entry = new Mac_NumericEntry(X, Y, chicago, fontserv);
 	numeric_entry->Add_Entry(78, 60, 3, 1, &startlevel);
diff -wu maelstrom-1.4.3-L3.0.6/debian/maelstrom.desktop maelstrom-1.4.3-L3.0.6/debian/maelstrom.desktop
--- maelstrom-1.4.3-L3.0.6/debian/maelstrom.desktop
+++ maelstrom-1.4.3-L3.0.6/debian/maelstrom.desktop
@@ -6,4 +6,4 @@
-Icon=maelstrom.xpm
+Icon=maelstrom
 Exec=/usr/games/maelstrom
 Terminal=false
-Categories=Application;Game;ArcadeGame
+Categories=Game;ArcadeGame;
diff -wu maelstrom-1.4.3-L3.0.6/debian/changelog maelstrom-1.4.3-L3.0.6/debian/changelog
--- maelstrom-1.4.3-L3.0.6/debian/changelog
+++ maelstrom-1.4.3-L3.0.6/debian/changelog
@@ -1,3 +1,19 @@
+maelstrom (1.4.3-L3.0.6-8ubuntu1) natty; urgency=low
+
+  * Merge from debian testing (LP: #669904). Remaining changes:
+    - Re-added desktop file, updated to validate with latest desktop-file-validate
+      and install icon in /usr/share/pixmaps
+    - debian/rules: bashism for cp'ing /usr/share/misc/config.{guess,sub}
+
+ -- Angel Abad <angelabad@ubuntu.com>  Wed, 03 Nov 2010 13:48:06 +0100
+
+maelstrom (1.4.3-L3.0.6-8) unstable; urgency=low
+
+  * fixed some compiler warnings with gcc-4.3.2
+  * fixed some lintian error/warnings
+
+ -- Christoph Baumann <cgb@debian.org>  Fri, 1 Jan 2010 23:10:42 +0100
+
 maelstrom (1.4.3-L3.0.6-7ubuntu1) gutsy; urgency=low
 
   * Merge from Debian unstable. Remaining Ubuntu changes:
@@ -271 +286,0 @@
-
diff -wu maelstrom-1.4.3-L3.0.6/debian/configure.debian.install maelstrom-1.4.3-L3.0.6/debian/configure.debian.install
--- maelstrom-1.4.3-L3.0.6/debian/configure.debian.install
+++ maelstrom-1.4.3-L3.0.6/debian/configure.debian.install
@@ -240,7 +240,7 @@
 #
 # Initializations.
 #
-ac_default_prefix=$thisdir/debian/tmp/usr
+ac_default_prefix=$thisdir/debian/maelstrom/usr
 cross_compiling=no
 subdirs=
 MFLAGS=
diff -wu maelstrom-1.4.3-L3.0.6/debian/control maelstrom-1.4.3-L3.0.6/debian/control
--- maelstrom-1.4.3-L3.0.6/debian/control
+++ maelstrom-1.4.3-L3.0.6/debian/control
@@ -1,10 +1,10 @@
 Source: maelstrom
 Section: non-free/games
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Christoph Baumann <cgb@debian.org> 
-Standards-Version: 3.6.2
-Build-Depends: libsdl1.2-dev (>= 1.0.0), libsdl-net1.2-dev, libc6-dev, debhelper, autotools-dev
+Standards-Version: 3.8.3
+Build-Depends: libsdl1.2-dev, libsdl-net1.2-dev, debhelper (>= 7), autotools-dev, build-essential
 
 Package: maelstrom
 Architecture: any
diff -wu maelstrom-1.4.3-L3.0.6/debian/copyright maelstrom-1.4.3-L3.0.6/debian/copyright
--- maelstrom-1.4.3-L3.0.6/debian/copyright
+++ maelstrom-1.4.3-L3.0.6/debian/copyright
@@ -12,9 +12,10 @@
 
 The following copyright applies to this software:
 
-
+(c) by Sam Lantinga  (slouken@devolution.com)
 The source code to Maelstrom 3.0 and higher has been released under
-the GNU General Public License which can be found in COPYING.GPL.
+the GNU General Public License which can be found in 
+/usr/share/common-licenses/GPL-2
 
 The artwork and sounds used by Maelstrom are copyright Ambrosia Software
 (http://www.ambrosiasw.com) and may not be redistributed separately from
diff -wu maelstrom-1.4.3-L3.0.6/debian/maelstrom.6 maelstrom-1.4.3-L3.0.6/debian/maelstrom.6
--- maelstrom-1.4.3-L3.0.6/debian/maelstrom.6
+++ maelstrom-1.4.3-L3.0.6/debian/maelstrom.6
@@ -30,6 +30,7 @@
 -fullscreen
 Puts a big black border around the Maelstrom screen, and centers Maelstrom
 within it. This help create a "full screen" effect on large displays.
+During the game the screen mode can be toggled using Alt+Return.
 .TP
 -privatecmap
 Runs Maelstrom with a private (custom) colormap. This prevents Maelstrom from
diff -wu maelstrom-1.4.3-L3.0.6/debian/menu maelstrom-1.4.3-L3.0.6/debian/menu
--- maelstrom-1.4.3-L3.0.6/debian/menu
+++ maelstrom-1.4.3-L3.0.6/debian/menu
@@ -1,2 +1,11 @@
-?package(maelstrom): needs=X11 section=Games/Arcade title="Maelstrom" command="/usr/games/maelstrom"
-?package(maelstrom): needs=vc section=Games/Arcade title="Maelstrom" command="/usr/games/maelstrom"
+?package(maelstrom):\
+ needs="X11"\
+ section="Games/Action"\
+ title="Maelstrom"\
+ command="/usr/games/maelstrom"\
+ icon="/usr/lib/games/maelstrom/icon.xpm"
+?package(maelstrom):\
+ needs="vc"\
+ section="Games/Action"\
+ title="Maelstrom"\
+ command="/usr/games/maelstrom"
diff -wu maelstrom-1.4.3-L3.0.6/debian/rules maelstrom-1.4.3-L3.0.6/debian/rules
--- maelstrom-1.4.3-L3.0.6/debian/rules
+++ maelstrom-1.4.3-L3.0.6/debian/rules
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 
-DEBDIR=debian/tmp/DEBIAN
-BINDIR=debian/tmp/usr/games
-LIBDIR=debian/tmp/usr/lib/games/maelstrom
-SCOREDIR=debian/tmp/var/games
-DOCDIR=debian/tmp/usr/share/doc/maelstrom
-MANDIR=debian/tmp/usr/share/man
+TMPDIR=maelstrom
+DEBDIR=debian/${TMPDIR}/DEBIAN
+BINDIR=debian/${TMPDIR}/usr/games
+LIBDIR=debian/${TMPDIR}/usr/lib/games/maelstrom
+SCOREDIR=debian/${TMPDIR}/var/games
+DOCDIR=debian/${TMPDIR}/usr/share/doc/maelstrom
+MANDIR=debian/${TMPDIR}/usr/share/man
 REALMANDIR=/usr/share/man
-MENUDIR=debian/tmp/usr/lib/menu
+MENUDIR=debian/${TMPDIR}/usr/share/menu
 
 build:
 	$(checkdir)
@@ -22,9 +23,10 @@
 clean:
 	$(checkdir)
 	-rm -f build
-	-rm -rf debian/tmp
+	-rm -rf debian/${TMPDIR}
 	-rm -f debian/RELEASED debian/files
 	-rm -f debian/*~ 
+	-rm -f debian/compat
 #only call make if a makefile exists
 	if test -f Makefile ; then make distclean ; fi
 #these ones aren't deleted by distclean
@@ -40,9 +42,10 @@
 binary-indep:
 
 binary-arch: build
+	echo 7 > debian/compat
 	$(checkdir)
 	test root = "`whoami`"
-	-rm -rf debian/tmp
+	-rm -rf debian/${TMPDIR}
 	cp debian/configure.debian.install ./configure
 	./configure
 	make install
@@ -50,15 +53,15 @@
 	chown root.games ${BINDIR}/Maelstrom
 	chmod 2755 ${BINDIR}/Maelstrom
 	install -d ${LIBDIR}
-	install -d debian/tmp/usr/share/applications
-	install -d debian/tmp/usr/share/pixmaps
+	install -d debian/${TMPDIR}/usr/share/applications
+	install -d debian/${TMPDIR}/usr/share/pixmaps
 #move lib files
 	cp -rv ${BINDIR}/Images ${LIBDIR}
 	rm -rf ${BINDIR}/Images
 	cp ${BINDIR}/icon.* ${LIBDIR}
-	cp ${BINDIR}/icon.xpm debian/tmp/usr/share/pixmaps/maelstrom.xpm
+	cp ${BINDIR}/icon.xpm debian/${TMPDIR}/usr/share/pixmaps/maelstrom.xpm
 	rm -f ${BINDIR}/icon.*
-	cp debian/maelstrom.desktop debian/tmp/usr/share/applications
+	cp debian/maelstrom.desktop debian/${TMPDIR}/usr/share/applications
 	cp ${BINDIR}/Maelstrom_* ${LIBDIR}
 	rm -f  ${BINDIR}/Maelstrom_*
 	chmod +x debian/handle_underscores
@@ -107,7 +110,7 @@
 	dh_shlibdeps
 #	dpkg-gencontrol -isp
 	dh_gencontrol
-#	dpkg --build debian/tmp ..
+#	dpkg --build debian/${TMPDIR} ..
 	dh_builddeb
 
 define checkdir
diff -wu maelstrom-1.4.3-L3.0.6/debian/substvars maelstrom-1.4.3-L3.0.6/debian/substvars
--- maelstrom-1.4.3-L3.0.6/debian/substvars
+++ maelstrom-1.4.3-L3.0.6/debian/substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.3.6-6), libgcc1 (>= 1:4.1.1-12), libsdl-net1.2, libsdl1.2debian (>= 1.2.10-1), libstdc++6 (>= 4.1.1-12)
+shlibs:Depends=libc6 (>= 2.7-1), libgcc1 (>= 1:4.1.1), libsdl-net1.2, libsdl1.2debian (>= 1.2.10-1), libstdc++6 (>= 4.1.1)
only in patch2:
--- maelstrom-1.4.3-L3.0.6.orig/checksum.cpp
+++ maelstrom-1.4.3-L3.0.6/checksum.cpp
@@ -263,3 +263,3 @@
 	Unused(key); Unused(keylen);
-	static char *foo = "Checksum Not Enabled";
+	static char *foo = (char*)"Checksum Not Enabled";
 	return(foo);
only in patch2:
--- maelstrom-1.4.3-L3.0.6.orig/README.options
+++ maelstrom-1.4.3-L3.0.6/README.options
@@ -57,3 +57,4 @@
 			This help create a "full screen" effect on large
-			displays.
+			displays. During the game the fullscreen mode can
+			be toggled using Alt+Return.
 
only in patch2:
--- maelstrom-1.4.3-L3.0.6.orig/dialog.cpp
+++ maelstrom-1.4.3-L3.0.6/dialog.cpp
@@ -31,3 +31,3 @@
 	if ( button == NULL ) {
-		SetError("%s", SDL_GetError());
+		SetError((char*)"%s", SDL_GetError());
 		return;
only in patch2:
--- maelstrom-1.4.3-L3.0.6.orig/myerror.h
+++ maelstrom-1.4.3-L3.0.6/myerror.h
@@ -6,5 +6,5 @@
 
-extern void error(char *fmt, ...);
-extern void mesg(char *fmt, ...);
-extern void myperror(char *msg);
+extern void error(const char *fmt, ...);
+extern void mesg(const char *fmt, ...);
+extern void myperror(const char *msg);
 
only in patch2:
--- maelstrom-1.4.3-L3.0.6.orig/debian/maelstrom.substvars
+++ maelstrom-1.4.3-L3.0.6/debian/maelstrom.substvars
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.7-1), libgcc1 (>= 1:4.1.1), libsdl-net1.2, libsdl1.2debian (>= 1.2.10-1), libstdc++6 (>= 4.1.1)
only in patch2:
--- maelstrom-1.4.3-L3.0.6.orig/debian/debhelper.log
+++ maelstrom-1.4.3-L3.0.6/debian/debhelper.log
@@ -0,0 +1,10 @@
+dh_strip
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_builddeb
+dh_strip
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_builddeb
only in patch2:
--- maelstrom-1.4.3-L3.0.6.orig/debian/maelstrom.debhelper.log
+++ maelstrom-1.4.3-L3.0.6/debian/maelstrom.debhelper.log
@@ -0,0 +1,21 @@
+dh_strip
+dh_installdeb
+dh_shlibdeps
+dh_strip
+dh_installdeb
+dh_strip
+dh_installdeb
+dh_strip
+dh_installdeb
+dh_strip
+dh_installdeb
+dh_strip
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_builddeb
+dh_strip
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_builddeb
only in patch2:
--- maelstrom-1.4.3-L3.0.6.orig/maclib/Mac_FontServ.cpp
+++ maelstrom-1.4.3-L3.0.6/maclib/Mac_FontServ.cpp
@@ -79,3 +79,3 @@
 	if ( fontres->Error() ) {
-		SetError("Couldn't load resources from %s", fontfile);
+		SetError((char*)"Couldn't load resources from %s", fontfile);
 		return;
@@ -83,3 +83,3 @@
 	if ( fontres->NumResources("FOND") == 0 ) {
-		SetError("FontServ: No 'FOND' resources in %s", fontfile);
+		SetError((char*)"FontServ: No 'FOND' resources in %s", fontfile);
 		return;
@@ -115,3 +115,3 @@
 	if ( fond == NULL ) {
-		SetError("Warning: Font family '%s' not found", fontname);
+		SetError((char*)"Warning: Font family '%s' not found", fontname);
 		return(NULL);
@@ -145,5 +145,3 @@
 	if ( i == Fond.num_fonts ) {
-		SetError(
-		"Warning: Font family '%s' doesn't have %d pt fonts",
-							fontname, ptsize);
+		SetError((char*)"Warning: Font family '%s' doesn't have %d pt fonts", fontname, ptsize);
 		return(NULL);
@@ -156,4 +154,3 @@
 		delete font;
-		SetError(
-"Warning: Can't find NFNT resource for %d pt %s font", ptsize, fontname);
+		SetError((char*)"Warning: Can't find NFNT resource for %d pt %s font", ptsize, fontname);
 		return(NULL);
@@ -183,3 +180,3 @@
 			((font->header->fontType & ~3) != FIXEDFONT) ) {
-		SetError("Warning: Bad font Magic number: 0x%04x", 
+		SetError((char*)"Warning: Bad font Magic number: 0x%04x", 
 						(font->header)->fontType);
@@ -279,3 +276,4 @@
 
-	switch (style) {
+	switch (style) 
+	  {
 		case STYLE_NORM:	bold_offset = 0;
@@ -286,7 +284,5 @@
 					break;
-		case STYLE_ITALIC:	SetError(
-					"FontServ: Italics not implemented!");
+	  case STYLE_ITALIC:	SetError((char*)"FontServ: Italics not implemented!");
 					return(NULL);
-		default:		SetError(
-					"FontServ: Unknown text style!");
+	  default:		SetError((char*)"FontServ: Unknown text style!");
 					return(NULL);
@@ -328,3 +324,3 @@
 	if ( width == 0 ) {
-		SetError("No text to convert");
+		SetError((char*)"No text to convert");
 		return(NULL);
@@ -336,3 +332,3 @@
 	if ( image == NULL ) {
-		SetError("Unable to allocate bitmap: %s", SDL_GetError());
+		SetError((char*)"Unable to allocate bitmap: %s", SDL_GetError());
 		return(NULL);
@@ -408,3 +404,3 @@
 	if ( text->format->BitsPerPixel != 1 ) {
-		SetError("Not a text bitmap");
+		SetError((char*)"Not a text bitmap");
 		return(-1);
only in patch2:
--- maelstrom-1.4.3-L3.0.6.orig/maclib/Mac_Wave.cpp
+++ maelstrom-1.4.3-L3.0.6/maclib/Mac_Wave.cpp
@@ -116,3 +116,3 @@
 	if ( SDL_LoadWAV(wavefile, &spec, &samples, &sound_datalen) == NULL ) {
-		error("%s", SDL_GetError());
+		error((char*)"%s", SDL_GetError());
 		return(-1);
@@ -181,3 +181,3 @@
 		if ( n_types != 1 ) {
-			error("Multi-type sound not supported");
+			error((char*)"Multi-type sound not supported");
 			return(-1);
@@ -186,3 +186,3 @@
 		if ( f_type != SAMPLED_SND ) {
-			error("Not a sampled sound resource");
+			error((char*)"Not a sampled sound resource");
 			return(-1);
@@ -195,3 +195,3 @@
 	} else {
-		error("Unknown sound format: 0x%X", snd_version);
+		error((char*)"Unknown sound format: 0x%X", snd_version);
 		return(-1);
@@ -208,3 +208,3 @@
 		if ( num_cmds != 1 ) {
-			error("Multi-command sound not supported");
+			error((char*)"Multi-command sound not supported");
 			return(-1);
@@ -213,3 +213,3 @@
 		if ( (command != BUFFER_CMD) && (command != SOUND_CMD) ) {
-			error("Unknown sound command: 0x%X\n", command);
+			error((char*)"Unknown sound command: 0x%X\n", command);
 			return(-1);
@@ -222,3 +222,3 @@
 		if ( param2 > snd->length ) {
-			error("Offset too large -- corrupt sound?");
+			error((char*)"Offset too large -- corrupt sound?");
 			return(-1);
@@ -240,3 +240,3 @@
 		if ( sample_offset != 0 ) {
-			error("Sound samples don't immediately follow header");
+			error((char*)"Sound samples don't immediately follow header");
 			return(-1);
@@ -250,3 +250,3 @@
 		if ( encoding != stdSH ) {
-			error("Non-standard sound encoding: 0x%X", encoding);
+			error((char*)"Non-standard sound encoding: 0x%X", encoding);
 			return(-1);
@@ -258,3 +258,3 @@
 		if ( num_samples > snd->length-(data-snd->data) ) {
-			error("truncated sound resource");
+			error((char*)"truncated sound resource");
 			return(-1);
@@ -530,3 +530,3 @@
 	if ( dst == NULL ) {
-		error("Couldn't open %s for writing", wavefile);
+		error((char*)"Couldn't open %s for writing", wavefile);
 		return(-1);
@@ -565,3 +565,3 @@
 	     					(SDL_RWclose(dst) != 0) ) {
-		error("Couldn't write to %s", wavefile);
+		error((char*)"Couldn't write to %s", wavefile);
 		SDL_RWclose(dst);
only in patch2:
--- maelstrom-1.4.3-L3.0.6.orig/maclib/Mac_Sound.cpp
+++ maelstrom-1.4.3-L3.0.6/maclib/Mac_Sound.cpp
@@ -109,3 +109,3 @@
 	if ( soundres->Error() ) {
-		error("%s", soundres->Error());
+		error((char*)"%s", soundres->Error());
 		return;
@@ -113,3 +113,3 @@
 	if ( soundres->NumResources("snd ") == 0 ) {
-		error("No sound resources in '%s'", soundfile);
+		error((char*)"No sound resources in '%s'", soundfile);
 		return;
@@ -121,3 +121,3 @@
 		if ( snd == NULL ) {
-			error("%s", soundres->Error());
+			error((char*)"%s", soundres->Error());
 			delete soundres;
@@ -127,3 +127,3 @@
 		if ( wave->Error() ) {
-			error("%s", wave->Error());
+			error((char*)"%s", wave->Error());
 			delete wave;