[DebianGIS-dev] [SCM] osm2pgsql branch, master, updated. upstream/0.70.5+r25090-27-g903403d

[David Paleino]

The following commit has been merged in the master branch:
commit 903403dcfa4152b518f3d5093721a874d31a997c
Author: David Paleino <dapal at debian.org>
Date:   Tue Jan 18 21:34:08 2011 +0100

    Fix FTBFS, due to missing linkage with zlib (00-fix_build.patch)

diff --git a/debian/changelog b/debian/changelog
index 6d20362..a3e687e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ osm2pgsql (0.70.5+r25090-1) UNRELEASED; urgency=low
   * Use DEP-5 for debian/copyright
   * Clean protoc-generated files during the clean target
   * Updated manpage
+  * Fix FTBFS, due to missing linkage with zlib (00-fix_build.patch)
 
- -- David Paleino <dapal at debian.org>  Tue, 18 Jan 2011 21:26:47 +0100
+ -- David Paleino <dapal at debian.org>  Tue, 18 Jan 2011 21:33:39 +0100
 
 osm2pgsql (0.69+r20104-2) unstable; urgency=low
 
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
new file mode 100644
index 0000000..c62e24c
--- /dev/null
+++ b/debian/patches/00-fix_build.patch
@@ -0,0 +1,24 @@
+From: David Paleino <dapal at debian.org>
+Subject: add missing ZLIB linkage
+Forwarded: no
+
+---
+ Makefile.am |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- osm2pgsql.orig/Makefile.am
++++ osm2pgsql/Makefile.am
+@@ -35,10 +35,10 @@ BUILT_SOURCES = \
+ 
+ endif
+ 
+-AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(datadir)"' -DVERSION='"@PACKAGE_VERSION@"'
+-AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(datadir)"'
++AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ @ZLIB_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(datadir)"' -DVERSION='"@PACKAGE_VERSION@"'
++AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ @ZLIB_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(datadir)"'
+ 
+-AM_LDFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_LDFLAGS@ @XML2_LDFLAGS@ @BZIP2_LDFLAGS@ @GEOS_LDFLAGS@ @GEOS_LIBS@ @PROJ_LDFLAGS@ @PROTOBUF_C_LDFLAGS@
++AM_LDFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_LDFLAGS@ @XML2_LDFLAGS@ @BZIP2_LDFLAGS@ @GEOS_LDFLAGS@ @GEOS_LIBS@ @PROJ_LDFLAGS@ @PROTOBUF_C_LDFLAGS@ @ZLIB_LDFLAGS@
+ 
+ osm2pgsqldir = $(datadir)/osm2pgsql
+ osm2pgsql_DATA = default.style 900913.sql
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b75ec23
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00-fix_build.patch

-- 
OpenStreetMap data to PostgreSQL converter