Incorporate some of the changes from the Linspire diff.

package/debian/README.Debian

@@ -0,0 +1,9 @@
+Flight Gear for Debian
+----------------------
+
+Start Flight Gear with fgfs.
+
+Additional scenery is available at http://www.flightgear.org/.
+They should be unpacked into /usr/share/games/FlightGear/Scenery.
+
+ -- Ove Kaaven <ovek@arcticnet.no>

package/debian/changelog

@@ -0,0 +1,179 @@
+flightgear (0.9.3-1.0.0.45.lindows0.1) unstable; urgency=low
+
+  * Added desktop file and icon
+  * replaced cchar* with const char* to compile against plib1.8.3
+
+ -- Brian Thomason <brian.thomason@lindows.com>  Wed, 26 May 2004 12:22:25 -0400
+
+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:

package/debian/control

@@ -0,0 +1,16 @@
+Source: flightgear
+Section: games
+Priority: extra
+Maintainer: Ove Kaaven <ovek@arcticnet.no>
+Build-Depends: debhelper (>> 3.0.0), xlibs-dev, xlibmesa-dev, libglut3-dev,
+ zlib1g-dev, autotools-dev, plib1.8.3-dev, simgear-dev (>= 0.3.4), sharutils,
+ libjpeg-dev, libmetakit2.4.9.2-dev | libmetakit1-dev (>= 2.4.3) | libmetakit-dev
+Standards-Version: 3.5.5
+
+Package: flightgear
+Architecture: any
+Depends: ${shlibs:Depends}, fgfs-base (>= 0.9.3)
+Description: Flight Gear Flight Simulator
+ Flight Gear is a free and highly sophisticated flight simulator.
+ .
+ This package contains the runtime binaries.

package/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.

package/debian/dirs

@@ -0,0 +1,3 @@
+usr/games
+usr/share/applnk/Applications/Games
+usr/share/icons/hicolor/48x48/apps

package/debian/docs

@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+Thanks

package/debian/menu

@@ -0,0 +1,2 @@
+?package(flightgear):needs=X11 section=Games/Simulation\
+  title="Flight Gear" command="/usr/games/fgfs"

package/debian/rules

@@ -0,0 +1,99 @@
+#!/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
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+CFLAGS=-O2 $(DEBUGFLAGS)
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS+=-g
+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-network-olk --with-threads
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-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) distclean
+	# weird... (and they still didn't fix it in 0.7.9)
+	rm -f src/Weather/Makefile
+
+	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
+	uudecode flightgear.png.uue
+	cp flightgear.png debian/flightgear/usr/share/icons/hicolor/48x48/apps
+	cp flightgear.desktop debian/flightgear/usr/share/applnk/Applications/Games
+
+# 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_testversion 2
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf	
+	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_installexamples
+	dh_installmenu
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installinit
+	dh_installcron
+	dh_installmanpages
+	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	# You may want to make some executables suid here.
+#	dh_suidregister
+#	dh_makeshlibs
+	dh_installdeb
+#	dh_perl
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

package/debian/watch

@@ -0,0 +1,3 @@
+# Site			Directory				Pattern				Version	Script
+#ftp.flightgear.org	/pub/fgfs/Source			FlightGear-(.*)\.tar\.gz	debian	uupdate
+ftp.ihg.uni-duisburg.de	/Mirrors/ftp.flightgear.org/Source	FlightGear-(.*)\.tar\.gz	debian	uupdate

package/flightgear.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Flight Gear
+Exec=artsdsp /usr/games/fgfs --geometry=1024x768 --enable-game-mode
+Terminal=false
+Type=Application
+Icon=flightgear

package/flightgear.png.uue

@@ -0,0 +1,133 @@
+begin 644 flightgear.png
+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
+LSE)@V<IR]L?CX=!),0!!Z#RS,L<4AO\'942`V>9%*2,`````245.1*Y"8((`
+`
+end

src/FDM/YASim/Makefile.am

@@ -43,7 +43,7 @@ noinst_PROGRAMS = proptest
 
 yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES)
 
-yasim_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug -lsgstructure  $(base_LIBS)
+yasim_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug -lsgstructure -lsgtiming  $(base_LIBS)
 
 proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES)
 proptest_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug -lsgstructure  $(base_LIBS)

src/Main/Makefile.am

@@ -22,7 +22,7 @@ else
 CLOUD3D_LIBS = 
 endif
 
-AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
+AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkgdatadir)\"
 
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 

src/Navaids/Makefile.am

@@ -9,12 +9,12 @@ libNavaids_a_SOURCES = \
 	navrecord.hxx
 
 #	ils.hxx ilslist.hxx ilslist.cxx \
-#	mkrbeacons.hxx mkrbeacons.cxx \
+#	mkrbeacons.hxx mkrbeacons.cxx 
-
+#
 # testnavs_SOURCES = testnavs.cxx
 # testnavs_LDADD = \
 # 	libNavaids.a \
 # 	-lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
-# 	$(base_LIBS) -lz
+# 	-lsgstructure $(base_LIBS) -lz
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

tests/Makefile.am

@@ -17,4 +17,4 @@ test_mktime_SOURCES = test-mktime.cxx
 test_text_SOURCES = test-text.cxx
 
 test_up_SOURCES = test-up.cxx
-test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lplibul $(base_LIBS)
+test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS)