This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository osm2pgsql.
commit 261c62e13b70e3375efbac17bad42685f0f361af Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Oct 25 12:46:20 2014 +0200 Remove 00-fix_build.patch, applied upstream. --- debian/changelog | 1 + debian/patches/00-fix_build.patch | 16 ---------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index b301919..7288c3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ osm2pgsql (0.86.0-1) UNRELEASED; urgency=medium * New upstream release. + * Remove 00-fix_build.patch, applied upstream. -- Bas Couwenberg <sebas...@xs4all.nl> Sat, 25 Oct 2014 12:43:18 +0200 diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch deleted file mode 100644 index 85328c1..0000000 --- a/debian/patches/00-fix_build.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: David Paleino <da...@debian.org> -Subject: add missing ZLIB linkage -Last-Update: 2013-09-17 23:21:42 +0200 -Forwarded: no - ---- a/Makefile.am -+++ b/Makefile.am -@@ -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@"' @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@ -L/usr/lib/x86_64-linux-gnu @LUA_LIB@ diff --git a/debian/patches/series b/debian/patches/series index 127af71..3e7cf2a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -00-fix_build.patch 01-hyphen-used-as-minus-sign.patch 02-spelling-error-in-manpage.patch 03-fix-build-for-protobuf-c-1.0.0.patch -- 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