Ubuntu
tenmado package

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

  1. Oneiric (11.10)
  2. fix-832831
  3. Merge into oneiric
Proposed by Julian Taylor
Status: Merged
Merged at revision: 7
Proposed branch: lp:~jtaylor/ubuntu/oneiric/tenmado/fix-832831
Merge into: lp:ubuntu/oneiric/tenmado
Diff against target: 114 lines (+62/-4)
4 files modified
Makefile.am (+3/-2)
Makefile.in (+3/-2)
debian/changelog (+6/-0)
debian/patches/fix-as-needed-build.patch (+50/-0)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/tenmado/fix-832831
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Fabrice Coutadeur (community) Needs Fixing
Ubuntu branches Pending
Review via email: mp+74556@code.launchpad.net

Description of the change

fix ftbs and change to quilt 3.0 (format)

To post a comment you must log in.
Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

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 updated
10. By Julian Taylor

remove 3.0 (quilt) patchsystem

Revision history for this message
Julian Taylor (jtaylor) wrote :

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

Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
4242
43# -g -O2 are in CFLAGS by default, don't use @CFLAGS@ here43# -g -O2 are in CFLAGS by default, don't use @CFLAGS@ here
44AM_CFLAGS = $(SDL_CFLAGS) $(CC_WARNINGS)44AM_CFLAGS = $(SDL_CFLAGS) $(CC_WARNINGS)
45AM_LDFLAGS = @LIBS@ $(SDL_LIBS)45AM_LDFLAGS = @LIBS@
4646
47AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \47AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
48 -DLOCALSTATEDIR=\"$(localstatedir)\" \48 -DLOCALSTATEDIR=\"$(localstatedir)\" \
@@ -53,7 +53,8 @@
53# there is no AM_LDADD53# there is no AM_LDADD
54tenmado_LDADD = $(top_srcdir)/happy-L/libhappy-L.a \54tenmado_LDADD = $(top_srcdir)/happy-L/libhappy-L.a \
55 $(top_srcdir)/libbac/libbac.a \55 $(top_srcdir)/libbac/libbac.a \
56 $(top_srcdir)/libtenm/libtenm.a56 $(top_srcdir)/libtenm/libtenm.a \
57 $(SDL_LIBS)
5758
58man_MANS = tenmado.659man_MANS = tenmado.6
5960
6061
=== 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 @@
168168
169# -g -O2 are in CFLAGS by default, don't use @CFLAGS@ here169# -g -O2 are in CFLAGS by default, don't use @CFLAGS@ here
170AM_CFLAGS = $(SDL_CFLAGS) $(CC_WARNINGS)170AM_CFLAGS = $(SDL_CFLAGS) $(CC_WARNINGS)
171AM_LDFLAGS = @LIBS@ $(SDL_LIBS)171AM_LDFLAGS = @LIBS@
172172
173AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \173AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
174 -DLOCALSTATEDIR=\"$(localstatedir)\" \174 -DLOCALSTATEDIR=\"$(localstatedir)\" \
@@ -180,7 +180,8 @@
180# there is no AM_LDADD180# there is no AM_LDADD
181tenmado_LDADD = $(top_srcdir)/happy-L/libhappy-L.a \181tenmado_LDADD = $(top_srcdir)/happy-L/libhappy-L.a \
182 $(top_srcdir)/libbac/libbac.a \182 $(top_srcdir)/libbac/libbac.a \
183 $(top_srcdir)/libtenm/libtenm.a183 $(top_srcdir)/libtenm/libtenm.a \
184 $(SDL_LIBS)
184185
185186
186man_MANS = tenmado.6187man_MANS = tenmado.6
187188
=== 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 @@
1tenmado (0.8-1ubuntu1) oneiric; urgency=low
2
3 * patch Makefile.{in,am} to fix ftbs with ld --as-needed (LP: #832831)
4
5 -- Julian Taylor <jtaylor.debian@googlemail.com> Wed, 31 Aug 2011 20:28:51 +0200
6
1tenmado (0.8-1) unstable; urgency=low7tenmado (0.8-1) unstable; urgency=low
28
3 * new upstream release9 * new upstream release
410
=== 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 @@
1Description: fix build with ld --as-needed
2 libraries must be behind objects needing their symbols
3Author: Julian Taylor <jtaylor.debian@googlemail.com>
4Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tenmado/+bug/832831
5Index: fix-832831/Makefile.in
6===================================================================
7--- fix-832831.orig/Makefile.in 2011-09-09 10:48:15.383308000 +0200
8+++ fix-832831/Makefile.in 2011-09-09 10:48:20.854477520 +0200
9@@ -168,7 +168,7 @@
10
11 # -g -O2 are in CFLAGS by default, don't use @CFLAGS@ here
12 AM_CFLAGS = $(SDL_CFLAGS) $(CC_WARNINGS)
13-AM_LDFLAGS = @LIBS@ $(SDL_LIBS)
14+AM_LDFLAGS = @LIBS@
15
16 AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
17 -DLOCALSTATEDIR=\"$(localstatedir)\" \
18@@ -180,7 +180,8 @@
19 # there is no AM_LDADD
20 tenmado_LDADD = $(top_srcdir)/happy-L/libhappy-L.a \
21 $(top_srcdir)/libbac/libbac.a \
22- $(top_srcdir)/libtenm/libtenm.a
23+ $(top_srcdir)/libtenm/libtenm.a \
24+ $(SDL_LIBS)
25
26
27 man_MANS = tenmado.6
28Index: fix-832831/Makefile.am
29===================================================================
30--- fix-832831.orig/Makefile.am 2011-09-09 10:48:26.584477450 +0200
31+++ fix-832831/Makefile.am 2011-09-09 10:48:52.454477135 +0200
32@@ -42,7 +42,7 @@
33
34 # -g -O2 are in CFLAGS by default, don't use @CFLAGS@ here
35 AM_CFLAGS = $(SDL_CFLAGS) $(CC_WARNINGS)
36-AM_LDFLAGS = @LIBS@ $(SDL_LIBS)
37+AM_LDFLAGS = @LIBS@
38
39 AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
40 -DLOCALSTATEDIR=\"$(localstatedir)\" \
41@@ -53,7 +53,8 @@
42 # there is no AM_LDADD
43 tenmado_LDADD = $(top_srcdir)/happy-L/libhappy-L.a \
44 $(top_srcdir)/libbac/libbac.a \
45- $(top_srcdir)/libtenm/libtenm.a
46+ $(top_srcdir)/libtenm/libtenm.a \
47+ $(SDL_LIBS)
48
49 man_MANS = tenmado.6
50

Subscribers

People subscribed via source and target branches

to all changes: