Ubuntu

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

Proposed by Julian Taylor on 2011-09-06
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
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/powermanga/fix-771039
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2011-09-08
Ubuntu branches 2011-09-06 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.
Didier Roche (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
Didier Roche (didrocks) wrote :

excellent, thanks!

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2009-11-13 14:28:30 +0000
3+++ debian/changelog 2011-09-06 13:44:25 +0000
4@@ -1,3 +1,10 @@
5+powermanga (0.90-dfsg-2ubuntu1) oneiric; urgency=low
6+
7+ * debian/patches/040_link_libm.diff:
8+ - link with needed libm (LP: #771039)
9+
10+ -- Julian Taylor <jtaylor.debian@googlemail.com> Tue, 06 Sep 2011 15:36:13 +0200
11+
12 powermanga (0.90-dfsg-2) unstable; urgency=low
13
14 [ Cyril Brulebois ]
15
16=== modified file 'debian/control'
17--- debian/control 2009-11-13 14:28:30 +0000
18+++ debian/control 2011-09-06 13:44:25 +0000
19@@ -1,7 +1,8 @@
20 Source: powermanga
21 Section: games
22 Priority: optional
23-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25+XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
26 Uploaders: Sam Hocevar (Debian packages) <sam+deb@zoy.org>, Barry deFreese <bdefreese@debian.org>
27 Build-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
28 Standards-Version: 3.8.3
29
30=== added file 'debian/patches/040_link_libm.diff'
31--- debian/patches/040_link_libm.diff 1970-01-01 00:00:00 +0000
32+++ debian/patches/040_link_libm.diff 2011-09-06 13:44:25 +0000
33@@ -0,0 +1,20 @@
34+Description: link against needed libm
35+ libm is used directly by powermanga so one must link with it
36+ previously it relied on indirect linkage by its dependencies.
37+ If these are built with ld --as-needed --no-copy-dt-needed
38+ the indirect linkage is missing
39+Author: Julian Taylor <jtaylor.debian@googlemail.com>
40+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/powermanga/+bug/771039
41+Index: powermanga-0.90-dfsg/src/Makefile.in
42+===================================================================
43+--- powermanga-0.90-dfsg.orig/src/Makefile.in 2011-07-07 11:17:04.733971865 +0200
44++++ powermanga-0.90-dfsg/src/Makefile.in 2011-07-07 11:17:02.483971863 +0200
45+@@ -226,7 +226,7 @@
46+ powermanga_SOURCES = $(SOURCES_MAIN) $(SOURCES_EXTRA)
47+ #powermanga_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@
48+ powermanga_CFLAGS = -DPREFIX=\"$(prefix)\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@
49+-powermanga_LDADD = @XLIB_LIBS@ @SDL_LIBS@
50++powermanga_LDADD = @XLIB_LIBS@ @SDL_LIBS@ -lm
51+ @ASSEMBLY_FALSE@SOURCES_EXTRA = gfxroutines.c gfxroutines.h
52+ @ASSEMBLY_TRUE@SOURCES_EXTRA = assembler.S assembler_opt.S assembler.h
53+ SOURCES_MAIN = \
54
55=== modified file 'debian/patches/series'
56--- debian/patches/series 2009-11-13 14:28:30 +0000
57+++ debian/patches/series 2011-09-06 13:44:25 +0000
58@@ -2,3 +2,4 @@
59 010_scoredir_path.diff
60 020_copyright.diff
61 030_manpage_typo.diff
62+040_link_libm.diff

Subscribers

People subscribed via source and target branches

to all changes: