[osm2pgsql] 07/13: Remove 03-fix-build-for-protobuf-c-1.0.0.patch, applied upstream.

[Bas Couwenberg]

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

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

commit 3757ca916c5d5f4e3b19a36f884eeaf4800739b0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 25 12:49:46 2014 +0200

    Remove 03-fix-build-for-protobuf-c-1.0.0.patch, applied upstream.
---
 debian/changelog                                       |  1 +
 debian/patches/03-fix-build-for-protobuf-c-1.0.0.patch | 15 ---------------
 debian/patches/series                                  |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92c32ef..6bf3daf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ osm2pgsql (0.86.0-1) UNRELEASED; urgency=medium
   * Remove 00-fix_build.patch, applied upstream.
   * Remove 01-hyphen-used-as-minus-sign.patch, applied upstream.
   * Remove 02-spelling-error-in-manpage.patch, applied upstream.
+  * Remove 03-fix-build-for-protobuf-c-1.0.0.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 25 Oct 2014 12:43:18 +0200
 
diff --git a/debian/patches/03-fix-build-for-protobuf-c-1.0.0.patch b/debian/patches/03-fix-build-for-protobuf-c-1.0.0.patch
deleted file mode 100644
index 2bb7f07..0000000
--- a/debian/patches/03-fix-build-for-protobuf-c-1.0.0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix FTBFS with protobuf-c >= 1.0.0
-Applied-Upstream: https://github.com/openstreetmap/osm2pgsql/commit/8c7c6dbb319e97715b174edd081303174c96b03b
---- a/m4/ax_lib_protobuf_c.m4
-+++ b/m4/ax_lib_protobuf_c.m4
-@@ -207,7 +207,9 @@ AC_DEFUN([AX_LIB_PROTOBUF_C],
-       CFLAGS="$CFLAGS $PROTOBUF_C_CFLAGS"
-       AX_COMPARE_VERSION([$protobuf_c_wanted_version], [ge], [0.14],
-          [AC_CHECK_MEMBER([ProtobufCFieldDescriptor.packed],,
--                          [protobuf_c_version_ok="no"],
-+                          [AC_CHECK_MEMBER([ProtobufCFieldDescriptor.flags],,
-+                                           [protobuf_c_version_ok="no"],
-+                                           [[#include <protobuf-c/protobuf-c.h>]])],
-                           [[#include <google/protobuf-c/protobuf-c.h>]
-          ])
-       ])
diff --git a/debian/patches/series b/debian/patches/series
index add509c..bf6c655 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-03-fix-build-for-protobuf-c-1.0.0.patch
 04-api-changes-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