Merge lp:~jtaylor/ubuntu/oneiric/gnubik/fix-771114 into lp:ubuntu/oneiric/gnubik

[Julian Taylor]

fix ftbs

[Sebastien Bacher (seb128)]

Thank you for your work

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-26 16:07:56 +0000
+++ debian/changelog	2011-08-21 14:02:23 +0000
@@ -1,3 +1,10 @@
+gnubik (2.3-2ubuntu1) oneiric; urgency=low
+
+  * debian/patches/04-fix-as-needed-build.diff:
+    - fix build with ld --as-needed (LP: #771114)
+
+ -- Julian Taylor <[e-mail]>  Sun, 21 Aug 2011 15:49:59 +0200
+
 gnubik (2.3-2) unstable; urgency=low
 
   * debian/copyright: Updated.  Closes: #542244.
 
=== modified file 'debian/control'
--- debian/control	2009-09-26 16:07:56 +0000
+++ debian/control	2011-08-21 14:02:23 +0000
@@ -1,7 +1,8 @@
 Source: gnubik
 Section: games
 Priority: optional
-Maintainer: Bart Martens <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bart Martens <[e-mail]>
 Build-Depends: cdbs, debhelper (>= 5), autotools-dev, guile-1.8-dev, libgtkglext1-dev, autoconf (>= 2.61)
 Standards-Version: 3.8.3
 Homepage: http://www.gnu.org/software/gnubik/
 
=== added file 'debian/patches/04-fix-as-needed-build.diff'
--- debian/patches/04-fix-as-needed-build.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/04-fix-as-needed-build.diff	2011-08-21 14:02:23 +0000
@@ -0,0 +1,20 @@
+Description: fix build with ld --as-needed
+ when building with ld --as-needed libraries must be placed
+ after object files needing them on the command line so the symbols
+ of the libraries are registered as needed.
+ To get automake to emit the right order the libraries must be placed in
+ LDADD and not LDFLAGS.
+Author: Julian Taylor <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnubik/+bug/771114
+diff -Nur -x '*.orig' -x '*~' gnubik-2.3//Makefile.in gnubik-2.3.new//Makefile.in
+--- gnubik-2.3//Makefile.in	2009-01-06 04:02:34.000000000 +0100
++++ gnubik-2.3.new//Makefile.in	2011-07-08 11:52:12.745774746 +0200
+@@ -278,7 +278,7 @@
+ AM_CFLAGS = $(am__append_1)
+ src_gnubik_CPPFLAGS = $(AM_CPPFLAGS)
+ src_gnubik_CFLAGS = $(AM_CFLAGS) $(GTK_CFLAGS) $(GDK_GL_EXT_CFLAGS) $(GTK_GL_EXT_CFLAGS)
+-src_gnubik_LDFLAGS = $(GTK_LIBS) $(GDK_GL_EXT_LIBS) $(GTK_GL_EXT_LIBS)
++src_gnubik_LDADD = $(GTK_LIBS) $(GDK_GL_EXT_LIBS) $(GTK_GL_EXT_LIBS)
+ src_gnubik_SOURCES = \
+ 	src/colour-sel.c  \
+ 	src/colour-sel.h \