This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository osm2pgsql.

commit b3b4752297155f55aedc27109672bbf8a43bc283
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Wed Apr 30 13:09:40 2014 +0200

    Refresh patches.
---
 debian/changelog                  |  1 +
 debian/patches/00-fix_build.patch | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b19998..fd7f528 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ osm2pgsql (0.84.0-1) UNRELEASED; urgency=low
   * Update postgis Recommends to postgresql-9.3-postgis-2.1.
     (closes: #732415)
   * Add gbp.conf to use pristine-tar by default.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebas...@xs4all.nl>  Wed, 30 Apr 2014 13:05:29 +0200
 
diff --git a/debian/patches/00-fix_build.patch 
b/debian/patches/00-fix_build.patch
index 3b6e2a4..85328c1 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -5,12 +5,12 @@ Forwarded: no
 
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -38,7 +38,7 @@ endif
+@@ -36,7 +36,7 @@ endif
  
  osm2pgsqldir = $(datadir)/osm2pgsql
  
--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_CFLAGS = @PTHREAD_CFLAGS@ @LFS_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ 
@BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ 
-DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -DVERSION='"@PACKAGE_VERSION@"' 
@LUA_INCLUDE@ 
++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@"' 
@LUA_INCLUDE@ 
+ AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ 
@BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ 
-DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -Igeos-fallback @LUA_INCLUDE@
  
- 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@
+ 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@ 
-L/usr/lib/x86_64-linux-gnu @LUA_LIB@

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osm2pgsql.git

_______________________________________________
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