[SCM] osm2pgsql branch, master, updated. debian/0.70.5+r25090-2-10-geaab0c0

David Paleino dapal at debian.org
Sun Feb 26 20:49:15 UTC 2012


The following commit has been merged in the master branch:
commit caafbc4fb187a95ccba95089888133594d8c55bf
Author: David Paleino <dapal at debian.org>
Date:   Sun Feb 26 21:30:41 2012 +0100

    Patches refreshed to apply to new source

diff --git a/debian/changelog b/debian/changelog
index f7156d3..0dbd8e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ osm2pgsql (0.80.0+r27899-1) UNRELEASED; urgency=low
   * Strip the debian/ directory from the SVN checkout
   * Standards-Version bump to 3.9.3, no changes needed
   * Updated debian/copyright
+  * Patches refreshed to apply to new source
 
- -- David Paleino <dapal at debian.org>  Sun, 26 Feb 2012 21:22:58 +0100
+ -- David Paleino <dapal at debian.org>  Sun, 26 Feb 2012 21:30:31 +0100
 
 osm2pgsql (0.70.5+r25090-2) unstable; urgency=low
 
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
index c62e24c..9dc5ea8 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -3,22 +3,19 @@ Subject: add missing ZLIB linkage
 Forwarded: no
 
 ---
- Makefile.am |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ Makefile.am |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- osm2pgsql.orig/Makefile.am
 +++ osm2pgsql/Makefile.am
-@@ -35,10 +35,10 @@ BUILT_SOURCES = \
+@@ -37,8 +37,8 @@ endif
  
- endif
+ osm2pgsqldir = $(datadir)/osm2pgsql
  
--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_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -DVERSION='"@PACKAGE_VERSION@"' 
+-AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -Igeos-fallback
++AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ @ZLIB_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -DVERSION='"@PACKAGE_VERSION@"'
++AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ @ZLIB_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -Igeos-fallback
  
--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@
+ AM_LDFLAGS = @PTHREAD_CFLAGS@ @ZLIB_LDFLAGS@ @ZLIB_LIBS@ @POSTGRESQL_LDFLAGS@ @POSTGRESQL_LIBS@ @XML2_LDFLAGS@ @BZIP2_LDFLAGS@ @BZIP2_LIBS@ @GEOS_LDFLAGS@ @GEOS_LIBS@ @PROJ_LDFLAGS@ @PROJ_LIBS@ @PROTOBUF_C_LDFLAGS@ @PROTOBUF_C_LIBS@
  
- osm2pgsqldir = $(datadir)/osm2pgsql
- osm2pgsql_DATA = default.style 900913.sql
diff --git a/debian/patches/01-disable_gazetteer.patch b/debian/patches/01-disable_gazetteer.patch
index a17b1b9..919754c 100644
--- a/debian/patches/01-disable_gazetteer.patch
+++ b/debian/patches/01-disable_gazetteer.patch
@@ -20,7 +20,7 @@ Forwarded: not-needed
  
 --- osm2pgsql.orig/configure.ac
 +++ osm2pgsql/configure.ac
-@@ -91,5 +91,5 @@ AX_PTHREAD(,[AC_MSG_ERROR([no])])
+@@ -93,5 +93,5 @@ AX_PTHREAD(,[AC_MSG_ERROR([no])])
  
  
  dnl Generate Makefile

-- 
OpenStreetMap data to PostgreSQL converter



More information about the Pkg-grass-devel mailing list