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

[Sebastian Carneiro]

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

Thanks.

[Marc Deslauriers (mdeslaur)]

Looks good, ACK. Thanks!

review: Approve

=== modified file 'Makefile'
--- Makefile	2004-04-25 15:45:50 +0000
+++ Makefile	2011-07-27 12:38:20 +0000
@@ -17,7 +17,7 @@
 else
 CFLAGS += -O2
 endif
-LDFLAGS = -lm /usr/lib/libpng.so /usr/lib/libz.so
+LDFLAGS = -lm -lpng -lz
 
 # HPUX
 #CC = cc
 
=== modified file 'Makefile.in'
--- Makefile.in	2004-04-25 15:45:50 +0000
+++ Makefile.in	2011-07-27 12:38:20 +0000
@@ -8,6 +8,8 @@
 make: all
 
 stereograph: $(OBJ0)
+	gcc -g -o $@ $(OBJ0) $(LDFLAGS)
+
 stereograph.o: stereograph.c stereograph.h renderer.h gfxio.h globals.h
 renderer.o: renderer.c renderer.h globals.h
 gfxio.o: gfxio.c gfxio.h renderer.h globals.h
 
=== modified file 'debian/changelog'
--- debian/changelog	2005-10-10 02:38:01 +0000
+++ debian/changelog	2011-07-27 12:38:20 +0000
@@ -1,3 +1,16 @@
+stereograph (0.30a-6ubuntu1) oneiric; urgency=low
+
+  * Changed library references, changed and updated parameters
+    to linker to solve FTBFS (LP: #755934):
+    - Makefile: replaced hardcoded libraries with library 
+      parameters for libpng and libz.
+    - Makefile.in: added target to build stereograph executable
+      putting the library references after the objects that
+      needs them, to build with ld --no-as-needed.
+    - debian/control: updated build depends for libpng.
+
+ -- Sebastian Carneiro <[e-mail]>  Wed, 27 Jul 2011 09:18:43 -0300
+
 stereograph (0.30a-6) unstable; urgency=low
 
   * Build-Depend on libpng-dev instead of libpng2-dev (closes: #328340).
 
=== modified file 'debian/control'
--- debian/control	2005-10-10 02:38:01 +0000
+++ debian/control	2011-07-27 12:38:20 +0000
@@ -1,9 +1,10 @@
 Source: stereograph
 Section: graphics
 Priority: optional
-Maintainer: Peter Palfrader <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Peter Palfrader <[e-mail]>
 Standards-Version: 3.6.2
-Build-Depends: libpng-dev, debhelper, zlib1g-dev
+Build-Depends: libpng12-dev, debhelper, zlib1g-dev
 
 Package: stereograph
 Architecture: any