[SCM] WorldForge 3D client branch, master, updated. upstream/0.6.2-45-gc150605

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit c150605466bf0a1f9ae8c5ecbc199f9e35d644be
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Tue May 8 14:37:30 2012 -0700

    0013-remove-invalid-linker-flags.patch: remove an invalid linker flag

diff --git a/debian/changelog b/debian/changelog
index ebc3ef2..6c8b25a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ ember (0.6.2-1) unstable; urgency=low
   * 0010-fix-ember-script-args.patch: fix argument handling in script
   * 0011-qualify-template-function.patch: fixes FTBFS using GCC 4.7
   * 0012-fix-osdir-headers: adds required headers for POSIX.
+  * 0013-remove-invalid-linker-flags.patch: remove an invalid linker flag
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Tue, 08 May 2012 13:56:12 -0700
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Tue, 08 May 2012 14:28:55 -0700
 
 ember (0.5.7-1.1) unstable; urgency=high
 
diff --git a/debian/patches/0013-remove-invalid-linker-flags.patch b/debian/patches/0013-remove-invalid-linker-flags.patch
new file mode 100644
index 0000000..78e0cf2
--- /dev/null
+++ b/debian/patches/0013-remove-invalid-linker-flags.patch
@@ -0,0 +1,13 @@
+Description: Removes an invalid link flag (cased a fail under GCC 4.7)
+Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
+
+--- a/src/main/Makefile.am
++++ b/src/main/Makefile.am
+@@ -52,7 +52,6 @@
+ if !BUILD_WEBEMBER
+ bin_PROGRAMS = ember.bin
+ 
+-ember_bin_LDFLAGS = -Wl
+ ember_bin_LDADD = $(emberlibs)
+ ember_bin_SOURCES = $(embersources) $(top_srcdir)/src/main/Ember.cpp
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 88907a7..bb9f567 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0010-fix-ember-script-args.patch
 0011-qualify-template-functions.patch
 0012-fix-osdir-headers.patch
+0013-remove-invalid-linker-flags.patch

-- 
WorldForge 3D client