--- searchandrescue-0.8.2.orig/Makefile
+++ searchandrescue-0.8.2/Makefile
@@ -1,5 +1,5 @@
 ALL_SRC_DIRS=sar
 all install clean:
 	@for subdir in $(ALL_SRC_DIRS); do			\
-	  make -s -C $$subdir -f Makefile $@; 			\
+	  [ ! -f $$subdir/Makefile ] || make -s -C $$subdir -f Makefile $@; 			\
 	done
--- searchandrescue-0.8.2.orig/sar/gctl.c
+++ searchandrescue-0.8.2/sar/gctl.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <stdio.h>
 #include <sys/types.h>
 #ifdef JS_SUPPORT
 # include <jsw.h>
--- searchandrescue-0.8.2.orig/sar/menumap.c
+++ searchandrescue-0.8.2/sar/menumap.c
@@ -279,7 +279,7 @@
 	}   
 	    
 	/* Allocate structure */
-	m->object[n] = (void *)map = SAR_MENU_MAP(calloc(
+	m->object[n] = map = SAR_MENU_MAP(calloc(
 	    1, sizeof(sar_menu_map_struct)
 	));
 	if(map == NULL)
--- searchandrescue-0.8.2.orig/sar/Makefile.install.UNIX
+++ searchandrescue-0.8.2/sar/Makefile.install.UNIX
@@ -12,9 +12,9 @@
 #
 
 INSTALL      = install
-INSTBINFLAGS = -m 0755 -s
+INSTBINFLAGS = -m 0755
 INSTUIDFLAGS = -m 4755
-INSTLIBFLAGS = -m 0755 -s
+INSTLIBFLAGS = -m 0755
 INSTINCFLAGS = -m 0644
 INSTMANFLAGS = -m 0644
 INSTCFGFLAGS = -m 0644
@@ -34,10 +34,10 @@
 ICON5 = $(BIN)5.xpm
 
 BIN_DIR    = $(PREFIX)/bin
-MAN_DIR    = $(PREFIX)/man/man6
+MAN_DIR    = $(PREFIX)/share/man/man6
 GAMES_DIR  = $(PREFIX)/games
 SHARE_GAMES_DIR = $(PREFIX)/share/games
-SHARE_ICONS_DIR = $(PREFIX)/share/icons
+SHARE_ICONS_DIR = $(PREFIX)/X11R6/include/X11/pixmaps
 
 HR = "-------------------------------------------------------------------------"
 
--- searchandrescue-0.8.2.orig/sar/disk.cpp
+++ searchandrescue-0.8.2/sar/disk.cpp
@@ -130,12 +130,7 @@
 	if(path == NULL)
 	    return(0);
 
-	// Dan S: typecast is due to const.
-#if defined(__cplusplus) || defined(c_plusplus)
-	while(ISBLANK(reinterpret_cast<char>(*path)))
-#else
 	while(ISBLANK(*path))
-#endif
 	    path++;
 
 	return(*path == DIR_DELIMINATOR);
--- searchandrescue-0.8.2.orig/sar/config.h
+++ searchandrescue-0.8.2/sar/config.h
@@ -477,7 +477,7 @@
 #define SAR_DEF_LOCAL_DATA_DIR  ".SearchAndRescue"
 
 /* Global game dir */
-#define SAR_DEF_GLOBAL_DATA_DIR "/usr/share/games/SearchAndRescue"
+#define SAR_DEF_GLOBAL_DATA_DIR "/usr/share/games/searchandrescue"
 
 /* Subdirs, one of each in the local and global game dirs */
 #define SAR_DEF_AIRCRAFTS_DIR		"aircrafts"
@@ -539,7 +539,7 @@
 #ifdef __MSW__
 # define SAR_DEF_SAR_ICON_FILE		"SearchAndRescue.ico"
 #else
-# define SAR_DEF_SAR_ICON_FILE		"/usr/share/icons/SearchAndRescue.xpm"
+# define SAR_DEF_SAR_ICON_FILE		"/usr/share/pixmaps/SearchAndRescue.xpm"
 #endif
 
 /* Standard Texture Reference Names
--- searchandrescue-0.8.2.orig/sar/string.cpp
+++ searchandrescue-0.8.2/sar/string.cpp
@@ -3,7 +3,8 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-extern char *tzname[2];
+//Commented out to fix Debian bug 377175.
+//extern char *tzname[2];
 
 #include <time.h>
 #include "../include/os.h"
@@ -28,7 +29,9 @@
 #ifdef __MSW__
 int strcasecmp(const char *s1, const char *s2);
 #endif
-char *strcasestr(const char *haystack, const char *needle);
+#ifndef _GNU_SOURCE
+char *strcasestr(const char *haystack, const char *needle) throw();
+#endif /* _GNU_SOURCE not defined */
 int strpfx(const char *s, const char *pfx);
 int strcasepfx(const char *s, const char *pfx);
 
@@ -213,11 +216,12 @@
 }
 #endif
 
+#ifndef _GNU_SOURCE
 /*
  *	Case insensitive version of strstr(). Returns the pointer to
  *	needle in haystack if found or NULL on no match.
  */
-char *strcasestr(const char *haystack, const char *needle)
+char *strcasestr(const char *haystack, const char *needle) throw()
 {
 	const char *strptr1, *strptr2, *strptr3;
 
@@ -274,6 +278,7 @@
 
 	return(NULL);
 }
+#endif /* _GNU_SOURCE not defined */
 
 /*
  *	Checks if string pfx is a prefix of string s.
--- searchandrescue-0.8.2.orig/sar/menuobjview.c
+++ searchandrescue-0.8.2/sar/menuobjview.c
@@ -151,7 +151,7 @@
 	}   
 	    
 	/* Allocate structure */
-	m->object[n] = (void *)objview = SAR_MENU_OBJVIEW(calloc(
+	m->object[n] = objview = SAR_MENU_OBJVIEW(calloc(
 	    1, sizeof(sar_menu_objview_struct)
 	));
 	if(objview == NULL)
--- searchandrescue-0.8.2.orig/sar/platforms.ini
+++ searchandrescue-0.8.2/sar/platforms.ini
@@ -65,7 +65,7 @@
                 Description = X Window Systems
                 MustExist = Yes
                 FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H
-                FeatureLIBS = -lSM -lICE -lX11 -lXext -lXi -lXmu
+                FeatureLIBS = -lSM -lICE -lX11 -lXext -lXmu
                 FeatureLIB_DIR = -L/usr/X11R6/lib/
                 FeatureDepend = X11-lib
                         DependType = Library  
@@ -143,13 +143,13 @@
 
 Platform = Linux
 	Description = For most any Linux system
-	PREFIX = /usr/
+	PREFIX = $(DESTDIR)/usr/
 	CFLAGS = -Wall -O6 -funroll-loops -fomit-frame-pointer \
 -ffast-math -finline-functions -fexpensive-optimizations -D__USE_BSD
 	LIBS = -lm
 	LIB_DIR =
-        CC = cc
-        CPP = c++
+        CC = gcc
+        CPP = g++
 	PlatformSearchPathInclude = /usr/include/
 	PlatformSearchPathInclude = /usr/X11R6/include/
 	PlatformSearchPathLib = /lib/
@@ -167,38 +167,6 @@
                 Description = Just adds -g to the CFLAGS for debugging
                 MustExist = No
                 FeatureCFLAGS = -g
-        PlatformFeature = arch-i486
-                Description = Adds -march=i486 for 486 specific optimizations
-                MustExist = Preferred  
-                FeatureCFLAGS = -march=i486
-                FeatureDepend = i486
-                        DependType = Machine
-                        MustExist = Yes
-                        DependMachine = i486
-        PlatformFeature = arch-i586
-                Description = Adds -march=i586 for Pentium specific optimizations
-                MustExist = Preferred
-                FeatureCFLAGS = -march=i586
-		FeatureDepend = i586
-			DependType = Machine
-			MustExist = Yes
-			DependMachine = i586
-        PlatformFeature = arch-i686
-                Description = Adds -march=i686 for Pentium Pro specific optimizations
-                MustExist = Preferred
-                FeatureCFLAGS = -march=i686
-                FeatureDepend = i686
-                        DependType = Machine
-                        MustExist = Yes
-                        DependMachine = i686
-        PlatformFeature = arch-pentiumpro
-                Description = Adds -march=pentiumpro for Pentium Pro specific optimizations
-                MustExist = Preferred
-                FeatureCFLAGS = -march=pentiumpro
-                FeatureDepend = pentiumpro
-                        DependType = Machine
-                        MustExist = Yes
-                        DependMachine = pentiumpro
         PlatformFeature = libjsw
 		Description = For joystick support
                 MustExist = Preferred
@@ -218,7 +186,7 @@
                 Description = X Window Systems
                 MustExist = Yes
 		FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H
-                FeatureLIBS = -lSM -lICE -lX11 -lXext -lXi -lXmu
+                FeatureLIBS = -lSM -lICE -lX11 -lXext -lXmu
 		FeatureLIB_DIR = -L/usr/X11R6/lib/
                 FeatureDepend = X11-lib
                         DependType = Library
--- searchandrescue-0.8.2.orig/sar/menu.c
+++ searchandrescue-0.8.2/sar/menu.c
@@ -701,7 +701,7 @@
 	}
 
 	/* Allocate structure */
-	m->object[n] = (void *)label_ptr = SAR_MENU_LABEL(calloc(
+	m->object[n] = label_ptr = SAR_MENU_LABEL(calloc(
 	    1, sizeof(sar_menu_label_struct)
 	));
 	if(label_ptr == NULL)
@@ -780,7 +780,7 @@
 	}
 
 	/* Allocate structure */
-	m->object[n] = (void *)button = SAR_MENU_BUTTON(calloc(
+	m->object[n] = button = SAR_MENU_BUTTON(calloc(
 	    1, sizeof(sar_menu_button_struct)
 	));
 	if(button == NULL)
@@ -861,7 +861,7 @@
 	}
 
 	/* Allocate structure */
-	m->object[n] = (void *)pb = SAR_MENU_PROGRESS(calloc(
+	m->object[n] = pb = SAR_MENU_PROGRESS(calloc(
 	    1, sizeof(sar_menu_progress_struct)
 	));
 	if(pb == NULL)
@@ -964,7 +964,7 @@
 	}
 
 	/* Allocate structure */
-	m->object[n] = (void *)mesgbox = SAR_MENU_MESSAGE_BOX(calloc(
+	m->object[n] = mesgbox = SAR_MENU_MESSAGE_BOX(calloc(
 	    1, sizeof(sar_menu_message_box_struct)
 	));
 	if(mesgbox == NULL)
@@ -1078,7 +1078,7 @@
 	}
 
 	/* Allocate structure */
-	m->object[n] = (void *)list = SAR_MENU_LIST(calloc(
+	m->object[n] = list = SAR_MENU_LIST(calloc(
 	    1, sizeof(sar_menu_list_struct)
 	));
 	if(list == NULL)
@@ -1326,7 +1326,7 @@
 	}
 
 	/* Allocate structure */
-	m->object[n] = (void *)mdpy = SAR_MENU_MDISPLAY(calloc(
+	m->object[n] = mdpy = SAR_MENU_MDISPLAY(calloc(
 	    1, sizeof(sar_menu_mdisplay_struct)
 	));
 	if(mdpy == NULL)
@@ -1416,7 +1416,7 @@
 	}
 
 	/* Allocate structure */ 
-	m->object[n] = (void *)sw = SAR_MENU_SWITCH(calloc(
+	m->object[n] = sw = SAR_MENU_SWITCH(calloc(
 	    1, sizeof(sar_menu_switch_struct)
 	));
 	if(sw == NULL)  
@@ -1556,7 +1556,7 @@
 	}
 
 	/* Allocate structure */
-	m->object[n] = (void *)spin = SAR_MENU_SPIN(calloc(
+	m->object[n] = spin = SAR_MENU_SPIN(calloc(
 	    1, sizeof(sar_menu_spin_struct)
 	));
 	if(spin == NULL)
@@ -2010,7 +2010,7 @@
 	}
 
 	/* Allocate structure */
-	m->object[n] = (void *)slider = SAR_MENU_SLIDER(calloc(
+	m->object[n] = slider = SAR_MENU_SLIDER(calloc(
 	    1, sizeof(sar_menu_slider_struct)
 	));
 	if(slider == NULL)
--- searchandrescue-0.8.2.orig/sar/SearchAndRescue.xpm
+++ searchandrescue-0.8.2/sar/SearchAndRescue.xpm
@@ -0,0 +1,362 @@
+***************
+*** 1,308 ****
+  /* XPM */
+- static char * SearchAndRescue_xpm[] = {
+- "48 48 257 2",
+- "  	c None",
+- ". 	c #050509",
+- "+ 	c #4D83A9",
+- "@ 	c #860404",
+- "# 	c #14436E",
+- "$ 	c #2E628A",
+- "% 	c #BAC6B4",
+- "& 	c #9E4634",
+- "* 	c #4A4244",
+- "= 	c #AE8284",
+- "- 	c #4E0A04",
+- "; 	c #22527B",
+- "> 	c #5A728C",
+- ", 	c #6D9FBE",
+- "' 	c #882410",
+- ") 	c #3D729A",
+- "! 	c #1E2224",
+- "~ 	c #CA2204",
+- "{ 	c #7E868C",
+- "] 	c #10385E",
+- "^ 	c #325573",
+- "/ 	c #3E627C",
+- "( 	c #5D93B6",
+- "_ 	c #34424C",
+- ": 	c #A6220C",
+- "< 	c #CE422C",
+- "[ 	c #447AA1",
+- "} 	c #929EA4",
+- "| 	c #D86454",
+- "1 	c #356A92",
+- "2 	c #111211",
+- "3 	c #2A4244",
+- "4 	c #6A869C",
+- "5 	c #2B332F",
+- "6 	c #2A5B84",
+- "7 	c #79AAC4",
+- "8 	c #528AAC",
+- "9 	c #C5361C",
+- "0 	c #211517",
+- "a 	c #A60A04",
+- "b 	c #1A2A3C",
+- "c 	c #365A5C",
+- "d 	c #2E3E34",
+- "e 	c #386482",
+- "f 	c #CAEAF4",
+- "g 	c #622224",
+- "h 	c #862E14",
+- "i 	c #F14327",
+- "j 	c #1A4B73",
+- "k 	c #465264",
+- "l 	c #AEA6A4",
+- "m 	c #2E525C",
+- "n 	c #4A7290",
+- "o 	c #3F6A89",
+- "p 	c #A6362C",
+- "q 	c #4A7AA2",
+- "r 	c #78A6C0",
+- "s 	c #282C2A",
+- "t 	c #345A81",
+- "u 	c #6696B9",
+- "v 	c #E2361C",
+- "w 	c #425E7C",
+- "x 	c #5785AE",
+- "y 	c #DED6D4",
+- "z 	c #1A1A1C",
+- "A 	c #FE5238",
+- "B 	c #496D89",
+- "C 	c #3A5A7C",
+- "D 	c #8E9298",
+- "E 	c #314D61",
+- "F 	c #D2766C",
+- "G 	c #282D37",
+- "H 	c #8A1204",
+- "I 	c #224A71",
+- "J 	c #37363C",
+- "K 	c #563E44",
+- "L 	c #5285AA",
+- "M 	c #1C456F",
+- "N 	c #C6D6E4",
+- "O 	c #72A6C4",
+- "P 	c #9C240C",
+- "Q 	c #629AB9",
+- "R 	c #3A6C94",
+- "S 	c #B81804",
+- "T 	c #37658E",
+- "U 	c #FD4B2F",
+- "V 	c #76525C",
+- "W 	c #E23B21",
+- "X 	c #32638C",
+- "Y 	c #26557D",
+- "Z 	c #72A1BF",
+- "` 	c #42749C",
+- " .	c #F65E44",
+- "..	c #1A120C",
+- "+.	c #2C3440",
+- "@.	c #2E5D86",
+- "#.	c #85ABC8",
+- "$.	c #568AAD",
+- "%.	c #1E1D21",
+- "&.	c #363A3C",
+- "*.	c #6C2618",
+- "=.	c #98301C",
+- "-.	c #4E5A6C",
+- ";.	c #FEA68C",
+- ">.	c #3E6D95",
+- ",.	c #B6341C",
+- "'.	c #335E89",
+- ").	c #E28264",
+- "!.	c #7A0204",
+- "~.	c #DA260C",
+- "{.	c #6295B8",
+- "].	c #A72D18",
+- "^.	c #467EA4",
+- "/.	c #AABCC8",
+- "(.	c #2A527A",
+- "_.	c #47759D",
+- ":.	c #4B7EA5",
+- "<.	c #A12E16",
+- "[.	c #6E4A44",
+- "}.	c #527EA7",
+- "|.	c #1E323C",
+- "1.	c #414249",
+- "2.	c #FC462C",
+- "3.	c #1E4D76",
+- "4.	c #2A4E74",
+- "5.	c #EE3A21",
+- "6.	c #598EB2",
+- "7.	c #762B14",
+- "8.	c #B82A14",
+- "9.	c #2B5681",
+- "0.	c #8A625C",
+- "a.	c #DEF6E4",
+- "b.	c #A6726C",
+- "c.	c #FE9A84",
+- "d.	c #761E1C",
+- "e.	c #8EB6D4",
+- "f.	c #FE6E50",
+- "g.	c #260A0C",
+- "h.	c #42120C",
+- "i.	c #FED2C4",
+- "j.	c #8A8274",
+- "k.	c #726AB4",
+- "l.	c #FEFADC",
+- "m.	c #C08684",
+- "n.	c #FE8264",
+- "o.	c #A20204",
+- "p.	c #BEBABC",
+- "q.	c #9A1604",
+- "r.	c #BE0604",
+- "s.	c #CA4E3C",
+- "t.	c #9C9A9C",
+- "u.	c #E2E2E4",
+- "v.	c #120A04",
+- "w.	c #A2AEB4",
+- "x.	c #CD2D18",
+- "y.	c #9AAABC",
+- "z.	c #AE3E24",
+- "A.	c #968E8C",
+- "B.	c #D2D0D0",
+- "C.	c #727270",
+- "D.	c #B6B0AC",
+- "E.	c #D63224",
+- "F.	c #4A4E50",
+- "G.	c #FE674A",
+- "H.	c #A68E8C",
+- "I.	c #5A2E2C",
+- "J.	c #921E0C",
+- "K.	c #B61204",
+- "L.	c #3E4A4C",
+- "M.	c #CAC4C4",
+- "N.	c #870E04",
+- "O.	c #780E04",
+- "P.	c #FE8E6C",
+- "Q.	c #5E8EB4",
+- "R.	c #5B0304",
+- "S.	c #8A9AA8",
+- "T.	c #AA7A8C",
+- "U.	c #A81204",
+- "V.	c #223A54",
+- "W.	c #535556",
+- "X.	c #9F2A15",
+- "Y.	c #22466C",
+- "Z.	c #163E64",
+- "`.	c #BC1E0C",
+- " +	c #E22E14",
+- ".+	c #DAD6D4",
+- "++	c #CE3A1C",
+- "@+	c #DE462C",
+- "#+	c #DE6A54",
+- "$+	c #A01A04",
+- "%+	c #4A6684",
+- "&+	c #AF3318",
+- "*+	c #DEDEE4",
+- "=+	c #6288B0",
+- "-+	c #F6FAF4",
+- ";+	c #FE5A3C",
+- ">+	c #CACACC",
+- ",+	c #922616",
+- "'+	c #232326",
+- ")+	c #281A18",
+- "!+	c #968684",
+- "~+	c #324664",
+- "{+	c #2B3D4F",
+- "]+	c #424E6C",
+- "^+	c #D6260C",
+- "/+	c #2A1614",
+- "(+	c #575D67",
+- "_+	c #BAAAA4",
+- ":+	c #EC341C",
+- "<+	c #345680",
+- "[+	c #0E1621",
+- "}+	c #82868C",
+- "|+	c #7EACC4",
+- "1+	c #5E3A34",
+- "2+	c #3E3E3E",
+- "3+	c #722214",
+- "4+	c #26364C",
+- "5+	c #C6B6AC",
+- "6+	c #2A445C",
+- "7+	c #466E9C",
+- "8+	c #B20A04",
+- "9+	c #D64E3C",
+- "0+	c #C0C6CC",
+- "a+	c #3E6691",
+- "b+	c #3A526C",
+- "c+	c #32332F",
+- "d+	c #222B37",
+- "e+	c #F6442C",
+- "f+	c #2E2C2C",
+- "g+	c #2E2E38",
+- "h+	c #EA3E24",
+- "i+	c #32323C",
+- "j+	c #BE3214",
+- "k+	c #76464C",
+- "l+	c #F63E24",
+- "m+	c #96B2CC",
+- "n+	c #FEFEFC",
+- "o+	c #D6462C",
+- "p+	c #FE6244",
+- "q+	c #E22A0C",
+- "r+	c #A21204",
+- "s+	c #2E668D",
+- "t+	c #22567F",
+- "u+	c #3E769C",
+- "v+	c #1C261C",
+- "w+	c #7A8A9C",
+- "x+	c #324654",
+- "y+	c #8EA2B4",
+- "z+	c #366E94",
+- "A+	c #679ABC",
+- "B+	c #1A1E24",
+- "C+	c #234E78",
+- "D+	c #171618",
+- "E+	c #A13211",
+- "F+	c #0E0E0F",
+- "G+	c #62727C",
+- "H+	c #3A5E81",
+- "6.6.( 6.( 6.( ( Q Q A+{.A+A+{.A+A+A+, , Z Z Z , , Z r , , , r |+r r 7 r |+|+|+r r |+7 #.#.#.#.#.",
+- "+ ( ( 8 ( $.8 6.6.6.6.{.( 6.u ( A+u {.Q Q Q {.( ( ( A+, A+, Z , Z , A+A+, Z , , Z Z Z Z Z Z Z |+",
+- "+ ^.+ + + L + + 8 6.6.( x 8 x $.{.( ( {.( A+6.$.( u ( {.( ( Q.( ( {.{.{.{.A+u , , A+, Z Z Z , u ",
+- "L + + [ L L L L + + L + 6.( 6.6.8 L L L + 8 L $.6.6.x $.$.$.$.8 6.6.( ( ( ( ( Q.A+u ( Q ( Q {.Q ",
+- "+ ^.^.^.+ + ^.^.+ + + + 8 ^.+ ^.+ 8 8 + L 8 ( 8 L + + :.+ + + + + L 8 x Q.Q.=+6.Q.u ( 6.{.( $.( ",
+- ") + + 8 + ^.+ ^.+ u+) ) + ^.^.[ [ [ ^.^.^.^.^.+ ^.+ :.+ + :.:.+ Z $.x q + + ^.+ L 6.L L $.$.L $.",
+- "^.u+u++ u+u+^.1 ) [ z+` ) ` ^.[ u+z+[ ^.^.^.` ` :.+ :.+ + q q :.:.^.+ :.+ + ^.L Q.:.L + 8 8 x $.",
+- ") u+s+z+) [ u+u+z+^.` :.` L ` ) ) ` ) [ ^.[ :.^.) ` u+` >.` _.[ ` ` [ ` <.+ :.L + $.L [ + Q 8 q ",
+- "u+z+1 ) u+u+[ + R L L u+` [ u+) :.) ` + ^.+ q [ [ [ [ L ^.) [ [ + [ + + <.+ [ [ , L :.L + x + 6.",
+- "z+1 ) ) z+s+u+z+) ) ) u+u+u+u+1 ) 1 u+) [ u+[ ` 1 :.[ ) >.[ [ ^.[ [ ^.:.E+^.+ [ L [ ` [ [ L [ q ",
+- ") ^.{._.$.) ` u+) 1 1 z+R ) [ u+[ u+u+[ u+u+u+[ ) ^.u+u+) z+) [ u+u+) ) <.[ [ z+1 u+u+u+[ u+[ u+",
+- ") >.s+s+>.>.) u+) ) ) >.z+$ 1 ) z+1 1 R s+[ ) [ ) [ [ z+z+R [ [ u+[ ) [ - ` ` ^.^.^.` ` [ ` u+) ",
+- "z+1 1 1 ) R u+) z+z+z+R R ) $ 1 z+z+1 s+X 1 1 _.` R ) ` ) [ R s+R R z+%+E+) o ` >._._.R R u+[ + ",
+- ") ) ) 1 $ 1 s+1 1 s+s+z+1 1 R s+[ L $ e >.X '.) _.+ q ` R :.z+o 1 R 1 | &+` o ` T e ) 1 ) R >.>.",
+- "s+z+u+) ) 1 R ) ) 1 ) s+z+R ) ) z+1 [ ) >.` ` 1 T ` ` ` ` + + :.1 o T i.| t.@.1 $ s+R z+1 >.R ) ",
+- ") s+1 1 z+) [ 1 s+1 ) [ [ [ :.>._.R R T 1 R _.` ) R 1 s.R q 7 + :.s+) A n+t.R ` u+m.H+'+d+b+^.+ ",
+- "z+1 u+z+z+u+) u+^.^.) [ ) e 6.T ( '.R 0+-.H+) R 1 o 1 X.e e @.e o o >.2.t.t.+.*+d+& w+e '.) R ` ",
+- "1 s+6 @.1 s+1 z+$ R ) R s+1 _.1 e 1 $ R ^.p.E ` ` T q P 6 o $ z+1 % g.[.{ B.:.1 z+&+[ 1 ` [ [ 1 ",
+- "$ 1 z+$ j ; @.t+s+R $ T X X Y X $ X o $ @.s+..[+^ Y X P (+(+^ >.o n.G.&+K n+n ` ) X.>.R o R >.[ ",
+- "@.T 6 6 X X $ 6 X X 6 Y e @.@.$ 1 @.` ) ) >.e } D /.*+y F.o V P.l.~ G.j+p+G.G.G.;+].[ ` R R [ o ",
+- "t+; Y 6 a+@.@.o ; X @.s+T u+` T @.m ^ W.(+1 R w J C.H r+).~ E.z >+n+T.X.X.) >.) R T >.q ) X R R ",
+- "R s+$ 6 3.$ 1 $ ^ ^ '.D _ 5 B.%.S.R 1 s+u+;.G.-+F ,+1+.+9 8.S 2 h+++D.X.$ R [ 6 >.$.s+@.@.T R T ",
+- "@.$ 1 6 6+4+{+w.G 0 '+>+R T @.s+) _.` ` o F+E.K.K.2+C.D.l h.o.r+h+i p X.1 >.>.R ` >.1 R $ $ $ R ",
+- "$ $ &.f+M.0 v+^ T Y 1 $ @.$ R >.1 1 ` ) 1 R l+K.:+x.2+0.= !+v.x.i U $+T R R z+R >.>.` T ) R ) ` ",
+- "X 1 V.4.Y X >.R X 6 Y 6 Y t+# 6 R U p+o+R f.p+5.5.~.R.R.b.m.5+)+3+].$+s+R R 1 ) [ _.[ >.T ` @.o ",
+- "6 ; '.3.R j @.3.Y X T @.1 >.1 _._.$ ` X.9+c.i 5.q+ +@ !.@ P < A =.j+&+o o u+1 1 ; 9.9.o R ) 1 ` ",
+- "X T @.9.X 6 X @.'.6 ; M M ; 6 t+6 X o X.l+a R.r.~.:+`.8+E.W W W 9 ,.z.` e R '.R >.o =++ T R T o ",
+- ">.` ` 1 7+R 6 Y t+X @.s+@.X 6 '.a+R % 4 m U 5 d 5 @+f.;+[+S S 8.,.| <.T ; ; $ >.>.'.>.o q ) ) X ",
+- "; X 6 X _.>.T ; X 1 _.1 '.M I j C+a.E c U 3 v+v+d+2+U G s P U.q.].].,+) s+1 ; X 6 '.9.(.R s+$ X ",
+- "6 9.$ 9.; ; 6 R 6 >.>.T R R ` o f w ~+F.z z z s g+G g '+'+3+N.O.].,+) e s+6 '.6 <+4.c './ B n t ",
+- "1 1 s+@.R _.x _.}.+ _.` o @.X '.t E %.W.. z . %.g+&+%.z z ' k.N.<.; @.9.e 1 B C+I m+B 4 y.B./.m+",
+- "@.@.9.6 X '.; t+; j t+'.@.6 9.; ^ {+%.c+%.%.B+f+[+=.D+D+=.P N.O.]+6 T o ` 1 6 R }.e t > S.y.y+E ",
+- "$ T 3.j ; (.9.3.; ; Y j 3.Y ; b 1.2+2+f+&.c+J '+F+d.0 =.3+D+J.3.I I Y ; 9.6 1 s+e $ @.6 >.H+o ) ",
+- "9.Y t+(.M ; M # C+C+9.j C+M M 4+i+i+i+'+i+i+%.%.*.F+,+E+/+<.6 9.@.@.9.6 Y 6 6 ` R 1 T R s+1 [ R ",
+- "; C+j ] ] (.M M C+(.'.9.I ; 9.~+F.F.L.2+&.W.2+%.h F+F+,+' k+R 6 C+; (.6 ; 9.Y @.(.s+T e @.R 1 :.",
+- "<+6 6 # 9.9.(.; C+(.C+9.'.T t J }+W.&.c+F.s f+D+h '+l 7.$ Y 6 9.s+o T R e o >.T @.e 6 X (.3.I 9.",
+- "I 9.'.X 6 9.(.C+9.'.'.X <+6 C+%.G+1.d+..5 f+f+j.H.3+C+'.T e R e @.@.T T '.6 ; 6 ; @.X 6 ; t+X T ",
+- "C+C+a+a+x 7+9.I j 9._.C+M 4.'.{+D+D+F+. A.*.7.I.=+=+I t t M Z.; 6 @.@.6 R X 6 ; ; 6 e '.6 Y @.@.",
+- "M ; X '.9.6 ; 6 t C+'.6 t M I ] ] Z.Y.M 9.t (.C+9.(.C+4.(.'.H+'.6 6 ; 9.>.X 6 >.` ` T X @._.>.>.",
+- "Y C+j M 3.'.@.'.; X '.'.T o e X 9.C+C+(.(.j I M 9.(.6 C+C+I '.o @.9.'.6 T 6 6 X X >.o ) ` [ ` ` ",
+- "6 '.@.6 '.X a+Y X '.T R T @.Y @.R s+X 1 ; t+@.6 6 9.T T 6 6 @.T $ @.Y ; 9.9.C+6 a+1 X t+t+s+u+1 ",
+- "9.6 @.'.X ; 9.; 9.3.; 3.j $ R X >.n ` _.R T R @.6 1 s+6 ; M j # # # ; 9.R 6 $ '.6 Y '.s+@.@.R o ",
+- "9.Y @.@.7+s+>.a+$ 1 1 @.6 ; Y $ @.>.R q :.` ` >.` ` $ R T 7+_.@.@.T R >.R R 9.6 T X X $ T X X @.",
+- "6 3.6 ; @.9.; _.q ` ` t+M # 3.j 3.a+` q 7+R '.>.T z+z+9.+ x _.q + R a+'.X X ) a+Y T R T R o @.X ",
+- ") R ` @.$ 6 @.; 9.9.'.T >.1 X R ) >.@.@.'.3.6 6 9.T 6 9.@.@.X X ` >.:.7+R ` a+1 R I ; @.; 6 Y @.",
+- "R R T ` T T T >.9.3.j @.@.C+9.9.X a+>._.q + :.` X X 6 R R ^.` 7+` R X 1 7+7+>.R ` :.>.T 6 3.X X ",
+- "7+6 R T R @.9.6 s+T R [ _.` >.R X @.1 a+X 7+_.T a+a+T >.a+1 $ 9.R X 6 9.j ; '.R 7+_.R R '.7+` _.",
+- "1 9.9.a+R j 3.6 q ` '.9.>.>.` >.>.a+_.q R a+T @.t+j ; 6 j 6 Y R T T a+H+t _.7+'.X >.a+` o _.` o "};
+--- 1,51 ----
+  /* XPM */
++ static char * s8_xpm[] = {
++ "32 32 16 1",
++ " 	c None",
++ ".	c #666667",
++ "+	c #7F7F7F",
++ "@	c #007F7F",
++ "#	c #4C4C4C",
++ "$	c #7F0000",
++ "%	c #191919",
++ "&	c #CCCCCC",
++ "*	c #999999",
++ "=	c #FF0000",
++ "-	c #FFFFFF",
++ ";	c #333333",
++ ">	c #E5E5E5",
++ ",	c #B2B2B2",
++ "'	c #000000",
++ ")	c #7F7F00",
++ ".+@.+@+@+@.+@+.@.@+@+@+@+@++#+@+",
++ ".@.@.@..@.@.@+@..@+@.@.@+.@+$@+@",
++ ".@.@.@+@.@.+@.@+@+.@..@+@.@+#+@.",
++ ".@..@#..@.@.@+@.@+@.@..@+@..%.+@",
++ "@.@..@@.@.#@#.@..@..@+@..@..#.@.",
++ "#@#@..@#+@.#@.#@+@+@..@#@..+#...",
++ "@.@#@..@.@.@.@..@..@.@++@##&+*#@",
++ "@..@.@.@..@#..@..@...@*@+@+=-*.@",
++ "@+@+@.+@+@.&#@.@...$..@..@.+**;>",
++ "#...@.@.#@#@+,#@.@+##.#@.,$#+&@.",
++ "@@#@#.#@#..#@#%%###$..#.@*+=#-..",
++ "#@###@##@@.@.@#**&>>#.#*>=*=++++",
++ "##@@#@.@####..@.;.$$*==;&-+$$...",
++ "###*#;&%*@.@.,+-+##>=#=')=,#@.@#",
++ ";%%&.@#@...@.'===;+,,;$$=)=#...@",
++ "@#.@##.@.@.@..)$==;.*+%.=+$#@.@.",
++ "##@##@;#@=*=@++=)=$$+*,%$#=@..@.",
++ "###@#@.@+.+#=*)=.=$$$$=)#=##@..@",
++ "@#@;;###@#@$)=$==.=$=)==.=...@#@",
++ "@##@@#@#..&+#.;##=*+%#=.=+$@###.",
++ "#@..#;#;@>##=#;%;#=#;$=$#=#.@@#@",
++ "#.@#@@@.>##.%%%;;;;%;#$$#$.#@###",
++ "+@.+.#.#@#%#'%'%;#%%%$+$##@##@.#",
++ "###@#@###;;;%%%;%$%;$#$$##@..@#@",
++ "@;@;;#@%#;#;;;;;%$;$#%$######@#.",
++ "#;@##;;;;;;;;;%%;%#=%##@#@#@##@.",
++ "@;###@#####;;.;%$%%$##.#;#######",
++ "##@##@#;+#;;#;;;$;,$##@#@@#@@.@@",
++ "###@###%+#;%;;;+*;#.@#@###@#####",
++ "##@#;#@;%%''*;$;++;@#;;#@#@#@#@#",
++ "##@#@;#;;;#;#.##@####@#@####@.#@",
++ "#@###@#@#@##@##;#;@#####@#@#@##@"};
--- searchandrescue-0.8.2.orig/sar/sarfioopen.c
+++ searchandrescue-0.8.2/sar/sarfioopen.c
@@ -269,10 +269,8 @@
            FILTER_CHECK(SAR_PARM_VERSION)
         )
 	{
-            sar_parm_version_struct *pv =
-                (sar_parm_version_struct *)p = SARParmNew(
-                    SAR_PARM_VERSION
-                );
+	    p = SARParmNew( SAR_PARM_VERSION );
+            sar_parm_version_struct *pv = (sar_parm_version_struct *)p;
 
             cstrptr = val_str;
             pv->major = ATOI(cstrptr);
@@ -294,10 +292,9 @@
                 FILTER_CHECK(SAR_PARM_NAME)
 	)
 	{
+	    p = SARParmNew(SAR_PARM_NAME);
 	    sar_parm_name_struct *pv =
-		(sar_parm_name_struct *)p = SARParmNew(
-		    SAR_PARM_NAME
-		);
+		(sar_parm_name_struct *)p;
 
 	    free(pv->name);
 	    pv->name = STRDUP(val_str);
@@ -310,10 +307,9 @@
                 ) && FILTER_CHECK(SAR_PARM_DESCRIPTION)
 	)
         {
+            p = SARParmNew(SAR_PARM_DESCRIPTION);
             sar_parm_description_struct *pv =
-                (sar_parm_description_struct *)p = SARParmNew(
-                    SAR_PARM_DESCRIPTION
-                );
+                (sar_parm_description_struct *)p;
 
             free(pv->description);
             pv->description = STRDUP(val_str);
@@ -325,10 +321,9 @@
                 FILTER_CHECK(SAR_PARM_PLAYER_MODEL_FILE)
 	)
         {
+            p = SARParmNew(SAR_PARM_PLAYER_MODEL_FILE);
             sar_parm_player_model_file_struct *pv =
-                (sar_parm_player_model_file_struct *)p = SARParmNew(
-                    SAR_PARM_PLAYER_MODEL_FILE
-                );
+                (sar_parm_player_model_file_struct *)p;
 
 	    cstrptr = val_str;
             free(pv->file);
@@ -342,10 +337,9 @@
                 FILTER_CHECK(SAR_PARM_WEATHER)
 	)
         {
+            p = SARParmNew(SAR_PARM_WEATHER); 
             sar_parm_weather_struct *pv =
-                (sar_parm_weather_struct *)p = SARParmNew(
-                    SAR_PARM_WEATHER
-                ); 
+                (sar_parm_weather_struct *)p;
 
             free(pv->weather_preset_name);
             pv->weather_preset_name = STRDUP(val_str);
@@ -360,10 +354,9 @@
         )
         {
 	    int h, m, s;
+            p = SARParmNew(SAR_PARM_TIME_OF_DAY);
             sar_parm_time_of_day_struct *pv =
-                (sar_parm_time_of_day_struct *)p = SARParmNew(
-                    SAR_PARM_TIME_OF_DAY
-                );
+                (sar_parm_time_of_day_struct *)p;
 
             cstrptr = val_str;
 	    SARParseTimeOfDay(cstrptr, &h, &m, &s);
@@ -381,10 +374,9 @@
                 ) && FILTER_CHECK(SAR_PARM_REGISTER_LOCATION)
 	)
         {
+            p = SARParmNew(SAR_PARM_REGISTER_LOCATION);
             sar_parm_register_location_struct *pv =
-                (sar_parm_register_location_struct *)p = SARParmNew(
-                    SAR_PARM_REGISTER_LOCATION
-                );
+                (sar_parm_register_location_struct *)p;
 
 	    /* Position (xyz) */
 	    cstrptr = val_str;
@@ -417,10 +409,9 @@
                 ) && FILTER_CHECK(SAR_PARM_SCENE_GPS)
         )
         {
+            p = SARParmNew(SAR_PARM_SCENE_GPS);  
             sar_parm_scene_gps_struct *pv = 
-                (sar_parm_scene_gps_struct *)p = SARParmNew(
-                    SAR_PARM_SCENE_GPS
-                );  
+                (sar_parm_scene_gps_struct *)p;
 
             /* Center offset in degrees */
             cstrptr = val_str;
@@ -439,10 +430,9 @@
                 FILTER_CHECK(SAR_PARM_SCENE_MAP)
 	)
         {
+            p = SARParmNew(SAR_PARM_SCENE_MAP);
             sar_parm_scene_map_struct *pv =
-                (sar_parm_scene_map_struct *)p = SARParmNew(
-                    SAR_PARM_SCENE_MAP
-                );
+                (sar_parm_scene_map_struct *)p;
 
             /* Size in meters */
             cstrptr = val_str;
@@ -463,10 +453,9 @@
                 FILTER_CHECK(SAR_PARM_SCENE_ELEVATION)
 	)
         {
+	    p = SARParmNew(SAR_PARM_SCENE_ELEVATION);
 	    sar_parm_scene_elevation_struct *pv =
-                (sar_parm_scene_elevation_struct *)p = SARParmNew(
-                    SAR_PARM_SCENE_ELEVATION
-                );
+                (sar_parm_scene_elevation_struct *)p;
 
             /* Elevation in meters */
             cstrptr = val_str;
@@ -479,10 +468,9 @@
                 FILTER_CHECK(SAR_PARM_SCENE_CANT)
 	)
         {
+            p = SARParmNew(SAR_PARM_SCENE_CANT);
             sar_parm_scene_cant_struct *pv =
-                (sar_parm_scene_cant_struct *)p = SARParmNew(
-                    SAR_PARM_SCENE_CANT
-                );
+                (sar_parm_scene_cant_struct *)p;
 
             /* Angle in radians */
             cstrptr = val_str;
@@ -495,10 +483,9 @@
                 FILTER_CHECK(SAR_PARM_SCENE_GROUND_FLAGS)
 	)
         {
+            p = SARParmNew(SAR_PARM_SCENE_GROUND_FLAGS);
             sar_parm_scene_ground_flags_struct *pv =
-                (sar_parm_scene_ground_flags_struct *)p = SARParmNew(
-                    SAR_PARM_SCENE_GROUND_FLAGS
-                );
+                (sar_parm_scene_ground_flags_struct *)p;
 
 	    pv->flags = 0;
 
@@ -521,10 +508,9 @@
                 FILTER_CHECK(SAR_PARM_SCENE_GROUND_TILE)
 	)
         {
+            p = SARParmNew(SAR_PARM_SCENE_GROUND_TILE);
             sar_parm_scene_ground_tile_struct *pv =
-                (sar_parm_scene_ground_tile_struct *)p = SARParmNew(
-                    SAR_PARM_SCENE_GROUND_TILE
-                );
+                (sar_parm_scene_ground_tile_struct *)p;
 
             /* Tile size in meters */
             cstrptr = val_str;
@@ -559,10 +545,9 @@
                 FILTER_CHECK(SAR_PARM_TEXTURE_BASE_DIRECTORY)
 	)
         {
+            p = SARParmNew(SAR_PARM_TEXTURE_BASE_DIRECTORY);
             sar_parm_texture_base_directory_struct *pv =
-                (sar_parm_texture_base_directory_struct *)p = SARParmNew(
-                    SAR_PARM_TEXTURE_BASE_DIRECTORY
-                );
+                (sar_parm_texture_base_directory_struct *)p;
 
             free(pv->directory);
             pv->directory = STRDUP(val_str);
@@ -575,10 +560,9 @@
                 FILTER_CHECK(SAR_PARM_TEXTURE_LOAD)
 	)
         {
+            p = SARParmNew(SAR_PARM_TEXTURE_LOAD);
             sar_parm_texture_load_struct *pv =
-                (sar_parm_texture_load_struct *)p = SARParmNew(
-                    SAR_PARM_TEXTURE_LOAD
-                );
+                (sar_parm_texture_load_struct *)p;
 
 	    /* Name */
             cstrptr = val_str;
@@ -604,10 +588,9 @@
                 FILTER_CHECK(SAR_PARM_MISSION_SCENE_FILE)
 	)
         {
+            p = SARParmNew(SAR_PARM_MISSION_SCENE_FILE);
             sar_parm_mission_scene_file_struct *pv =
-                (sar_parm_mission_scene_file_struct *)p = SARParmNew(
-                    SAR_PARM_MISSION_SCENE_FILE
-                );
+                (sar_parm_mission_scene_file_struct *)p;
 
             free(pv->file);
             pv->file = STRDUP(val_str);
@@ -619,10 +602,9 @@
                 FILTER_CHECK(SAR_PARM_MISSION_NEW_OBJECTIVE)
         )
         {
+            p = SARParmNew(SAR_PARM_MISSION_NEW_OBJECTIVE);
             sar_parm_mission_new_objective_struct *pv =
-                (sar_parm_mission_new_objective_struct *)p = SARParmNew(
-                    SAR_PARM_MISSION_NEW_OBJECTIVE
-                );
+                (sar_parm_mission_new_objective_struct *)p;
 
             /* Objective type */
             cstrptr = val_str;
@@ -659,10 +641,9 @@
                 FILTER_CHECK(SAR_PARM_MISSION_TIME_LEFT)
 	)
         {
+            p = SARParmNew(SAR_PARM_MISSION_TIME_LEFT);
             sar_parm_mission_time_left_struct *pv =
-                (sar_parm_mission_time_left_struct *)p = SARParmNew(
-                    SAR_PARM_MISSION_TIME_LEFT
-                );
+                (sar_parm_mission_time_left_struct *)p;
 
             /* Time left in seconds (note that the type is float) */
             cstrptr = val_str;
@@ -675,10 +656,9 @@
                 FILTER_CHECK(SAR_PARM_MISSION_BEGIN_AT)
 	)
         {
+            p = SARParmNew(SAR_PARM_MISSION_BEGIN_AT);
             sar_parm_mission_begin_at_struct *pv =
-                (sar_parm_mission_begin_at_struct *)p = SARParmNew(
-                    SAR_PARM_MISSION_BEGIN_AT
-                );
+                (sar_parm_mission_begin_at_struct *)p;
 
             /* Begin at object name */
             cstrptr = val_str;
@@ -694,10 +674,9 @@
                 FILTER_CHECK(SAR_PARM_MISSION_BEGIN_AT_POS)
         )
         {
+            p = SARParmNew(SAR_PARM_MISSION_BEGIN_AT_POS);
             sar_parm_mission_begin_at_pos_struct *pv =
-                (sar_parm_mission_begin_at_pos_struct *)p = SARParmNew(
-                    SAR_PARM_MISSION_BEGIN_AT_POS
-                );
+                (sar_parm_mission_begin_at_pos_struct *)p;
 
 	    /* Position */
             cstrptr = val_str;
@@ -722,10 +701,9 @@
                 FILTER_CHECK(SAR_PARM_MISSION_ARRIVE_AT)
 	)
         {
+            p = SARParmNew(SAR_PARM_MISSION_ARRIVE_AT);
             sar_parm_mission_arrive_at_struct *pv =
-                (sar_parm_mission_arrive_at_struct *)p = SARParmNew(
-                    SAR_PARM_MISSION_ARRIVE_AT
-                );
+                (sar_parm_mission_arrive_at_struct *)p;
 
             /* Arrive at object name */
             cstrptr = val_str;
@@ -741,10 +719,9 @@
                 FILTER_CHECK(SAR_PARM_MISSION_MESSAGE_SUCCESS)
 	)
         {
+            p = SARParmNew(SAR_PARM_MISSION_MESSAGE_SUCCESS);
             sar_parm_mission_message_success_struct *pv =
-                (sar_parm_mission_message_success_struct *)p = SARParmNew(
-                    SAR_PARM_MISSION_MESSAGE_SUCCESS
-                );
+                (sar_parm_mission_message_success_struct *)p;
 
             /* Mission success message */
             cstrptr = val_str;
@@ -760,10 +737,9 @@
                 FILTER_CHECK(SAR_PARM_MISSION_MESSAGE_FAIL)
 	)
         {
+            p = SARParmNew(SAR_PARM_MISSION_MESSAGE_FAIL);
             sar_parm_mission_message_fail_struct *pv =
-                (sar_parm_mission_message_fail_struct *)p = SARParmNew(
-                    SAR_PARM_MISSION_MESSAGE_FAIL
-                );
+                (sar_parm_mission_message_fail_struct *)p;
 
             /* Mission fail message */
             cstrptr = val_str;
@@ -779,10 +755,9 @@
                 FILTER_CHECK(SAR_PARM_MISSION_HUMANS_TALLY)
 	)
         {
+            p = SARParmNew(SAR_PARM_MISSION_HUMANS_TALLY);
             sar_parm_mission_humans_tally_struct *pv =
-                (sar_parm_mission_humans_tally_struct *)p = SARParmNew(
-                    SAR_PARM_MISSION_HUMANS_TALLY
-                );
+                (sar_parm_mission_humans_tally_struct *)p;
 
             /* Initial humans that need to be rescued (can be less or
 	     * equal to total_humans.
@@ -809,10 +784,9 @@
                 FILTER_CHECK(SAR_PARM_MISSION_ADD_INTERCEPT)
 	)
         {
+            p = SARParmNew(SAR_PARM_MISSION_ADD_INTERCEPT);
             sar_parm_mission_add_intercept_struct *pv =
-                (sar_parm_mission_add_intercept_struct *)p = SARParmNew(
-                    SAR_PARM_MISSION_ADD_INTERCEPT
-                );
+                (sar_parm_mission_add_intercept_struct *)p;
 
             /* Reference code */
             cstrptr = val_str;
@@ -882,10 +856,9 @@
 	        ) && FILTER_CHECK(SAR_PARM_NEW_OBJECT)
 	)
         {
+            p = SARParmNew(SAR_PARM_NEW_OBJECT);
             sar_parm_new_object_struct *pv =
-                (sar_parm_new_object_struct *)p = SARParmNew(
-                    SAR_PARM_NEW_OBJECT
-                );
+                (sar_parm_new_object_struct *)p;
 
             /* First int is object type */
             cstrptr = val_str;
@@ -900,10 +873,9 @@
                 ) && FILTER_CHECK(SAR_PARM_NEW_HELIPAD)
         )
         {
+            p = SARParmNew(SAR_PARM_NEW_HELIPAD);
             sar_parm_new_helipad_struct *pv =
-                (sar_parm_new_helipad_struct *)p = SARParmNew(
-                    SAR_PARM_NEW_HELIPAD
-                );
+                (sar_parm_new_helipad_struct *)p;
 
             /* Begin parsing line, format:
              *
@@ -1004,10 +976,9 @@
                 ) && FILTER_CHECK(SAR_PARM_NEW_RUNWAY)
         )
         {
+            p = SARParmNew(SAR_PARM_NEW_RUNWAY);
             sar_parm_new_runway_struct *pv =
-                (sar_parm_new_runway_struct *)p = SARParmNew(
-                    SAR_PARM_NEW_RUNWAY
-                );
+                (sar_parm_new_runway_struct *)p;
 
 	    /* Format:
 	     *
@@ -1107,10 +1078,9 @@
                 ) && FILTER_CHECK(SAR_PARM_NEW_HUMAN)
         )
         {
+            p = SARParmNew(SAR_PARM_NEW_HUMAN);
             sar_parm_new_human_struct *pv =
-                (sar_parm_new_human_struct *)p = SARParmNew(
-                    SAR_PARM_NEW_HUMAN
-                );
+                (sar_parm_new_human_struct *)p;
 
 	    /* Begin parsing line, format:
 	     *
@@ -1185,10 +1155,9 @@
                 ) && FILTER_CHECK(SAR_PARM_NEW_FIRE)
         )
         {
+            p = SARParmNew(SAR_PARM_NEW_FIRE);
             sar_parm_new_fire_struct *pv =
-                (sar_parm_new_fire_struct *)p = SARParmNew(
-                    SAR_PARM_NEW_FIRE
-                );
+                (sar_parm_new_fire_struct *)p;
 
             /* Begin parsing line, format:
              *
@@ -1210,10 +1179,9 @@
                 ) && FILTER_CHECK(SAR_PARM_NEW_SMOKE)
         )
         {
+            p = SARParmNew(SAR_PARM_NEW_SMOKE);
             sar_parm_new_smoke_struct *pv =
-                (sar_parm_new_smoke_struct *)p = SARParmNew(
-                    SAR_PARM_NEW_SMOKE
-                );
+                (sar_parm_new_smoke_struct *)p;
 
             /* Begin parsing line, format:
              *
@@ -1253,10 +1221,9 @@
                 ) && FILTER_CHECK(SAR_PARM_NEW_PREMODELED)
         )
         {
+            p = SARParmNew(SAR_PARM_NEW_PREMODELED);
             sar_parm_new_premodeled_struct *pv =
-                (sar_parm_new_premodeled_struct *)p = SARParmNew(
-                    SAR_PARM_NEW_PREMODELED
-                );
+                (sar_parm_new_premodeled_struct *)p;
 
 	    /* First argument is model type */
 	    cstrptr = val_str;
@@ -1277,10 +1244,9 @@
                 FILTER_CHECK(SAR_PARM_SELECT_OBJECT_BY_NAME)
         )
         {
+            p = SARParmNew(SAR_PARM_SELECT_OBJECT_BY_NAME);
             sar_parm_select_object_by_name_struct *pv =
-                (sar_parm_select_object_by_name_struct *)p = SARParmNew(
-                    SAR_PARM_SELECT_OBJECT_BY_NAME
-                );
+                (sar_parm_select_object_by_name_struct *)p;
 
             /* Name */
             cstrptr = val_str;
@@ -1297,10 +1263,9 @@
                 FILTER_CHECK(SAR_PARM_MODEL_FILE)
 	)
         {
+            p = SARParmNew(SAR_PARM_MODEL_FILE);
             sar_parm_model_file_struct *pv =
-                (sar_parm_model_file_struct *)p = SARParmNew(
-                    SAR_PARM_MODEL_FILE
-                );
+                (sar_parm_model_file_struct *)p;
 
 	    /* File name */
 	    cstrptr = val_str;
@@ -1315,10 +1280,9 @@
                 FILTER_CHECK(SAR_PARM_RANGE)
         )
         {
+            p = SARParmNew(SAR_PARM_RANGE);
             sar_parm_range_struct *pv =
-                (sar_parm_range_struct *)p = SARParmNew(
-                    SAR_PARM_RANGE
-                );
+                (sar_parm_range_struct *)p;
 
 	    /* Range in meters */
 	    cstrptr = val_str;
@@ -1337,10 +1301,9 @@
                 FILTER_CHECK(SAR_PARM_RANGE_FAR)
         )
         {
+            p = SARParmNew(SAR_PARM_RANGE_FAR);
             sar_parm_range_far_struct *pv =
-                (sar_parm_range_far_struct *)p = SARParmNew(
-                    SAR_PARM_RANGE_FAR
-                );
+                (sar_parm_range_far_struct *)p;
 
             /* Far range in meters */
             cstrptr = val_str;
@@ -1360,10 +1323,9 @@
                 ) && FILTER_CHECK(SAR_PARM_TRANSLATE)
 	)
         {
+            p = SARParmNew(SAR_PARM_TRANSLATE);
             sar_parm_translate_struct *pv =
-                (sar_parm_translate_struct *)p = SARParmNew(
-                    SAR_PARM_TRANSLATE
-                );
+                (sar_parm_translate_struct *)p;
 
             /* Translate in meters */
             cstrptr = val_str;
@@ -1381,10 +1343,9 @@
                 ) && FILTER_CHECK(SAR_PARM_TRANSLATE_RANDOM)
         )
         {
+            p = SARParmNew(SAR_PARM_TRANSLATE_RANDOM);
             sar_parm_translate_random_struct *pv =
-                (sar_parm_translate_random_struct *)p = SARParmNew(
-                    SAR_PARM_TRANSLATE_RANDOM
-                );
+                (sar_parm_translate_random_struct *)p;
 
 	    /* Bounds in meters */
 	    cstrptr = val_str;
@@ -1400,10 +1361,9 @@
                 FILTER_CHECK(SAR_PARM_ROTATE)
 	)
         {
+            p = SARParmNew(SAR_PARM_ROTATE);
             sar_parm_rotate_struct *pv =
-                (sar_parm_rotate_struct *)p = SARParmNew(
-                    SAR_PARM_ROTATE
-                );
+                (sar_parm_rotate_struct *)p;
 
             /* Rotate in radians */
             cstrptr = val_str;
@@ -1420,10 +1380,9 @@
                 FILTER_CHECK(SAR_PARM_NO_DEPTH_TEST)
 	)
         {
+            p = SARParmNew(SAR_PARM_NO_DEPTH_TEST);
             sar_parm_no_depth_test_struct *pv =
-                (sar_parm_no_depth_test_struct *)p = SARParmNew(
-                    SAR_PARM_NO_DEPTH_TEST
-                );
+                (sar_parm_no_depth_test_struct *)p;
 
             /* No arguments */
 	    if(pv != NULL)
@@ -1434,10 +1393,9 @@
                 FILTER_CHECK(SAR_PARM_POLYGON_OFFSET)
         )
         {
+           p = SARParmNew(SAR_PARM_POLYGON_OFFSET);
             sar_parm_polygon_offset_struct *pv =
-                (sar_parm_polygon_offset_struct *)p = SARParmNew(
-                    SAR_PARM_POLYGON_OFFSET
-                );
+                (sar_parm_polygon_offset_struct *)p;
 
 	    /* Reset flags */
 	    pv->flags = SAR_OBJ_FLAG_POLYGON_OFFSET;
@@ -1480,10 +1438,9 @@
                 FILTER_CHECK(SAR_PARM_CONTACT_BOUNDS_SPHERICAL)
 	)
         {
+            p = SARParmNew(SAR_PARM_CONTACT_BOUNDS_SPHERICAL);
             sar_parm_contact_bounds_spherical_struct *pv =
-                (sar_parm_contact_bounds_spherical_struct *)p = SARParmNew(
-                    SAR_PARM_CONTACT_BOUNDS_SPHERICAL
-                );
+                (sar_parm_contact_bounds_spherical_struct *)p;
 
             /* Radius in meters */
 	    cstrptr = val_str;
@@ -1502,10 +1459,9 @@
                 FILTER_CHECK(SAR_PARM_CONTACT_BOUNDS_CYLENDRICAL)
 	)
         {
+            p = SARParmNew(SAR_PARM_CONTACT_BOUNDS_CYLENDRICAL);
             sar_parm_contact_bounds_cylendrical_struct *pv =
-                (sar_parm_contact_bounds_cylendrical_struct *)p = SARParmNew(
-                    SAR_PARM_CONTACT_BOUNDS_CYLENDRICAL
-                );
+                (sar_parm_contact_bounds_cylendrical_struct *)p;
 
             /* Radius in meters */
             cstrptr = val_str;
@@ -1537,10 +1493,9 @@
                 FILTER_CHECK(SAR_PARM_CONTACT_BOUNDS_RECTANGULAR)
         )
         {
+            p = SARParmNew(SAR_PARM_CONTACT_BOUNDS_RECTANGULAR);
             sar_parm_contact_bounds_rectangular_struct *pv =
-                (sar_parm_contact_bounds_rectangular_struct *)p = SARParmNew(
-                    SAR_PARM_CONTACT_BOUNDS_RECTANGULAR
-                );
+                (sar_parm_contact_bounds_rectangular_struct *)p;
 
             /* X min and max */
             cstrptr = val_str;
@@ -1588,10 +1543,9 @@
                 FILTER_CHECK(SAR_PARM_GROUND_ELEVATION)
 	)
         {
+            p = SARParmNew(SAR_PARM_GROUND_ELEVATION);
             sar_parm_ground_elevation_struct *pv =
-                (sar_parm_ground_elevation_struct *)p = SARParmNew(
-                    SAR_PARM_GROUND_ELEVATION
-                );
+                (sar_parm_ground_elevation_struct *)p;
 
 	    /* Ground elevation in meters */
 	    cstrptr = val_str;
@@ -1605,10 +1559,9 @@
                 ) && FILTER_CHECK(SAR_PARM_OBJECT_NAME)
 	)
         {
+            p = SARParmNew(SAR_PARM_OBJECT_NAME);
             sar_parm_object_name_struct *pv =
-                (sar_parm_object_name_struct *)p = SARParmNew(
-                    SAR_PARM_OBJECT_NAME
-                );
+                (sar_parm_object_name_struct *)p;
 
             cstrptr = val_str;
 	    free(pv->name);
@@ -1626,10 +1579,9 @@
                 ) && FILTER_CHECK(SAR_PARM_OBJECT_MAP_DESCRIPTION)
         )
         {
+            p = SARParmNew(SAR_PARM_OBJECT_MAP_DESCRIPTION);
             sar_parm_object_map_description_struct *pv =
-                (sar_parm_object_map_description_struct *)p = SARParmNew(
-                    SAR_PARM_OBJECT_MAP_DESCRIPTION
-                );
+                (sar_parm_object_map_description_struct *)p;
 
             cstrptr = val_str;
             free(pv->description);
@@ -1644,10 +1596,9 @@
                 FILTER_CHECK(SAR_PARM_FUEL)
 	)
         {
+            p = SARParmNew(SAR_PARM_FUEL);
             sar_parm_fuel_struct *pv =
-                (sar_parm_fuel_struct *)p = SARParmNew(
-                    SAR_PARM_FUEL
-                );
+                (sar_parm_fuel_struct *)p;
 
 	    /* Get fuel values in kg */
             cstrptr = val_str;
@@ -1669,10 +1620,9 @@
                 FILTER_CHECK(SAR_PARM_HITPOINTS)
 	)
         {
+            p = SARParmNew(SAR_PARM_HITPOINTS);
             sar_parm_hitpoints_struct *pv =
-                (sar_parm_hitpoints_struct *)p = SARParmNew(
-                    SAR_PARM_HITPOINTS
-                );
+                (sar_parm_hitpoints_struct *)p;
 
 	    /* Get hit point values */
             cstrptr = val_str;
@@ -1694,10 +1644,9 @@
                 FILTER_CHECK(SAR_PARM_ENGINE_STATE)
 	)
         {
+            p = SARParmNew(SAR_PARM_ENGINE_STATE);
             sar_parm_engine_state_struct *pv =
-                (sar_parm_engine_state_struct *)p = SARParmNew(
-                    SAR_PARM_ENGINE_STATE
-                );
+                (sar_parm_engine_state_struct *)p;
 
 	    /* Get engine state */
             cstrptr = val_str;
@@ -1710,10 +1659,9 @@
                 FILTER_CHECK(SAR_PARM_PASSENGERS)
 	)
         {
+            p = SARParmNew(SAR_PARM_PASSENGERS);
             sar_parm_passengers_struct *pv =
-                (sar_parm_passengers_struct *)p = SARParmNew(
-                    SAR_PARM_PASSENGERS
-                );
+                (sar_parm_passengers_struct *)p;
 
 	    /* Get passenger values */
             cstrptr = val_str;
@@ -1737,10 +1685,9 @@
 		&& FILTER_CHECK(SAR_PARM_RUNWAY_APPROACH_LIGHTING_NORTH)
 	)
 	{
+	    p = SARParmNew(SAR_PARM_RUNWAY_APPROACH_LIGHTING_NORTH);
 	    sar_parm_runway_approach_lighting_north_struct *pv =
-		(sar_parm_runway_approach_lighting_north_struct *)p = SARParmNew(
-                    SAR_PARM_RUNWAY_APPROACH_LIGHTING_NORTH
-                );
+		(sar_parm_runway_approach_lighting_north_struct *)p;
 
 	    /* Flags */
 	    cstrptr = val_str;
@@ -1775,10 +1722,9 @@
                 && FILTER_CHECK(SAR_PARM_RUNWAY_APPROACH_LIGHTING_SOUTH)
         )
         {
+            p = SARParmNew(SAR_PARM_RUNWAY_APPROACH_LIGHTING_SOUTH);
             sar_parm_runway_approach_lighting_south_struct *pv =
-                (sar_parm_runway_approach_lighting_south_struct *)p = SARParmNew(
-                    SAR_PARM_RUNWAY_APPROACH_LIGHTING_SOUTH
-                );
+                (sar_parm_runway_approach_lighting_south_struct *)p;
 
             /* Flags */
             cstrptr = val_str;
@@ -1814,10 +1760,9 @@
                 ) && FILTER_CHECK(SAR_PARM_HUMAN_MESSAGE_ENTER)
 	)
         {
+            p = SARParmNew(SAR_PARM_HUMAN_MESSAGE_ENTER);
             sar_parm_human_message_enter_struct *pv =
-                (sar_parm_human_message_enter_struct *)p = SARParmNew(
-                    SAR_PARM_HUMAN_MESSAGE_ENTER
-                );
+                (sar_parm_human_message_enter_struct *)p;
 
             cstrptr = val_str;
 	    free(pv->message);
@@ -1833,10 +1778,9 @@
                 ) && FILTER_CHECK(SAR_PARM_HUMAN_REFERENCE)
         )
         {
+            p = SARParmNew(SAR_PARM_HUMAN_REFERENCE);
             sar_parm_human_reference_struct *pv =
-                (sar_parm_human_reference_struct *)p = SARParmNew(
-                    SAR_PARM_HUMAN_REFERENCE
-                );
+                (sar_parm_human_reference_struct *)p;
 
 	    /* Begin parsing line, format:
 	     *
@@ -2029,9 +1973,8 @@
 	 */
 	if(FILTER_CHECK(SAR_PARM_MISSION_LOG_HEADER))
 	{
-	    p_mission_log_header =
-		(sar_parm_mission_log_header_struct *)p =
-		SARParmNew(SAR_PARM_MISSION_LOG_HEADER);
+	    p = SARParmNew(SAR_PARM_MISSION_LOG_HEADER);
+	    p_mission_log_header = (sar_parm_mission_log_header_struct *)p;
 
 	    DO_ADD_PARM
 	}
--- searchandrescue-0.8.2.orig/sar/sound.c
+++ searchandrescue-0.8.2/sar/sound.c
@@ -230,7 +230,7 @@
  * YIDNULL.
  */
 #define SET_SND_PLAY_YID_NULL(p)	\
- { if((p) != NULL) (snd_play_struct *)(p)->data = (void *)YIDNULL; }
+ { if((p) != NULL) (p)->data = (void *)YIDNULL; }
 
 	    if(recorder->con != NULL)
 	    {
--- searchandrescue-0.8.2.orig/debian/control
+++ searchandrescue-0.8.2/debian/control
@@ -0,0 +1,41 @@
+Source: searchandrescue
+Section: games
+Priority: extra
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Phil Brooke <pjb@debian.org>
+Build-Depends: debhelper (>= 4), liby-dev (>= 2.14.2-2), libx11-dev, libxext-dev, libxpm-dev, libxxf86vm-dev, sharutils, bzip2, libsm-dev, libxmu-dev, libglu1-mesa-dev
+Standards-Version: 3.8.0
+Homepage: http://wolfpack.twu.net/SearchAndRescue/
+
+Package: searchandrescue
+Architecture: any
+Depends: ${shlibs:Depends}, searchandrescue-common (= ${source:Version}), searchandrescue-data (>= 0.8.2-1)
+Recommends: yiff-server
+Conflicts: sar
+Replaces: sar
+Description: fly aircraft to search (for) and rescue people in distress
+ Tired of scores indicating things destroyed or lives snuffed? Try something
+ different -- fly a helicopter around and rescue people in distress. If you 
+ were in trouble wouldn't you want someone to rescue you? 
+ .
+ This game is intended for players of all audiences, but especially for mature
+ players who want to get away from the violence and still retain a level of
+ precise challenge. Flight difficulty can be lowered for beginners (regardless
+ of mission type), and graphics minimized to suit slower computers
+ (minimum Pentium 166 with no graphics acceleration).
+ .
+ This package has been configured to depend on libY2 for sound support.
+ However, sound support is not necessary to enjoy the game.  (See
+ README.Debian for more information.)
+
+Package: searchandrescue-common
+Architecture: all
+Conflicts: sar, searchandrescue (<< 0.7.20-7)
+Description: common files and documentation for searchandrescue
+ Tired of scores indicating things destroyed or lives snuffed? Try something
+ different -- fly a helicopter around and rescue people in distress. If you 
+ were in trouble wouldn't you want someone to rescue you? 
+ .
+ This package contains the documentation and architecture independent
+ (common) files.
+
--- searchandrescue-0.8.2.orig/debian/postinst
+++ searchandrescue-0.8.2/debian/postinst
@@ -0,0 +1,49 @@
+#! /bin/sh
+# postinst script for searchandrescue
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- searchandrescue-0.8.2.orig/debian/menu
+++ searchandrescue-0.8.2/debian/menu
@@ -0,0 +1,7 @@
+?package(searchandrescue): \
+  needs="X11"\
+  section="Games/Simulation"\
+  hints="Helicopter"\
+  title="Search and Rescue"\
+  command="/usr/games/SearchAndRescue"\
+  icon="/usr/share/pixmaps/SearchAndRescue.xpm"
--- searchandrescue-0.8.2.orig/debian/watch
+++ searchandrescue-0.8.2/debian/watch
@@ -0,0 +1,4 @@
+version=3
+http://wolfpack.twu.net/SearchAndRescue/download/
+http://wolfpack.twu.net/users/wolfpack/SearchAndRescue-([\d.]+)\.tgz
+debian uupdate
--- searchandrescue-0.8.2.orig/debian/rules
+++ searchandrescue-0.8.2/debian/rules
@@ -0,0 +1,106 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DOCDIR=`pwd`/debian/searchandrescue/usr/share/doc/searchandrescue/html/
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	./configure Linux
+
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) clean
+	-rm -f sar/SearchAndRescue
+	-rm -f pconf/pconf
+	-rm -f sar/Makefile
+	-rm -f sar/this_platform.ini
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) install DESTDIR=`pwd`/debian/searchandrescue
+
+#	mkdir -p $(DOCDIR)
+#	install -m 0444 docs/*.png docs/*.html $(DOCDIR)
+
+	# Create directory .../debian/searchandrescue-common.
+	install -d -g root -m 755 -o root `pwd`/debian/searchandrescue-common/usr/share
+	# Move common files.
+#	mv `pwd`/debian/searchandrescue/usr/share/doc `pwd`/debian/searchandrescue-common/usr/share
+	mv `pwd`/debian/searchandrescue/usr/X11R6/include/X11/pixmaps `pwd`/debian/searchandrescue-common/usr/share
+	rm -r `pwd`/debian/searchandrescue/usr/X11R6
+	# Desktop file
+	install -d -g root -m 755 -o root `pwd`/debian/searchandrescue/usr/share/applications
+	install -m 644 debian/SearchAndRescue.desktop `pwd`/debian/searchandrescue/usr/share/applications/SearchAndRescue.desktop
+	# Lintian overrides
+	install -d -g root -m 755 -o root `pwd`/debian/searchandrescue/usr/share/lintian/overrides
+	install -m 644 debian/lintian-overrides.searchandrescue \
+		`pwd`/debian/searchandrescue/usr/share/lintian/overrides/searchandrescue
+	# Un-bzip the manpage.
+	bunzip2 `pwd`/debian/searchandrescue/usr/share/man/man6/SearchAndRescue.6.bz2
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i
+	dh_installmenu -i
+#	dh_installmanpages -i
+	dh_desktop
+	dh_installchangelogs -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps  -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a
+	dh_installmenu -a
+#	dh_installmanpages -a
+	dh_desktop
+	dh_installchangelogs -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps  -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- searchandrescue-0.8.2.orig/debian/lintian-overrides.searchandrescue
+++ searchandrescue-0.8.2/debian/lintian-overrides.searchandrescue
@@ -0,0 +1 @@
+searchandrescue: menu-icon-missing
--- searchandrescue-0.8.2.orig/debian/SearchAndRescue.desktop
+++ searchandrescue-0.8.2/debian/SearchAndRescue.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Search and rescue
+Exec=SearchAndRescue
+Terminal=False
+Type=Application
+Categories=Game
--- searchandrescue-0.8.2.orig/debian/changelog
+++ searchandrescue-0.8.2/debian/changelog
@@ -0,0 +1,329 @@
+searchandrescue (0.8.2-10ubuntu1) karmic; urgency=low
+
+  [ Scott Kitterman ]
+  * Drop build-depend on libjsw-dev (being removed due to GTK 1.2 removal)
+    - Update package description and README.Debian to remove reference to
+      libjsw and joystick support
+  * Add missing #include <stdio.h> in sar/gctl.c
+
+  [ Stefan Potyra ]
+  * sar/string.cpp, include/string.h: Disable strcasestr if _GNU_SOURCE
+    is defined, as this function is already part of (e)glibc as a
+    _GNU_SOURCE extension.
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Sun, 13 Sep 2009 02:17:31 +0200
+
+searchandrescue (0.8.2-10) unstable; urgency=low
+
+  * Add desktop file (closes: 476962).
+  * Remove old x-dev and libglu1 build-dependencies, added libglu1-mesa-dev.
+  * Bump standards-version to 3.8.0.
+
+ -- Phil Brooke <pjb@debian.org>  Fri, 18 Jul 2008 07:17:50 +0100
+
+searchandrescue (0.8.2-9) unstable; urgency=low
+
+  * Fixed broken clean target causing FTBFS (closes: #457346).
+  * Add better watch file, on suggestion from Raphael Geissert.
+
+ -- Phil Brooke <pjb@debian.org>  Thu, 27 Dec 2007 14:47:24 +0000
+
+searchandrescue (0.8.2-8) unstable; urgency=low
+
+  * Update to standards-version 3.7.3: 
+      * Modified debian/menu.
+  * Applied patches:
+      * From Brian M. Carlson to fix FTBFS (closes: 387117).
+      * From Lior Kaplan to make binNMU safe (modifies depends to
+        source:Version) (closes: 435953).
+      * Thanks.
+  * Removed debian/watch (closes: 449876).
+  * Modified sar/Makefile.install.UNIX so that final binaries are not
+    stripped when using DEB_BUILD_OPTIONS=nostrip (closes: 438011).
+  * Replaced DH_COMPAT in debian/rules with debian/compat.
+  * No longer ignore errors in clean target in debian/rules.
+  * Homepage moved in debian/control.
+
+ -- Phil Brooke <pjb@debian.org>  Fri, 21 Dec 2007 12:59:41 +0000
+
+searchandrescue (0.8.2-7) unstable; urgency=low
+
+  * Modifying string.cpp to fix FTBFS with gcc-snapshot package
+    (pre-release of GCC 4.2) (closes: 377175).
+
+ -- Phil Brooke <pjb@debian.org>  Wed, 26 Jul 2006 20:40:17 +0000
+
+searchandrescue (0.8.2-6) unstable; urgency=low
+
+  * Applying patch from Daniel Schepler to fix FTBFS.  Removes linking 
+    with Xi (closes: 370177).
+  * Bumped standards-version to 3.7.2.
+
+ -- Phil Brooke <pjb@debian.org>  Thu,  8 Jun 2006 11:40:52 +0000
+
+searchandrescue (0.8.2-5) unstable; urgency=low
+
+  * Replaced build-depends xlibs-dev with libx11-dev, libxext-dev,
+    libxpm-dev, libxxf86vm-dev, x-dev.
+  * Also added libsm-dev, libxmu-dev as build-depends.
+
+ -- Phil Brooke <pjb@debian.org>  Wed,  4 Jan 2006 16:38:10 +0000
+
+searchandrescue (0.8.2-4) unstable; urgency=low
+
+  * Added Recommends for yiff-server (closes: 332937).
+
+ -- Phil Brooke <pjb@debian.org>  Tue,  3 Jan 2006 21:34:04 +0000
+
+searchandrescue (0.8.2-3) unstable; urgency=low
+
+  * Changed build dependency from xlibmesa-dev to libglu1-xorg-dev 
+    (closes: 328151).
+  * Bumped standards-version to 3.6.2.
+  * prerm now uses bash, not sh.
+
+ -- Phil Brooke <pjb@debian.org>  Wed, 14 Sep 2005 07:57:16 +0100
+
+searchandrescue (0.8.2-2) unstable; urgency=low
+
+  * Applied patch from Andreas Jochens to allow searchandrescue to build 
+    on amd64 with gcc-4.0 (closes: 289495).
+  * Modified debian/control to adjust the version dependency on 
+    searchandrescue-data.
+
+ -- Phil Brooke <pjb@debian.org>  Mon, 10 Jan 2005 20:40:01 +0000
+
+searchandrescue (0.8.2-1) unstable; urgency=low
+
+  * New upstream release (closes: 287351).
+  * Updated control file to be stricter about searchandrescue-data and
+    searchandrescue-common versions.
+  * Updated description to start with lowercase letter.
+  * Fixed menu entry.
+  * Moved xpm icon files to /usr/share/pixmaps.
+  * Updated copyright file.
+
+ -- Phil Brooke <pjb@debian.org>  Sat,  8 Jan 2005 15:36:48 +0000
+
+searchandrescue (0.8.1-4) unstable; urgency=low
+
+  * Removed explicit dependency on GCC/G++ 3.2 in favour of the 
+    (default) 3.3 versions (closes: 236452).
+  * Changed package dependencies from xlibmesa3-glu to xlibmesa-glu.
+
+ -- Phil Brooke <pjb@debian.org>  Sat, 13 Mar 2004 16:05:59 +0000
+
+searchandrescue (0.8.1-3) unstable; urgency=low
+
+  * Patched menu.c (patch provided by upstream) to fix apparent 
+    double-buffering problem in menus (closes: 215458).
+
+ -- Phil Brooke <pjb@debian.org>  Sun, 19 Oct 2003 10:57:06 +0100
+
+searchandrescue (0.8.1-2) unstable; urgency=low
+
+  * Didn't properly remove doc-base directory, hopefully it's really 
+    gone this time (closes: 215461).
+
+ -- Phil Brooke <pjb@debian.org>  Mon, 13 Oct 2003 07:37:08 +0100
+
+searchandrescue (0.8.1-1) unstable; urgency=low
+
+  * New upstream release (closes: 204261).
+  * Required later release of YIFF sound server: change version of
+    build-depends on liby-dev.
+  * Newer standards-version (3.6.1.0).
+  * Upstream appears to have no docs directory now, so relevant
+    debian/rules removed.  This leaves searchandrescue-common a bit
+    empty -- but we'll keep it for now. .doc-base removed.
+
+ -- Phil Brooke <pjb@debian.org>  Sun, 12 Oct 2003 09:00:00 +0100
+
+searchandrescue (0.7.21-3) unstable; urgency=low
+
+  * Updated build-depends again for new libjsw (closes: #190984).
+
+ -- Phil Brooke <pjb@debian.org>  Wed, 30 Apr 2003 08:11:43 +0100
+
+searchandrescue (0.7.21-2) unstable; urgency=low
+
+  * Updated build-depends again to sort out FTBFS bug on some
+    architectures relating to libGLU.so (closes: #184702).
+
+ -- Phil Brooke <pjb@debian.org>  Fri, 28 Mar 2003 20:49:26 +0000
+
+searchandrescue (0.7.21-1) unstable; urgency=low
+
+  * New upstream release.
+  * searchandrescue-common now contains only a small amount of
+    documentation, because upstream now separately distribute a data
+    tgz, so we create a separate source package called
+    searchandrescue-data which generates a binary of the same name.
+  * Now build-depends on bzip2 so that we can bunzip2 the man page.
+  * Fixed typo in searchandrescue-common description (closes: #177121).
+  * Standards update to 3.5.9.0.
+  * Updated build-depends for libGLU.so (closes: #184702).
+
+ -- Phil Brooke <pjb@debian.org>  Fri, 21 Mar 2003 15:37:29 +0000
+
+searchandrescue (0.7.20-7) unstable; urgency=low
+
+  * Split this package into two: the main binary package, plus an
+    architecture independent searchandrescue-common. (closes: #168754).
+  * Changed rules to use debhelper compatibility level 4.
+  * Update to standards version 3.5.8.0.
+  * Overriding lintian warning: menu-icon-missing.
+  * Removed unnecessary Provides: sar.
+  * Fixed build-depends (xlibmesa-dev).
+
+ -- Phil Brooke <pjb@debian.org>  Sun, 12 Jan 2003 14:32:55 +0000
+
+searchandrescue (0.7.20-6) unstable; urgency=low
+
+  * Remove postinst /usr/doc/ symlink.
+  * Fixed problem when building in chroot (closes: #166596).
+
+ -- Phil Brooke <pjb@debian.org>  Wed, 30 Oct 2002 19:55:52 +0000
+
+searchandrescue (0.7.20-5) unstable; urgency=low
+
+  * Rebuilding using gcc/g++-3.2 (closes: #160106).
+  * Sorted out prerm and postinst for /usr/doc symlink.
+
+ -- Phil Brooke <pjb@debian.org>  Wed, 11 Sep 2002 15:55:55 +0100
+
+searchandrescue (0.7.20-4) unstable; urgency=low
+
+  * Changed build-depends so that nvidia-glx-dev can be used instead
+    of mesag-dev.
+  * libY2 and libjsw: clarified dependencies (closes: #152167).
+    Modified README and control files.
+
+ -- Phil Brooke <pjb@debian.org>  Tue, 16 Jul 2002 12:32:15 +0100
+
+searchandrescue (0.7.20-3) unstable; urgency=low
+
+  * Now using gcc/g++ -3.1 so that we build correctly on arm. 
+    (closes: #146253)
+
+ -- Phil Brooke <pjb@debian.org>  Thu, 30 May 2002 10:21:41 +0000
+
+searchandrescue (0.7.20-2) unstable; urgency=low
+
+  * Folded in bug fix after advice from upstream, using patch from Adam
+    Majer.  Also added g++-3.0 as build-dependency. (closes: #144704)
+
+ -- Phil Brooke <pjb@debian.org>  Sun, 28 Apr 2002 06:46:25 +0000
+
+searchandrescue (0.7.20-1) unstable; urgency=low
+
+  * New upstream release
+  * Folded in previous NMU changes (closes: #140752)
+  * New maintainer (closes: #116578)
+  * Added comment about yiff-server to README.Debian (closes: #136032)
+  * Change to sarsimbegin.c to allow compilation
+
+ -- Phil Brooke <pjb@debian.org>  Thu, 18 Apr 2002 15:35:54 +0000
+
+searchandrescue (0.7.15-3.1) unstable; urgency=low
+
+  * NMU
+  * rebuild against liby2-12.
+  * stricter versioned build-depends on liby2-dev
+
+ -- Junichi Uekawa <dancer@debian.org>  Mon,  1 Apr 2002 14:42:08 +0900
+
+searchandrescue (0.7.15-3) unstable; urgency=low
+
+  * rebuild against new version of libjsw (closes: #129718) 
+  * put url on control
+
+ -- David Kimdon <dwhedon@debian.org>  Sat, 26 Jan 2002 23:30:41 -0800
+
+searchandrescue (0.7.15-2) unstable; urgency=low
+
+  * Remove i486 and up x86 optimization flags, fixes Illegal 
+  instruction on AMD k6 (closes: #116056)
+  * remove emacs cruft from changelog (fixes lintian error)
+
+ -- David Kimdon <dwhedon@debian.org>  Tue, 27 Nov 2001 23:50:49 -0800
+
+searchandrescue (0.7.15-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- David Kimdon <dwhedon@debian.org>  Mon,  8 Oct 2001 21:32:43 -0700
+
+searchandrescue (0.7e-4) unstable; urgency=low
+
+  * fix build failure on hppa (closes: #104870) 
+
+ -- David Kimdon <dwhedon@debian.org>  Wed, 25 Jul 2001 08:16:23 -0600
+
+searchandrescue (0.7e-3) unstable; urgency=low
+
+  * don't build-depend on libc6-dev, it is build-essential
+  * upstream source location has moved, update debian/watch
+  * SearchAndRescue.xpm was in wrong place
+
+ -- David Kimdon <dwhedon@debian.org>  Sat, 14 Jul 2001 10:33:10 -0700
+
+searchandrescue (0.7e-2) unstable; urgency=low
+
+  * don't try to install into / fs during build (closes: #101384)
+  * fix some misspellings
+
+ -- David Whedon <dwhedon@debian.org>  Mon, 18 Jun 2001 21:13:44 -0700
+
+searchandrescue (0.7e-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- David Whedon <dwhedon@debian.org>  Sun, 17 Jun 2001 19:52:05 -0700
+
+searchandrescue (0.7d-2) unstable; urgency=low
+
+  * move menu to proper dir, make colors and size policy compliant. 
+
+ -- David Whedon <dwhedon@debian.org>  Thu, 10 May 2001 17:55:47 -0700
+
+searchandrescue (0.7d-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Not sure why it wasn't working, it works now (closes: #93709)
+
+ -- David Whedon <dwhedon@debian.org>  Thu, 12 Apr 2001 00:05:01 -0700
+
+searchandrescue (0.6-4) unstable; urgency=low
+
+  * typo fix in debian/doc-base (closes: #79457) 
+
+ -- David Whedon <dwhedon@gordian.com>  Tue, 12 Dec 2000 12:09:48 -0800
+
+searchandrescue (0.6-3) unstable; urgency=low
+
+  * remove dh_dhelp from rules (wasn't needed anyway) (closes: #79417) 
+
+ -- David Whedon <dwhedon@gordian.com>  Tue, 12 Dec 2000 09:50:09 -0800
+
+searchandrescue (0.6-2) unstable; urgency=low
+
+  * Change name (closes: #77513) 
+  * Compile with debugging symbols when debug is in DEB_BUILD_OPTIONS 
+    (closes: #77393) 
+
+ -- David Whedon <dwhedon@gordian.com>  Sun, 26 Nov 2000 18:38:22 -0800
+
+sar (0.6-1) unstable; urgency=low
+
+  * New upstream release
+  * removed INSTALL and README from dos as they weren't relevant 
+
+ -- David Whedon <dwhedon@gordian.com>  Thu, 16 Nov 2000 19:20:19 -0800
+
+sar (0.4-1) unstable; urgency=low
+
+  * Initial Release. (closes: #71719)
+
+ -- David Whedon <dwhedon@gordian.com>  Sat, 14 Oct 2000 23:16:15 -0700
+
--- searchandrescue-0.8.2.orig/debian/README.Debian
+++ searchandrescue-0.8.2/debian/README.Debian
@@ -0,0 +1,13 @@
+This package has been configured to depend on libY2 for sound
+support.  You do not, however, need a sound output device to play
+this game.  This game will gracefully look towards the keyboard if
+no joystick is available.
+
+You will need the Y sound server running for sound: this is included
+in the Debian package yiff-server.
+
+You can safely install the libraries required even if you don't want
+sound.  However, if you don't want libY2 on your system, this game
+can be easily recompiled without sound support.  (A recompilation
+will be necessary, since the binary is linked against liby2-12.)
+
--- searchandrescue-0.8.2.orig/debian/compat
+++ searchandrescue-0.8.2/debian/compat
@@ -0,0 +1 @@
+4
--- searchandrescue-0.8.2.orig/debian/copyright
+++ searchandrescue-0.8.2/debian/copyright
@@ -0,0 +1,18 @@
+This package was debianized by David Kimdon <dwhedon@debian.org> on
+Sat, 14 Oct 2000 23:16:15 -0700.
+
+It was downloaded from http://wolfpack.twu.net/
+
+Upstream Authors: WolfPack Entertainment, 
+		  Joel Baker (aka BlackJaguar) lucifer@lightbearer.com
+		  Tara Milana
+		  Stefan Maron
+		  Marcus Kudsen
+		  Dan Stimits
+
+This software is Copyright (C) 1999-2004 WolfPack Entertainment
+
+You are free to distribute this software under the terms of
+the GNU General Public License.
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.
--- searchandrescue-0.8.2.orig/debian/prerm
+++ searchandrescue-0.8.2/debian/prerm
@@ -0,0 +1,43 @@
+#! /bin/bash
+# prerm script for searchandrescue
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+#       install-info --quiet --remove /usr/info/#PACKAGE#.info.gz
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/searchandrescue ]; then
+       rm -f /usr/doc/searchandrescue
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- searchandrescue-0.8.2.orig/include/string.h
+++ searchandrescue-0.8.2/include/string.h
@@ -43,7 +43,9 @@
 #ifdef __MSW__
 extern int strcasecmp(const char *s1, const char *s2);
 #endif
+#ifndef _GNU_SOURCE
 extern char *strcasestr(const char *haystack, const char *needle);
+#endif /* _GNU_SOURCE defined */
 extern int strpfx(const char *s, const char *pfx);
 extern int strcasepfx(const char *s, const char *pfx);