Merge lp:~jtaylor/ubuntu/oneiric/powermanga/fix-771039 into lp:ubuntu/oneiric/powermanga

Proposed by Julian Taylor
Status: Merged
Merged at revision: 10
Proposed branch: lp:~jtaylor/ubuntu/oneiric/powermanga/fix-771039
Merge into: lp:ubuntu/oneiric/powermanga
Diff against target: 62 lines (+30/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/040_link_libm.diff (+20/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/powermanga/fix-771039
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Ubuntu branches Pending
Review via email: mp+74218@code.launchpad.net

Description of the change

fix ftbs by simply linking libm
patch was forwarded to debian on 07 jul with no reaction.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Thanks a lot for your work there! Looks good :)
(please note that you didn't patch Makefile.am, so people will have to take care if they run autoreconf as your change will be erased. We tend to patch both normally). I fixed that for you.

As debian didn't answer, you can maybe send the patch upstream directly?

Sponsoring now, thanks again :)

review: Approve
Revision history for this message
Julian Taylor (jtaylor) wrote :
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

excellent, thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-11-13 14:28:30 +0000
+++ debian/changelog 2011-09-06 13:44:25 +0000
@@ -1,3 +1,10 @@
1powermanga (0.90-dfsg-2ubuntu1) oneiric; urgency=low
2
3 * debian/patches/040_link_libm.diff:
4 - link with needed libm (LP: #771039)
5
6 -- Julian Taylor <jtaylor.debian@googlemail.com> Tue, 06 Sep 2011 15:36:13 +0200
7
1powermanga (0.90-dfsg-2) unstable; urgency=low8powermanga (0.90-dfsg-2) unstable; urgency=low
29
3 [ Cyril Brulebois ]10 [ Cyril Brulebois ]
411
=== modified file 'debian/control'
--- debian/control 2009-11-13 14:28:30 +0000
+++ debian/control 2011-09-06 13:44:25 +0000
@@ -1,7 +1,8 @@
1Source: powermanga1Source: powermanga
2Section: games2Section: games
3Priority: optional3Priority: optional
4Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
5Uploaders: Sam Hocevar (Debian packages) <sam+deb@zoy.org>, Barry deFreese <bdefreese@debian.org>6Uploaders: Sam Hocevar (Debian packages) <sam+deb@zoy.org>, Barry deFreese <bdefreese@debian.org>
6Build-Depends: debhelper (>= 5.0), quilt, libx11-dev, libxext-dev, libxxf86dga-dev, libxxf86vm-dev, libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev, zlib1g-dev7Build-Depends: debhelper (>= 5.0), quilt, libx11-dev, libxext-dev, libxxf86dga-dev, libxxf86vm-dev, libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev, zlib1g-dev
7Standards-Version: 3.8.38Standards-Version: 3.8.3
89
=== added file 'debian/patches/040_link_libm.diff'
--- debian/patches/040_link_libm.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/040_link_libm.diff 2011-09-06 13:44:25 +0000
@@ -0,0 +1,20 @@
1Description: link against needed libm
2 libm is used directly by powermanga so one must link with it
3 previously it relied on indirect linkage by its dependencies.
4 If these are built with ld --as-needed --no-copy-dt-needed
5 the indirect linkage is missing
6Author: Julian Taylor <jtaylor.debian@googlemail.com>
7Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/powermanga/+bug/771039
8Index: powermanga-0.90-dfsg/src/Makefile.in
9===================================================================
10--- powermanga-0.90-dfsg.orig/src/Makefile.in 2011-07-07 11:17:04.733971865 +0200
11+++ powermanga-0.90-dfsg/src/Makefile.in 2011-07-07 11:17:02.483971863 +0200
12@@ -226,7 +226,7 @@
13 powermanga_SOURCES = $(SOURCES_MAIN) $(SOURCES_EXTRA)
14 #powermanga_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@
15 powermanga_CFLAGS = -DPREFIX=\"$(prefix)\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@
16-powermanga_LDADD = @XLIB_LIBS@ @SDL_LIBS@
17+powermanga_LDADD = @XLIB_LIBS@ @SDL_LIBS@ -lm
18 @ASSEMBLY_FALSE@SOURCES_EXTRA = gfxroutines.c gfxroutines.h
19 @ASSEMBLY_TRUE@SOURCES_EXTRA = assembler.S assembler_opt.S assembler.h
20 SOURCES_MAIN = \
021
=== modified file 'debian/patches/series'
--- debian/patches/series 2009-11-13 14:28:30 +0000
+++ debian/patches/series 2011-09-06 13:44:25 +0000
@@ -2,3 +2,4 @@
2010_scoredir_path.diff2010_scoredir_path.diff
3020_copyright.diff3020_copyright.diff
4030_manpage_typo.diff4030_manpage_typo.diff
5040_link_libm.diff

Subscribers

People subscribed via source and target branches

to all changes: