--- flightgear-2.0.0.orig/config.guess
+++ flightgear-2.0.0/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, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2011-05-11'
 
 # 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,9 @@
 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, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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."
@@ -180,7 +181,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +270,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +299,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -394,23 +398,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -480,8 +484,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +498,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -551,7 +555,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	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
@@ -594,52 +598,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +734,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -769,14 +773,14 @@
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -804,14 +808,14 @@
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -866,7 +870,7 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -878,7 +882,13 @@
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
@@ -891,7 +901,7 @@
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -959,7 +969,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -967,6 +977,9 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@@ -974,7 +987,7 @@
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +996,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1019,7 +1032,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1047,13 +1060,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1088,8 +1101,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1132,10 +1145,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1161,11 +1174,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1230,6 +1243,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1275,13 +1291,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1321,11 +1337,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
--- flightgear-2.0.0.orig/config.sub
+++ flightgear-2.0.0/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, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2011-03-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,8 +75,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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."
@@ -123,8 +124,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -156,8 +158,8 @@
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -173,10 +175,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -281,11 +283,13 @@
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
 	| rx \
 	| score \
@@ -293,15 +297,24 @@
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -313,6 +326,18 @@
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -333,7 +358,7 @@
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -367,25 +392,28 @@
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
 	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -410,7 +438,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -480,11 +508,20 @@
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -516,7 +553,7 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -732,7 +769,7 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -839,6 +876,12 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -921,9 +964,10 @@
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1017,6 +1061,9 @@
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1073,17 +1120,10 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+	# This must be matched before tile*.
+	tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
 		;;
 	tile*)
 		basic_machine=tile-unknown
@@ -1156,6 +1196,9 @@
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1253,11 +1296,11 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1294,7 +1337,8 @@
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1341,7 +1385,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1390,7 +1434,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1435,6 +1479,8 @@
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1457,10 +1503,10 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1472,8 +1518,17 @@
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1500,7 +1555,7 @@
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1527,7 +1582,7 @@
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
--- flightgear-2.0.0.orig/utils/fgviewer/fgviewer.cxx
+++ flightgear-2.0.0/utils/fgviewer/fgviewer.cxx
@@ -58,14 +58,14 @@
     osgGA::KeySwitchMatrixManipulator* keyswitchManipulator;
     keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
     
-    osgGA::MatrixManipulator* mm = new osgGA::TrackballManipulator;
-    keyswitchManipulator->addMatrixManipulator('1', "Trackball", mm);
-    mm = new osgGA::FlightManipulator;
-    keyswitchManipulator->addMatrixManipulator('2', "Flight", mm);
-    mm = new osgGA::DriveManipulator;
-    keyswitchManipulator->addMatrixManipulator('3', "Drive", mm);
-    mm = new osgGA::TerrainManipulator;
-    keyswitchManipulator->addMatrixManipulator('4', "Terrain", mm);
+    keyswitchManipulator->addMatrixManipulator('1', "Trackball",
+                                               new osgGA::TrackballManipulator);
+    keyswitchManipulator->addMatrixManipulator('2', "Flight",
+                                               new osgGA::FlightManipulator);
+    keyswitchManipulator->addMatrixManipulator('3', "Drive",
+                                               new osgGA::DriveManipulator);
+    keyswitchManipulator->addMatrixManipulator('4', "Terrain",
+                                               new osgGA::TerrainManipulator);
     
     viewer.setCameraManipulator(keyswitchManipulator);
 
--- flightgear-2.0.0.orig/utils/Modeller/texture.cxx
+++ flightgear-2.0.0/utils/Modeller/texture.cxx
@@ -17,7 +17,7 @@
 # include <windows.h>
 #endif
 
-#include <osg/GLU>
+#include <osg/Matrixf>
 
 #include <math.h>
 #include <zlib.h>
@@ -95,6 +95,7 @@
 void
 SGTexture::resize(unsigned int width, unsigned int height)
 {
+    using namespace osg;
     GLfloat aspect;
 
     // Make sure that we don't get a divide by zero exception
@@ -110,10 +111,10 @@
     // Go to the projection matrix, this gets modified by the perspective
     // calulations
     glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
 
     // Do the perspective calculations
-    gluPerspective(45.0, aspect, 1.0, 400.0);
+    Matrixf proj = Matrixf::perspective(45.0, aspect, 1.0, 400.0);
+    glLoadMatrix(proj.ptr());
 
     // Return to the modelview matrix
     glMatrixMode(GL_MODELVIEW);
--- flightgear-2.0.0.orig/debian/docs
+++ flightgear-2.0.0/debian/docs
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+Thanks
--- flightgear-2.0.0.orig/debian/README.Debian
+++ flightgear-2.0.0/debian/README.Debian
@@ -0,0 +1,11 @@
+Flight Gear for Debian
+----------------------
+
+Start Flight Gear with fgfs.
+
+Additional scenery is available at http://www.flightgear.org/.
+The tile files should be unpacked into /usr/share/games/FlightGear/Scenery.
+The scenery files include a SharedModels.tgz, which may have extra/updated
+models used in some scenery tiles. Unpack this into /usr/share/games/FlightGear.
+
+ -- Ove Kaaven <ovek@arcticnet.no>
--- flightgear-2.0.0.orig/debian/menu
+++ flightgear-2.0.0/debian/menu
@@ -0,0 +1,2 @@
+?package(flightgear):needs=X11 section=Games/Simulation\
+  title="Flight Gear" command="/usr/games/fgfs"
--- flightgear-2.0.0.orig/debian/copyright
+++ flightgear-2.0.0/debian/copyright
@@ -0,0 +1,14 @@
+This package was debianized by Ove Kaaven <ovek@arcticnet.no> on
+Tue,  6 Feb 2001 15:46:57 +0100.
+
+It was downloaded from ftp://ftp.flightgear.org/pub/fgfs/Source/
+
+Upstream Authors: Curtis L. Olson <curt@flightgear.org>
+and the rest of the FlightGear team (see the Thanks file).
+
+Copyright (C) 1999-2000 Curtis L. Olson <curt@flightgear.org>
+
+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.
--- flightgear-2.0.0.orig/debian/compat
+++ flightgear-2.0.0/debian/compat
@@ -0,0 +1 @@
+5
--- flightgear-2.0.0.orig/debian/dirs
+++ flightgear-2.0.0/debian/dirs
@@ -0,0 +1 @@
+usr/games
--- flightgear-2.0.0.orig/debian/rules
+++ flightgear-2.0.0/debian/rules
@@ -0,0 +1,92 @@
+#!/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
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS=-O0 -g -D_REENTRANT
+else
+CFLAGS=-O2 -g -D_REENTRANT
+endif
+
+# unfortunately, src/Main/ will currently fail in a parallel build,
+# so I can't enable it at this time.
+#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+#NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+#MAKEFLAGS += -j$(NUMJOBS)
+#endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+		    --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games \
+		    --with-simgear=/usr --with-multiplayer --with-threads
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+
+	# try standard build options first; if that fails,
+	# clean up and then try again without optimization
+	$(MAKE) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" || \
+	$(MAKE) clean && $(MAKE) CFLAGS="" CXXFLAGS=""
+	#/usr/bin/docbook-to-man debian/flightgear.sgml > flightgear.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	-$(MAKE) -i clean
+	-$(MAKE) -i distclean
+	# distclean seems to not always be thorough
+	-find -name Makefile -type f -exec rm -f {} \;
+	-find -name .deps -type d -exec rm -rf {} \;
+
+	dh_clean
+
+	# update from autotools-dev
+	cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub .
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install prefix=$(CURDIR)/debian/flightgear/usr
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+
+	dh_install
+
+	dh_installdocs
+	cp docs-mini/* debian/flightgear/usr/share/doc/flightgear || true
+	cp utils/TerraSync/README.txt debian/flightgear/usr/share/doc/flightgear/README.TerraSync
+	dh_installmenu
+	dh_installchangelogs ChangeLog
+	dh_desktop
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- flightgear-2.0.0.orig/debian/install
+++ flightgear-2.0.0/debian/install
@@ -0,0 +1 @@
+debian/flightgear.desktop usr/share/applications
--- flightgear-2.0.0.orig/debian/control
+++ flightgear-2.0.0/debian/control
@@ -0,0 +1,26 @@
+Source: flightgear
+Section: games
+Priority: extra
+Maintainer: Debian FlightGear Crew <pkg-fgfs-crew@lists.alioth.debian.org>
+Uploaders: Ove Kaaven <ovek@arcticnet.no>
+Build-Depends: debhelper (>> 5),
+ libx11-dev, libxext-dev, libxi-dev, libice-dev, libsm-dev, libxt-dev, libxmu-dev,
+ libgl1-mesa-dev | xlibmesa-gl-dev | libgl-dev,
+ libglu1-mesa-dev | libglu1-xorg-dev | xlibmesa-glu-dev | libglu-dev,
+ freeglut3-dev | libglut3-dev, zlib1g-dev, libjpeg62-dev | libjpeg-dev,
+ libboost-dev, libplib-dev (>= 1.8.5), libopenscenegraph-dev (>> 2.8.0),
+ libopenal-dev, libalut-dev, autotools-dev,
+ simgear-dev (>= 2.0.0-2)
+Standards-Version: 3.7.3
+Homepage: http://www.flightgear.org/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/
+Vcs-Svn: svn://svn.debian.org/pkg-fgfs/flightgear/trunk/
+
+Package: flightgear
+Architecture: any
+Depends: ${shlibs:Depends}, fgfs-base (>= 2.0.0), ${misc:Depends}
+Recommends: fgfs-aircraft-base (>= 2.0.0), fgfs-models-base (>= 2.0.0)
+Description: Flight Gear Flight Simulator
+ Flight Gear is a free and highly sophisticated flight simulator.
+ .
+ This package contains the runtime binaries.
--- flightgear-2.0.0.orig/debian/changelog
+++ flightgear-2.0.0/debian/changelog
@@ -0,0 +1,336 @@
+flightgear (2.0.0-4) unstable; urgency=low
+
+  * Backported a bunch of upstream commits (from their git tree)
+    for support of newer versions of OpenSceneGraph:
+    f901dac 4b2436a c5366cc b692a16 473cea7
+    Closes: #634424
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Fri, 22 Jul 2011 01:58:19 +0200
+
+flightgear (2.0.0-3) unstable; urgency=low
+
+  * Recommend fgfs-aircraft-base and fgfs-models-base.
+    Closes. #610276.
+  * Added note about scenery SharedModels.tgz to README.Debian.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sun, 30 Jan 2011 15:46:35 +0100
+
+flightgear (2.0.0-2) unstable; urgency=low
+
+  * Build-Depend on simgear 2.0.0-2, which hopefully now
+    builds correctly.
+  * Also remember to use pbuilder. Closes: #609572.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Tue, 11 Jan 2011 04:24:20 +0100
+
+flightgear (2.0.0-1) unstable; urgency=low
+
+  * New upstream release. Closes: #573037.
+  * Add ${misc:Depends} to debian/control.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sun, 03 Oct 2010 19:39:36 +0200
+
+flightgear (1.9.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: UGear_command.cxx:41: error: 'snprintf' was not declared in
+    this scope". Applied patch by Cyril Brulebois (Closes: #560494)
+
+ -- Bastian Venthur <venthur@debian.org>  Sun, 21 Feb 2010 16:40:20 +0100
+
+flightgear (1.9.1-1) unstable; urgency=low
+
+  * New upstream release. Closes: #510387.
+  * Updated debian/control and things for FlightGear 1.9.1.
+    This includes depending on plib 1.8.5. Closes: #528635.
+  * Added Vcs-Browser and Vcs-Svn fields to debian/control.
+  * Converted debian/watch to version 3. Closes: #529110.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sun, 14 Jun 2009 21:35:48 +0200
+
+flightgear (1.0.0-3) unstable; urgency=low
+
+  * Made the pkg-fgfs-crew mailing list the official maintainer of the
+    FlightGear package, and myself a mere uploader.
+  * Updated libglut3-dev build-dependency to freeglut3-dev. Closes:
+    #394491.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sat, 21 Jun 2008 14:10:28 +0200
+
+flightgear (1.0.0-2) unstable; urgency=low
+
+  * Added Homepage field.
+  * Added flightgear.desktop file by Lukas Fittl. Closes: #409683.
+  * Build-Depend on simgear-dev 1.0.0-3 or later.
+  * Reverted all Debian patches to upstream's makefiles;
+    with simgear 1.0.0-3 they shouldn't be needed anymore.
+  * Use debian/compat file instead of setting DH_COMPAT in debian/rules.
+    Upgraded DH build-dependency and compatibility level to 5.
+  * Set optimization level according to DEB_BUILD_OPTIONS.
+  * No longer clear -g according to DEB_BUILD_OPTIONS, leave that
+    to dh_strip.
+  * Upgraded Standards-Version to 3.7.3.
+  * Cleaned debian/rules by removing a whole lot of unnecessary
+    dh_* calls (originally from the dh_make template).
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Thu, 10 Apr 2008 10:13:54 +0200
+
+flightgear (1.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sat, 22 Dec 2007 15:39:49 +0100
+
+flightgear (0.9.10-2) unstable; urgency=low
+
+  * Updated the build dependencies for xorg 7.0. Apparently the
+    amd64 autobuilder doesn't use Provides.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Wed, 17 May 2006 17:12:09 -0400
+
+flightgear (0.9.10-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Fri,  5 May 2006 20:02:30 -0400
+
+flightgear (0.9.9-2) unstable; urgency=low
+
+  * Apply patch from Martin Michlmayr and upstream CVS for
+    g++ 4.1 build failure. Closes: #356598.
+    (Martin also reported a link failure, but I see no reason
+    that should happen in a clean build, and upstream doesn't
+    seem to have had that kind of issue either, so he probably
+    just got a misbuild from his experimentations.)
+  * Build-Depend on libalut-dev, and simgear 0.3.9-3.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sun, 19 Mar 2006 06:47:39 -0500
+
+flightgear (0.9.9-1) unstable; urgency=low
+
+  * New upstream release. Closes: #341727.
+    Includes completely rewritten 3D clouds. Closes: #330861.
+    (Other stuff: a working aircraft carrier, new aircraft,
+    high-G blackouts, better weather, improved multiplayer,
+    and much more.)
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Mon,  2 Jan 2006 15:49:28 -0500
+
+flightgear (0.9.8-3) unstable; urgency=low
+
+  * Built with gcc-4.0-compiled simgear.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Mon, 25 Jul 2005 03:30:24 -0400
+
+flightgear (0.9.8-2) unstable; urgency=low
+
+  * Applied patch for gcc-4.0/amd64 compilation. Closes: #293392.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Fri, 15 Jul 2005 19:16:35 -0400
+
+flightgear (0.9.8-1) unstable; urgency=low
+
+  * New upstream release. Closes: #283575.
+  * Changed Build-Depends to depend on plib1.8.4-dev.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sun, 27 Mar 2005 21:56:19 -0500
+
+flightgear (0.9.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sun, 30 Jan 2005 17:49:39 -0500
+
+flightgear (0.9.5-1) unstable; urgency=low
+
+  * New upstream release. Closes: #264625.
+  * Upstream seem to have switched to OpenAL.
+    Added build-dependency on libopenal-dev.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Mon, 16 Aug 2004 19:57:03 +0200
+
+flightgear (0.9.4-1) unstable; urgency=low
+
+  * New upstream release.
+    Should (hopefully) fix current GCC issues.
+    Closes: #243226.
+  * Changed Build-Depends for new xlibs package layout.
+  * Changed Build-Depends to depend on plib1.8.3-dev.
+    Closes: #242336.
+  * Removed MetaKit build-dependency, flightgear apparently
+    stopped using it in 0.9.3.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Wed,  7 Apr 2004 10:48:30 +0200
+
+flightgear (0.9.3-1) unstable; urgency=low
+
+  * New upstream release. Yay, helicopters!
+  * Install TerraSync README file into /usr/share/doc/flightgear.
+    Closes: #201256.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sun,  9 Nov 2003 23:07:41 +0100
+
+flightgear (0.9.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Fri,  6 Jun 2003 02:06:36 +0200
+
+flightgear (0.9.1-2) unstable; urgency=low
+
+  * Rebuilt with metakit 2.4.9.2. Closes: #179391.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Thu, 17 Apr 2003 12:18:36 +0200
+
+flightgear (0.9.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Wed, 11 Dec 2002 14:50:48 +0100
+
+flightgear (0.8.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * This release compiles against plib 1.6.0. Closes: #160191.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Mon,  9 Sep 2002 19:47:56 +0200
+
+flightgear (0.7.10-2) unstable; urgency=low
+
+  * Forgot to update the version of that simgear build-dep
+    again, needs 0.0.18. Closes: #146788.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Mon, 13 May 2002 05:32:34 +0200
+
+flightgear (0.7.10-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sat, 27 Apr 2002 19:45:50 +0200
+
+flightgear (0.7.9-3) unstable; urgency=low
+
+  * Rebuilt with metakit 2.4.3.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Wed, 27 Mar 2002 21:50:15 +0100
+
+flightgear (0.7.9-2) unstable; urgency=low
+
+  * Made debian/rules try hard to get this compiled; if compiling
+    with optimization fails, then it'll try again without.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Thu,  7 Mar 2002 13:46:58 +0100
+
+flightgear (0.7.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Yes, I'm subscribed to flightgear-announce, so I knew about 0.7.9
+    already, but packaging new releases of this stuff takes some time.
+    Closes: #134302.
+  * Playing the intro music doesn't seem to hang fgfs in this release,
+    and it's no longer played by default anyway. Closes: #104168.
+  * Man pages seem to be available now. Closes: #87556, #87557, #87560, #87561.
+  * Some binaries without manpages are no longer installed.
+    (This includes runfgfs.) Closes: #87558, #87559, #87562.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sun, 17 Feb 2002 12:35:41 +0100
+
+flightgear (0.7.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-depend on plib >= 1.4.1.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sat, 14 Jul 2001 21:55:05 +0200
+
+flightgear (0.7.7-3) unstable; urgency=low
+
+  * Grr... if the plib maintainer keeps insisting on keeping
+    an "=" dependency on stable releases so I have to keep rebuilding
+    this stuff all the time, I'll soon be in the mood to hijack plib.
+    Well, this rebuild closes: #102769.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Tue,  3 Jul 2001 03:41:31 +0200
+
+flightgear (0.7.7-2) unstable; urgency=low
+
+  * I realized I ought to do a versioned simgear-dev build-dep a few
+    hours after the last upload, but this stuff takes a while to
+    rebuild and I thought the autobuilders might be able to get it
+    right this one time anyway, but they don't, it seems, so I
+    guess I have to. It build-depends on simgear-dev >= 0.0.15,
+    and plib-dev >= 1.4.0 while I'm at it. Closes: #102364.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Tue, 26 Jun 2001 19:56:30 +0200
+
+flightgear (0.7.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * This release has support for multithreaded tile loading.
+    Since Debian can do multithreading, I added --with-threads
+    to the configure command.
+  * Build-depend on autotools-dev.
+    Update config.guess and config.sub from it.
+  * Build-depend on debhelper v3.
+  * Standards-Version updated to 3.5.5.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Fri, 22 Jun 2001 17:27:20 +0200
+
+flightgear (0.7.6-6) unstable; urgency=low
+
+  * I can't believe I put the wrong bug number in my previos
+    changelog entry (I managed to try to close one of my
+    already-closed bugs)... Oh well, for the "install binaries
+    into /usr/games" change, I meant: Closes: #90569. So there!
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Mon,  2 Apr 2001 02:18:47 +0200
+
+flightgear (0.7.6-5) unstable; urgency=low
+
+  * Install binaries into /usr/games. Closes: #87269.
+  * Data directory moved from /usr/share/FlightGear to
+    /usr/share/games/FlightGear.
+    Depends on fgfs-base (>= 0.7.6-4) to do this move.
+  * Handle DEB_BUILD_OPTIONS. Upgrade Standars-Version to 3.5.2.
+    (it's a cleaner way to "build without -g on sparc" anyway)
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Thu, 29 Mar 2001 21:26:36 +0200
+
+flightgear (0.7.6-4) unstable; urgency=low
+
+  * Build without -g, to work around a g++ bug on sparc.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sun, 18 Mar 2001 17:12:08 +0100
+
+flightgear (0.7.6-3) unstable; urgency=low
+
+  * The plib maintainer keeps on making the lives of
+    plib users miserable with his shlibs file. Despite being
+    completely equivalent with the previous build, the new plib
+    package still has incompatible shlibs, forcing me to recompile.
+    Closes: #87269.
+  * Added --with-network-olk (networking support) to configure options
+    since I had to recompile anyway, so not completely for naught.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Sat,  3 Mar 2001 19:23:00 +0100
+
+flightgear (0.7.6-2) unstable; urgency=low
+
+  * For some reason the plib maintainer use shlibs depending
+    on the exact debian revision, so everything using plib has
+    to be rebuilt whenever he uploads a bugfix or something.
+  * Well, now built with debhelper v3, at least.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Wed, 21 Feb 2001 15:58:38 +0100
+
+flightgear (0.7.6-1) unstable; urgency=low
+
+  * Initial Release. Closes: #85060.
+  * Patched for FHS conformance.
+  * Added missing libs to a few link command lines.
+
+ -- Ove Kaaven <ovek@arcticnet.no>  Tue, 13 Feb 2001 16:05:02 +0100
+
+Local variables:
+mode: debian-changelog
+add-log-mailing-address "ovek@arcticnet.no"
+End:
--- flightgear-2.0.0.orig/debian/flightgear.desktop
+++ flightgear-2.0.0/debian/flightgear.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Version=1.4
+Name=FlightGear
+Exec=fgfs
+Terminal=false
+Categories=Game;Simulation;
+Comment=A flight simulator
+Comment[pt]=Simulação de Vôo
+Icon=
--- flightgear-2.0.0.orig/debian/watch
+++ flightgear-2.0.0/debian/watch
@@ -0,0 +1,3 @@
+version=3
+#ftp://ftp.flightgear.org/pub/fgfs/Source/FlightGear-(.*)\.tar\.gz
+ftp://ftp.ihg.uni-duisburg.de/Mirrors/ftp.flightgear.org/Source/FlightGear-(.*)\.tar\.gz
--- flightgear-2.0.0.orig/src/Cockpit/hud_rwy.cxx
+++ flightgear-2.0.0/src/Cockpit/hud_rwy.cxx
@@ -33,8 +33,7 @@
 #include <ATCDCL/ATCutils.hxx>
 #include <Main/viewer.hxx>
 
-#include <osg/GLU>
-
+#include <simgear/math/project.hxx>
 
 // int x, int y, int width, int height, float scale_data, bool working)
 
@@ -135,8 +134,9 @@
         //Calculate the 2D points via gluProject
         int result = GL_TRUE;
         for (int i = 0; i < 6; i++) {
-            result = gluProject(points3d[i][0], points3d[i][1], points3d[i][2], mm,
-                    pm, view, &points2d[i][0], &points2d[i][1], &points2d[i][2]);
+            result = simgear::project(points3d[i][0], points3d[i][1], points3d[i][2],
+                                      mm, pm, view,
+                                      &points2d[i][0], &points2d[i][1], &points2d[i][2]);
         }
         //set the line width based on our distance from the runway
         setLineWidth();
@@ -240,7 +240,8 @@
         sgdVec3 newPt;
         sgdCopyVec3(newPt, a1);
         sgdAddVec3(newPt, vec);
-        if (gluProject(newPt[0], newPt[1], newPt[2], mm, pm, view, &p2[0], &p2[1], &p2[2])
+        if (simgear::project(newPt[0], newPt[1], newPt[2], mm, pm, view,
+                             &p2[0], &p2[1], &p2[2])
                 && (p2[2] > 0 && p2[2] < 1.0)) {
             boundPoint(p1, p2);
             glBegin(GL_LINES);
@@ -256,7 +257,8 @@
         sgdVec3 newPt;
         sgdCopyVec3(newPt, a2);
         sgdAddVec3(newPt, vec);
-        if (gluProject(newPt[0], newPt[1], newPt[2], mm, pm, view, &p1[0], &p1[1], &p1[2])
+        if (simgear::project(newPt[0], newPt[1], newPt[2], mm, pm, view,
+                             &p1[0], &p1[1], &p1[2])
                 && (p1[2] > 0 && p1[2] < 1.0)) {
             boundPoint(p2, p1);
             glBegin(GL_LINES);
--- flightgear-2.0.0.orig/src/Cockpit/hud.cxx
+++ flightgear-2.0.0/src/Cockpit/hud.cxx
@@ -40,7 +40,7 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/props/props_io.hxx>
 
-#include <osg/GLU>
+#include <osg/Matrixf>
 
 #include <Aircraft/aircraft.hxx>
 //#include <Autopilot/xmlauto.hxx>
@@ -340,27 +340,31 @@
 
 void fgUpdateHUDVirtual(osg::State* state)
 {
+    using namespace osg;
     FGViewer* view = globals->get_current_view();
 
     // Standard fgfs projection, with essentially meaningless clip
     // planes (we'll map the whole HUD plane to z=-1)
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
-    glLoadIdentity();
-    gluPerspective(view->get_v_fov(), 1/view->get_aspect_ratio(), 0.1, 10);
+    Matrixf proj
+        = Matrixf::perspective(view->get_v_fov(), 1/view->get_aspect_ratio(),
+                               0.1, 10);
+    glLoadMatrix(proj.ptr());
 
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
-    glLoadIdentity();
 
     // Standard fgfs view direction computation
-    float lookat[3];
+    Vec3f lookat;
     lookat[0] = -sin(SG_DEGREES_TO_RADIANS * view->getHeadingOffset_deg());
     lookat[1] = tan(SG_DEGREES_TO_RADIANS * view->getPitchOffset_deg());
     lookat[2] = -cos(SG_DEGREES_TO_RADIANS * view->getHeadingOffset_deg());
     if (fabs(lookat[1]) > 9999)
         lookat[1] = 9999; // FPU sanity
-    gluLookAt(0, 0, 0, lookat[0], lookat[1], lookat[2], 0, 1, 0);
+    Matrixf mv = Matrixf::lookAt(Vec3f(0.0, 0.0, 0.0), lookat,
+                                 Vec3f(0.0, 1.0, 0.0));
+    glLoadMatrix(mv.ptr());
 
     // Map the -1:1 square to a 55.0x41.25 degree wide patch at z=1.
     // This is the default fgfs field of view, which the HUD files are
@@ -393,10 +397,11 @@
 void fgUpdateHUD( osg::State* state, GLfloat x_start, GLfloat y_start,
                   GLfloat x_end, GLfloat y_end )
 {
+    using namespace osg;
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
-    glLoadIdentity();
-    gluOrtho2D(x_start, x_end, y_start, y_end);
+    Matrixf proj = Matrixf::ortho2D(x_start, x_end, y_start, y_end);
+    glLoadMatrix(proj.ptr());
 
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
--- flightgear-2.0.0.orig/src/Cockpit/panel.cxx
+++ flightgear-2.0.0/src/Cockpit/panel.cxx
@@ -40,6 +40,7 @@
 #include <osg/CullFace>
 #include <osg/Depth>
 #include <osg/Material>
+#include <osg/Matrixf>
 #include <osg/TexEnv>
 #include <osg/PolygonOffset>
 
@@ -277,6 +278,7 @@
 void
 FGPanel::update (osg::State& state, GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh)
 {
+  using namespace osg;
                                // Calculate accelerations
                                // and jiggle the panel accordingly
                                // The factors and bounds are just
@@ -288,12 +290,13 @@
 
   glMatrixMode(GL_PROJECTION);
   glPushMatrix();
-  glLoadIdentity();
+  Matrixf proj;
   if ( _flipx->getBoolValue() ) {
-    gluOrtho2D(winx + winw, winx, winy + winh, winy); /* up side down */
+      proj = Matrixf::ortho2D(winx + winw, winx, winy + winh, winy); /* up side down */
   } else {
-    gluOrtho2D(winx, winx + winw, winy, winy + winh); /* right side up */
+      proj = Matrixf::ortho2D(winx, winx + winw, winy, winy + winh); /* right side up */
   }
+  glLoadMatrix(proj.ptr());
   
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
--- flightgear-2.0.0.orig/src/Scenery/SceneryPager.cxx
+++ flightgear-2.0.0/src/Scenery/SceneryPager.cxx
@@ -33,7 +33,6 @@
 {
     _pagerRequests.reserve(48);
     _deleteRequests.reserve(16);
-    setExpiryDelay(120.0);
 }
 
 SceneryPager::SceneryPager(const SceneryPager& rhs) :
@@ -45,15 +44,12 @@
 {
 }
 
+#if SG_PAGEDLOD_HAS_OPTIONS
+#else
 void SceneryPager::requestNodeFile(const std::string& fileName, Group* group,
                                    float priority, const FrameStamp* framestamp,
                                    ref_ptr<Referenced>& databaseRequest,
-#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
-                                   const osg::Referenced* options
-#else
-                                   osgDB::ReaderWriter::Options* options
-#endif
-                                   )
+                                   osgDB::ReaderWriter::Options* options)
 {
     simgear::SGPagedLOD *sgplod = dynamic_cast<simgear::SGPagedLOD*>(group);
     if(sgplod)
@@ -65,6 +61,7 @@
                                        databaseRequest,
                                        options);
 }
+#endif
 
 void SceneryPager::queueRequest(const std::string& fileName, Group* group,
                                 float priority, FrameStamp* frameStamp,
@@ -82,6 +79,35 @@
     _deleteRequests.push_back(objptr);
     objptr = 0;
 }
+
+// Work around interface change in
+// osgDB::DatabasePager::requestNodeFile
+namespace
+{
+struct NodePathProxy
+{
+    NodePathProxy(NodePath& nodePath)
+        : _nodePath(nodePath)
+    {
+    }
+    operator Group* () { return static_cast<Group*>(_nodePath.back()); }
+    operator NodePath& () { return _nodePath; }
+    NodePath& _nodePath;
+};
+}
+
+void SceneryPager::PagerRequest::doRequest(SceneryPager* pager)
+{
+    if (_group->getNumChildren() == 0) {
+        NodePath path;
+        path.push_back(_group.get());
+        pager->requestNodeFile(_fileName, NodePathProxy(path), _priority,
+                               _frameStamp.get(),
+                               *_databaseRequest,
+                               _options.get());
+    }
+}
+
 void SceneryPager::signalEndFrame()
 {
     using namespace std;
--- flightgear-2.0.0.orig/src/Scenery/SceneryPager.hxx
+++ flightgear-2.0.0/src/Scenery/SceneryPager.hxx
@@ -28,6 +28,7 @@
 #include <osgDB/DatabasePager>
 
 #include <simgear/structure/OSGVersion.hxx>
+#include <simgear/scene/model/SGPagedLOD.hxx>
 
 namespace flightgear
 {
@@ -39,16 +40,14 @@
     // Unhide DatabasePager::requestNodeFile
     using osgDB::DatabasePager::requestNodeFile;
     // reimplement to add readerWriterOptions from SGPagedLOD
+#if SG_PAGEDLOD_HAS_OPTIONS
+#else
     virtual void requestNodeFile(const std::string& fileName, osg::Group* group,
                                  float priority,
                                  const osg::FrameStamp* framestamp,
                                  osg::ref_ptr<osg::Referenced>& databaseRequest,
-#if SG_OSG_MIN_VERSION_REQUIRED(2,9,5)
-                                 const osg::Referenced* options
-#else
-                                 osgDB::ReaderWriter::Options* options
+                                 osgDB::ReaderWriter::Options* options);
 #endif
-                                 );
     void queueRequest(const std::string& fileName, osg::Group* node,
                       float priority, osg::FrameStamp* frameStamp,
                       osg::ref_ptr<osg::Referenced>& databaseRequest,
@@ -77,15 +76,7 @@
             _databaseRequest(&databaseRequest)
         {}
 
-        void doRequest(SceneryPager* pager)
-        {
-            if (_group->getNumChildren() == 0)
-                pager->requestNodeFile(_fileName, _group.get(), _priority,
-                                       _frameStamp.get(),
-                                       *_databaseRequest,
-                                       _options.get());
-        }
-
+        void doRequest(SceneryPager* pager);
         std::string _fileName;
         osg::ref_ptr<osg::Group> _group;
         float _priority;
--- flightgear-2.0.0.orig/src/Include/stamp-h
+++ flightgear-2.0.0/src/Include/stamp-h
@@ -0,0 +1 @@
+timestamp
--- flightgear-2.0.0.orig/src/Instrumentation/HUD/HUD_runway.cxx
+++ flightgear-2.0.0/src/Instrumentation/HUD/HUD_runway.cxx
@@ -25,7 +25,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
-#include <osg/GLU>
+#include <simgear/math/project.hxx>
 
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
@@ -130,8 +130,9 @@
     //Calculate the 2D points via gluProject
     int result = GL_TRUE;
     for (int i = 0; i < 6; i++) {
-        result = gluProject(_points3d[i][0], _points3d[i][1], _points3d[i][2], _mm,
-                _pm, _view, &_points2d[i][0], &_points2d[i][1], &_points2d[i][2]);
+        result = simgear::project(_points3d[i][0], _points3d[i][1], _points3d[i][2],
+                                  _mm, _pm, _view,
+                                  &_points2d[i][0], &_points2d[i][1], &_points2d[i][2]);
     }
     //set the line width based on our distance from the runway
     setLineWidth();
@@ -230,7 +231,8 @@
         sgdVec3 newPt;
         sgdCopyVec3(newPt, a1);
         sgdAddVec3(newPt, vec);
-        if (gluProject(newPt[0], newPt[1], newPt[2], _mm, _pm, _view, &p2[0], &p2[1], &p2[2])
+        if (simgear::project(newPt[0], newPt[1], newPt[2], _mm, _pm, _view,
+                             &p2[0], &p2[1], &p2[2])
                 && (p2[2] > 0 && p2[2] < 1.0)) {
             boundPoint(p1, p2);
             glBegin(GL_LINES);
@@ -246,7 +248,8 @@
         sgdVec3 newPt;
         sgdCopyVec3(newPt, a2);
         sgdAddVec3(newPt, vec);
-        if (gluProject(newPt[0], newPt[1], newPt[2], _mm, _pm, _view, &p1[0], &p1[1], &p1[2])
+        if (simgear::project(newPt[0], newPt[1], newPt[2], _mm, _pm, _view,
+                             &p1[0], &p1[1], &p1[2])
                 && (p1[2] > 0 && p1[2] < 1.0)) {
             boundPoint(p2, p1);
             glBegin(GL_LINES);
--- flightgear-2.0.0.orig/src/Instrumentation/HUD/HUD.cxx
+++ flightgear-2.0.0/src/Instrumentation/HUD/HUD.cxx
@@ -186,27 +186,31 @@
 
 void HUD::draw3D()
 {
+    using namespace osg;
     FGViewer* view = globals->get_current_view();
 
     // Standard fgfs projection, with essentially meaningless clip
     // planes (we'll map the whole HUD plane to z=-1)
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
-    glLoadIdentity();
-    gluPerspective(view->get_v_fov(), 1.0 / view->get_aspect_ratio(), 0.1, 10);
+    Matrixf proj
+        = Matrixf::perspective(view->get_v_fov(), 1/view->get_aspect_ratio(),
+                               0.1, 10);
+    glLoadMatrix(proj.ptr());
 
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
-    glLoadIdentity();
 
     // Standard fgfs view direction computation
-    float lookat[3];
+    Vec3f lookat;
     lookat[0] = -sin(SG_DEGREES_TO_RADIANS * view->getHeadingOffset_deg());
     lookat[1] = tan(SG_DEGREES_TO_RADIANS * view->getPitchOffset_deg());
     lookat[2] = -cos(SG_DEGREES_TO_RADIANS * view->getHeadingOffset_deg());
     if (fabs(lookat[1]) > 9999)
         lookat[1] = 9999; // FPU sanity
-    gluLookAt(0, 0, 0, lookat[0], lookat[1], lookat[2], 0, 1, 0);
+    Matrixf mv = Matrixf::lookAt(Vec3f(0.0, 0.0, 0.0), lookat,
+                                 Vec3f(0.0, 1.0, 0.0));
+    glLoadMatrix(mv.ptr());
 
     // Map the -1:1 square to a 55.0x41.25 degree wide patch at z=1.
     // This is the default fgfs field of view, which the HUD files are
@@ -236,10 +240,11 @@
 
 void HUD::draw2D(GLfloat x_start, GLfloat y_start, GLfloat x_end, GLfloat y_end)
 {
+    using namespace osg;
     glMatrixMode(GL_PROJECTION);
     glPushMatrix();
-    glLoadIdentity();
-    gluOrtho2D(x_start, x_end, y_start, y_end);
+    Matrixf proj = Matrixf::ortho2D(x_start, x_end, y_start, y_end);
+    glLoadMatrix(proj.ptr());
 
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
--- flightgear-2.0.0.orig/src/Main/options.cxx
+++ flightgear-2.0.0/src/Main/options.cxx
@@ -179,7 +179,7 @@
     fgSetString("/sim/startup/browser-app", "launchWebJumper");
 #else
     envp = ::getenv( "WEBBROWSER" );
-    if (!envp) envp = "netscape";
+    if (!envp) envp = "sensible-browser";
     fgSetString("/sim/startup/browser-app", envp);
 #endif
     fgSetString("/sim/logging/priority", "alert");
--- flightgear-2.0.0.orig/src/Main/fgviewer.cxx
+++ flightgear-2.0.0/src/Main/fgviewer.cxx
@@ -149,15 +149,14 @@
     osgGA::KeySwitchMatrixManipulator* keyswitchManipulator;
     keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
 
-    osgGA::MatrixManipulator* mm = new osgGA::TrackballManipulator;
-    keyswitchManipulator->addMatrixManipulator('1', "Trackball", mm);
-    mm = new osgGA::FlightManipulator;
-    keyswitchManipulator->addMatrixManipulator('2', "Flight", mm);
-    mm = new osgGA::DriveManipulator;
-    keyswitchManipulator->addMatrixManipulator('3', "Drive", mm);
-    mm = new osgGA::TerrainManipulator;
-    keyswitchManipulator->addMatrixManipulator('4', "Terrain", mm);
-
+    keyswitchManipulator->addMatrixManipulator('1', "Trackball",
+                                               new osgGA::TrackballManipulator);
+    keyswitchManipulator->addMatrixManipulator('2', "Flight",
+                                               new osgGA::FlightManipulator);
+    keyswitchManipulator->addMatrixManipulator('3', "Drive",
+                                               new osgGA::DriveManipulator);
+    keyswitchManipulator->addMatrixManipulator('4', "Terrain",
+                                               new osgGA::TerrainManipulator);
     viewer.setCameraManipulator(keyswitchManipulator);
 
     // Usefull stats
--- flightgear-2.0.0.orig/src/Main/fg_os_osgviewer.cxx
+++ flightgear-2.0.0/src/Main/fg_os_osgviewer.cxx
@@ -45,7 +45,6 @@
 #include <osg/View>
 #include <osgViewer/ViewerEventHandlers>
 #include <osgViewer/Viewer>
-#include <osgGA/MatrixManipulator>
 
 #include <Include/general.hxx>
 #include <Scenery/scenery.hxx>
--- flightgear-2.0.0.orig/src/Main/metar_main.cxx
+++ flightgear-2.0.0/src/Main/metar_main.cxx
@@ -30,6 +30,13 @@
 #include <simgear/environment/metar.hxx>
 #include <simgear/structure/exception.hxx>
 
+// hack to allow dynamic linking;
+// I can't seem to get static linkage to work properly (without causing segfaults)
+// in the current Debian packaging for some reason (and I don't want to
+// do a repackaging at the moment), and dynamic linkage fails without this.
+#include <simgear/scene/sky/sky.hxx>
+SGSky *thesky;
+
 using namespace std;
 
 // text color
