Ubuntu
stereograph package

Merge lp:~scarneiro/ubuntu/oneiric/stereograph/fix-for-755934 into lp:ubuntu/oneiric/stereograph

  1. Oneiric (11.10)
  2. fix-for-755934
  3. Merge into oneiric
Proposed by Sebastian Carneiro
Status: Merged
Merged at revision: 5
Proposed branch: lp:~scarneiro/ubuntu/oneiric/stereograph/fix-for-755934
Merge into: lp:ubuntu/oneiric/stereograph
Diff against target: 63 lines (+19/-3)
4 files modified
Makefile (+1/-1)
Makefile.in (+2/-0)
debian/changelog (+13/-0)
debian/control (+3/-2)
To merge this branch: bzr merge lp:~scarneiro/ubuntu/oneiric/stereograph/fix-for-755934
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Ubuntu branches Pending
Review via email: mp+69448@code.launchpad.net

Description of the change

Updated library for libpng, changed Makefile to eliminate hardcoded library paths, and added target to fix FTBFS with ld --no-add-needed.-

Thanks.

To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Looks good, ACK. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2004-04-25 15:45:50 +0000
3+++ Makefile 2011-07-27 12:38:20 +0000
4@@ -17,7 +17,7 @@
5 else
6 CFLAGS += -O2
7 endif
8-LDFLAGS = -lm /usr/lib/libpng.so /usr/lib/libz.so
9+LDFLAGS = -lm -lpng -lz
10
11 # HPUX
12 #CC = cc
13
14=== modified file 'Makefile.in'
15--- Makefile.in 2004-04-25 15:45:50 +0000
16+++ Makefile.in 2011-07-27 12:38:20 +0000
17@@ -8,6 +8,8 @@
18 make: all
19
20 stereograph: $(OBJ0)
21+ gcc -g -o $@ $(OBJ0) $(LDFLAGS)
22+
23 stereograph.o: stereograph.c stereograph.h renderer.h gfxio.h globals.h
24 renderer.o: renderer.c renderer.h globals.h
25 gfxio.o: gfxio.c gfxio.h renderer.h globals.h
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2005-10-10 02:38:01 +0000
29+++ debian/changelog 2011-07-27 12:38:20 +0000
30@@ -1,3 +1,16 @@
31+stereograph (0.30a-6ubuntu1) oneiric; urgency=low
32+
33+ * Changed library references, changed and updated parameters
34+ to linker to solve FTBFS (LP: #755934):
35+ - Makefile: replaced hardcoded libraries with library
36+ parameters for libpng and libz.
37+ - Makefile.in: added target to build stereograph executable
38+ putting the library references after the objects that
39+ needs them, to build with ld --no-as-needed.
40+ - debian/control: updated build depends for libpng.
41+
42+ -- Sebastian Carneiro <scarneiro@fibertel.com.ar> Wed, 27 Jul 2011 09:18:43 -0300
43+
44 stereograph (0.30a-6) unstable; urgency=low
45
46 * Build-Depend on libpng-dev instead of libpng2-dev (closes: #328340).
47
48=== modified file 'debian/control'
49--- debian/control 2005-10-10 02:38:01 +0000
50+++ debian/control 2011-07-27 12:38:20 +0000
51@@ -1,9 +1,10 @@
52 Source: stereograph
53 Section: graphics
54 Priority: optional
55-Maintainer: Peter Palfrader <weasel@debian.org>
56+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
57+XSBC-Original-Maintainer: Peter Palfrader <weasel@debian.org>
58 Standards-Version: 3.6.2
59-Build-Depends: libpng-dev, debhelper, zlib1g-dev
60+Build-Depends: libpng12-dev, debhelper, zlib1g-dev
61
62 Package: stereograph
63 Architecture: any

Subscribers

People subscribed via source and target branches