Ubuntu
flightgear package

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

  1. Oneiric (11.10)
  2. fix-749249
  3. Merge into oneiric
Proposed by Julian Taylor
Status: Merged
Merged at revision: 17
Proposed branch: lp:~jtaylor/ubuntu/oneiric/flightgear/fix-749249
Merge into: lp:ubuntu/oneiric/flightgear
Diff against target: 46 lines (+15/-2)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
utils/propmerge/Makefile.in (+5/-1)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/flightgear/fix-749249
Reviewer Review Type Date Requested Status
Fabrice Coutadeur (community) Approve
Review via email: mp+72008@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

Uploaded. Thanks a lot!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-07-22 01:58:19 +0000
3+++ debian/changelog 2011-08-18 09:03:29 +0000
4@@ -1,3 +1,11 @@
5+flightgear (2.0.0-4ubuntu1) oneiric; urgency=low
6+
7+ * patch utils/propmerge/Makefile.in
8+ - fix build with ld --as-needed (LP: #749249)
9+ * rebuild fixes LP: #827667
10+
11+ -- Julian Taylor <jtaylor.debian@googlemail.com> Thu, 18 Aug 2011 10:49:06 +0200
12+
13 flightgear (2.0.0-4) unstable; urgency=low
14
15 * Backported a bunch of upstream commits (from their git tree)
16
17=== modified file 'debian/control'
18--- debian/control 2011-01-30 15:46:35 +0000
19+++ debian/control 2011-08-18 09:03:29 +0000
20@@ -1,7 +1,8 @@
21 Source: flightgear
22 Section: games
23 Priority: extra
24-Maintainer: Debian FlightGear Crew <pkg-fgfs-crew@lists.alioth.debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Debian FlightGear Crew <pkg-fgfs-crew@lists.alioth.debian.org>
27 Uploaders: Ove Kaaven <ovek@arcticnet.no>
28 Build-Depends: debhelper (>> 5),
29 libx11-dev, libxext-dev, libxi-dev, libice-dev, libsm-dev, libxt-dev, libxmu-dev,
30
31=== modified file 'utils/propmerge/Makefile.in'
32--- utils/propmerge/Makefile.in 2010-10-03 19:39:36 +0000
33+++ utils/propmerge/Makefile.in 2011-08-18 09:03:29 +0000
34@@ -196,7 +196,11 @@
35 top_builddir = @top_builddir@
36 top_srcdir = @top_srcdir@
37 propmerge_SOURCES = propmerge.cxx
38-propmerge_LDADD = -lsgprops -lsgxml -lsgio -lsgmisc -lsgdebug -lsgstructure
39+propmerge_LDADD = -lsgprops -lsgxml -lsgio -lsgdebug -lsgstructure
40+# required for --as-needed default: https://bugs.launchpad.net/ubuntu/+bug/749249
41+# we don't directly need sgmisc here but its missing links cannot easily be fixed due
42+# to circular dependencies in simgear, use LIBS as it is last on the commandline
43+LIBS += -Wl,--no-as-needed -lsgmisc
44 all: all-am
45
46 .SUFFIXES:

Subscribers

People subscribed via source and target branches

to all changes: