Merge lp:~jtaylor/ubuntu/oneiric/tenmado/fix-832831 into lp:ubuntu/oneiric/tenmado

[Julian Taylor]

fix ftbs and change to quilt 3.0 (format)

[Fabrice Coutadeur (fabricesp)]

Hi,

To reduce the diff between Debian and Ubuntu, please use the same 'patch system' as used in Debian. In this case, as the previous changes has been made inline, without any do the same with your changes.

Otherwise, looks good.

Once you do that change, I'll build your branch.

Thanks,
Fabrice

review: Needs Fixing

[lp:~jtaylor/ubuntu/oneiric/tenmado/fix-832831]

10. By Julian Taylor on 2011-09-09

remove 3.0 (quilt) patchsystem

[Julian Taylor (jtaylor)]

done, also patched .am in case it .in is regenerated, as per advice I got from a sponsor on a different package.

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2009-11-16 14:39:24 +0000
+++ Makefile.am	2011-09-09 08:58:31 +0000
@@ -42,7 +42,7 @@
 
 # -g -O2 are in CFLAGS by default, don't use @CFLAGS@ here
 AM_CFLAGS = $(SDL_CFLAGS) $(CC_WARNINGS)
-AM_LDFLAGS = @LIBS@ $(SDL_LIBS)
+AM_LDFLAGS = @LIBS@
 
 AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
   -DLOCALSTATEDIR=\"$(localstatedir)\" \
@@ -53,7 +53,8 @@
 # there is no AM_LDADD
 tenmado_LDADD = $(top_srcdir)/happy-L/libhappy-L.a \
   $(top_srcdir)/libbac/libbac.a \
-  $(top_srcdir)/libtenm/libtenm.a
+  $(top_srcdir)/libtenm/libtenm.a \
+  $(SDL_LIBS)
 
 man_MANS = tenmado.6
 

=== modified file 'Makefile.in'
--- Makefile.in	2009-11-16 14:39:24 +0000
+++ Makefile.in	2011-09-09 08:58:31 +0000
@@ -168,7 +168,7 @@
 
 # -g -O2 are in CFLAGS by default, don't use @CFLAGS@ here
 AM_CFLAGS = $(SDL_CFLAGS) $(CC_WARNINGS)
-AM_LDFLAGS = @LIBS@ $(SDL_LIBS)
+AM_LDFLAGS = @LIBS@
 
 AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
   -DLOCALSTATEDIR=\"$(localstatedir)\" \
@@ -180,7 +180,8 @@
 # there is no AM_LDADD
 tenmado_LDADD = $(top_srcdir)/happy-L/libhappy-L.a \
   $(top_srcdir)/libbac/libbac.a \
-  $(top_srcdir)/libtenm/libtenm.a
+  $(top_srcdir)/libtenm/libtenm.a \
+  $(SDL_LIBS)
 
 
 man_MANS = tenmado.6

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-16 14:39:24 +0000
+++ debian/changelog	2011-09-09 08:58:31 +0000
@@ -1,3 +1,9 @@
+tenmado (0.8-1ubuntu1) oneiric; urgency=low
+
+  * patch Makefile.{in,am} to fix ftbs with ld --as-needed (LP: #832831)
+
+ -- Julian Taylor <[e-mail]>  Wed, 31 Aug 2011 20:28:51 +0200
+
 tenmado (0.8-1) unstable; urgency=low
 
   * new upstream release

=== added file 'debian/patches/fix-as-needed-build.patch'
--- debian/patches/fix-as-needed-build.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-as-needed-build.patch	2011-09-09 08:58:31 +0000
@@ -0,0 +1,50 @@
+Description: fix build with ld --as-needed
+ libraries must be behind objects needing their symbols
+Author: Julian Taylor <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tenmado/+bug/832831
+Index: fix-832831/Makefile.in
+===================================================================
+--- fix-832831.orig/Makefile.in	2011-09-09 10:48:15.383308000 +0200
++++ fix-832831/Makefile.in	2011-09-09 10:48:20.854477520 +0200
+@@ -168,7 +168,7 @@
+ 
+ # -g -O2 are in CFLAGS by default, don't use @CFLAGS@ here
+ AM_CFLAGS = $(SDL_CFLAGS) $(CC_WARNINGS)
+-AM_LDFLAGS = @LIBS@ $(SDL_LIBS)
++AM_LDFLAGS = @LIBS@
+ 
+ AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
+   -DLOCALSTATEDIR=\"$(localstatedir)\" \
+@@ -180,7 +180,8 @@
+ # there is no AM_LDADD
+ tenmado_LDADD = $(top_srcdir)/happy-L/libhappy-L.a \
+   $(top_srcdir)/libbac/libbac.a \
+-  $(top_srcdir)/libtenm/libtenm.a
++  $(top_srcdir)/libtenm/libtenm.a \
++  $(SDL_LIBS)
+ 
+ 
+ man_MANS = tenmado.6
+Index: fix-832831/Makefile.am
+===================================================================
+--- fix-832831.orig/Makefile.am	2011-09-09 10:48:26.584477450 +0200
++++ fix-832831/Makefile.am	2011-09-09 10:48:52.454477135 +0200
+@@ -42,7 +42,7 @@
+ 
+ # -g -O2 are in CFLAGS by default, don't use @CFLAGS@ here
+ AM_CFLAGS = $(SDL_CFLAGS) $(CC_WARNINGS)
+-AM_LDFLAGS = @LIBS@ $(SDL_LIBS)
++AM_LDFLAGS = @LIBS@
+ 
+ AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
+   -DLOCALSTATEDIR=\"$(localstatedir)\" \
+@@ -53,7 +53,8 @@
+ # there is no AM_LDADD
+ tenmado_LDADD = $(top_srcdir)/happy-L/libhappy-L.a \
+   $(top_srcdir)/libbac/libbac.a \
+-  $(top_srcdir)/libtenm/libtenm.a
++  $(top_srcdir)/libtenm/libtenm.a \
++  $(SDL_LIBS)
+ 
+ man_MANS = tenmado.6
+