Merge lp:~jtaylor/ubuntu/oneiric/osm2pgsql/fix-803191 into lp:ubuntu/oneiric/osm2pgsql

[Julian Taylor]

fix ftbs

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-19 16:15:54 +0000
+++ debian/changelog	2011-08-21 14:40:25 +0000
@@ -1,3 +1,10 @@
+osm2pgsql (0.70.5+r25090-2ubuntu1) oneiric; urgency=low
+
+  * debian/patches/02-fix-as-needed-build.patch:
+    - fix build with ld --as-needed (LP: #803191)
+
+ -- Julian Taylor <[e-mail]>  Sun, 21 Aug 2011 16:32:05 +0200
+
 osm2pgsql (0.70.5+r25090-2) unstable; urgency=low
 
   * Fix Maintainer e-mail address
 
=== modified file 'debian/control'
--- debian/control	2011-01-19 16:15:54 +0000
+++ debian/control	2011-08-21 14:40:25 +0000
@@ -1,7 +1,8 @@
 Source: osm2pgsql
 Section: utils
 Priority: optional
-Maintainer: Debian GIS Project <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GIS Project <[e-mail]>
 Uploaders:
  Andreas Putzo <[e-mail]>
  , Francesco Paolo Lovergine <[e-mail]>
 
=== added file 'debian/patches/02-fix-as-needed-build.patch'
--- debian/patches/02-fix-as-needed-build.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02-fix-as-needed-build.patch	2011-08-21 14:40:25 +0000
@@ -0,0 +1,53 @@
+Description: fix build with ld --as-needed
+ The zlib and bzip m4 macros wrongly use LDFLAGS to link with libraries.
+ This leads to wrong ordering on the command line.
+ With ld --as-needed the libraries must be placed after the objects
+ needing them.
+ The LIBS variable must be used to archive the correct ordering.
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/osm2pgsql/+bug/803191
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632724
+Author: Julian Taylor <[e-mail]>
+--- osm2pgsql-0.70.5+r25090.orig/m4/ax_lib_zlib.m4
++++ osm2pgsql-0.70.5+r25090/m4/ax_lib_zlib.m4
+@@ -117,8 +117,8 @@ AC_DEFUN([AX_LIB_ZLIB],
+         saved_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="$CPPFLAGS -I$zlib_include_dir"
+ 
+-        saved_LDFLAGS="$LDFLAGS"
+-        LDFLAGS="$LDFLAGS $zlib_lib_flags"
++        saved_LIBS="$LIBS"
++        LIBS="$LIBS $zlib_lib_flags"
+ 
+         dnl
+         dnl Check zlib headers
+@@ -178,7 +178,7 @@ AC_DEFUN([AX_LIB_ZLIB],
+         fi
+ 
+         CPPFLAGS="$saved_CPPFLAGS"
+-        LDFLAGS="$saved_LDFLAGS"
++        LIBS="$saved_LIBS"
+     fi
+ 
+     AC_MSG_CHECKING([for zlib compression library])
+--- osm2pgsql-0.70.5+r25090.orig/m4/ax_lib_bzip2.m4
++++ osm2pgsql-0.70.5+r25090/m4/ax_lib_bzip2.m4
+@@ -117,8 +117,8 @@ AC_DEFUN([AX_LIB_BZIP2],
+         saved_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="$CPPFLAGS -I$bzlib_include_dir"
+ 
+-        saved_LDFLAGS="$LDFLAGS"
+-        LDFLAGS="$LDFLAGS $bzlib_lib_flags"
++        saved_LIBS="$LIBS"
++        LIBS="$LIBS $bzlib_lib_flags"
+ 
+         dnl
+         dnl Check bzip2 headers
+@@ -178,7 +178,7 @@ AC_DEFUN([AX_LIB_BZIP2],
+         fi
+ 
+         CPPFLAGS="$saved_CPPFLAGS"
+-        LDFLAGS="$saved_LDFLAGS"
++        LIBS="$saved_LIBS"
+     fi
+ 
+     AC_MSG_CHECKING([for bzip2 compression library])
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-01-18 22:13:02 +0000
+++ debian/patches/series	2011-08-21 14:40:25 +0000
@@ -1,2 +1,3 @@
 00-fix_build.patch
 01-disable_gazetteer.patch
+02-fix-as-needed-build.patch