The following commit has been merged in the master branch:
commit b4496fbaebd208fac859d4fdcfa10750eae5e9d8
Author: Andreas Tille <ti...@debian.org>
Date:   Wed Sep 18 00:09:42 2013 +0200

    adapted patch

diff --git a/debian/changelog b/debian/changelog
index 6f8a367..5ff7065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ osm2pgsql (0.82.0-1) UNRELEASED; urgency=low
   * Removed Andreas Putzo and DMUA flag from debian/control
 
   [ Andreas Tille ]
+  * New upstream version (adapted patch)
   * Added watch file
   * debian/control:
      - Add myself as Uploader (and drop pkg-osm team)
diff --git a/debian/patches/00-fix_build.patch 
b/debian/patches/00-fix_build.patch
index ea1506c..31d9f07 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -1,21 +1,16 @@
 From: David Paleino <da...@debian.org>
 Subject: add missing ZLIB linkage
+LastChanged: Andreas Tille <ti...@debian.org>  Tue, 17 Sep 2013 23:21:42 +0200
 Forwarded: no
 
----
- Makefile.am |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- osm2pgsql.orig/Makefile.am
-+++ osm2pgsql/Makefile.am
-@@ -38,8 +38,8 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -38,7 +38,7 @@ endif
  
  osm2pgsqldir = $(datadir)/osm2pgsql
  
--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_CFLAGS = @PTHREAD_CFLAGS@ @LFS_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ 
@BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ 
-DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -DVERSION='"@PACKAGE_VERSION@"' 
++AM_CFLAGS = @PTHREAD_CFLAGS@ @LFS_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@ 
-DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -Igeos-fallback
  
  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@
- 

-- 
OpenStreetMap data to PostgreSQL converter

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to