Merge lp:~jtaylor/ubuntu/oneiric/flightgear/fix-749249 into lp:ubuntu/oneiric/flightgear

[Julian Taylor]

[Fabrice Coutadeur (fabricesp)]

Uploaded. Thanks a lot!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-22 01:58:19 +0000
+++ debian/changelog	2011-08-18 09:03:29 +0000
@@ -1,3 +1,11 @@
+flightgear (2.0.0-4ubuntu1) oneiric; urgency=low
+
+  * patch utils/propmerge/Makefile.in 
+    - fix build with ld --as-needed (LP: #749249)
+  * rebuild fixes LP: #827667
+
+ -- Julian Taylor <[e-mail]>  Thu, 18 Aug 2011 10:49:06 +0200
+
 flightgear (2.0.0-4) unstable; urgency=low
 
   * Backported a bunch of upstream commits (from their git tree)
 
=== modified file 'debian/control'
--- debian/control	2011-01-30 15:46:35 +0000
+++ debian/control	2011-08-18 09:03:29 +0000
@@ -1,7 +1,8 @@
 Source: flightgear
 Section: games
 Priority: extra
-Maintainer: Debian FlightGear Crew <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian FlightGear Crew <[e-mail]>
 Uploaders: Ove Kaaven <[e-mail]>
 Build-Depends: debhelper (>> 5),
  libx11-dev, libxext-dev, libxi-dev, libice-dev, libsm-dev, libxt-dev, libxmu-dev,
 
=== modified file 'utils/propmerge/Makefile.in'
--- utils/propmerge/Makefile.in	2010-10-03 19:39:36 +0000
+++ utils/propmerge/Makefile.in	2011-08-18 09:03:29 +0000
@@ -196,7 +196,11 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 propmerge_SOURCES = propmerge.cxx
-propmerge_LDADD = -lsgprops -lsgxml -lsgio -lsgmisc -lsgdebug -lsgstructure
+propmerge_LDADD = -lsgprops -lsgxml -lsgio -lsgdebug -lsgstructure
+# required for --as-needed default: https://bugs.launchpad.net/ubuntu/+bug/749249
+# we don't directly need sgmisc here but its missing links cannot easily be fixed due
+# to circular dependencies in simgear, use LIBS as it is last on the commandline
+LIBS += -Wl,--no-as-needed -lsgmisc
 all: all-am
 
 .SUFFIXES: