[osm2pgsql] 08/13: Remove 04-api-changes-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 852dff977e9ea9b559cb211a7c0aa6dc9597f839
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 25 12:51:25 2014 +0200

    Remove 04-api-changes-for-protobuf-c-1.0.0.patch, applied upstream.
---
 debian/changelog                                   |  1 +
 .../04-api-changes-for-protobuf-c-1.0.0.patch      | 34 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6bf3daf..c8c5a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ osm2pgsql (0.86.0-1) UNRELEASED; urgency=medium
   * 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.
+  * Remove 04-api-changes-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/04-api-changes-for-protobuf-c-1.0.0.patch b/debian/patches/04-api-changes-for-protobuf-c-1.0.0.patch
deleted file mode 100644
index cc5a1a0..0000000
--- a/debian/patches/04-api-changes-for-protobuf-c-1.0.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Update for API changes in protobuf-c >= 1.0.0
-Author: Robert Edmonds <edmonds at debian.org>
-Forwarded: https://github.com/openstreetmap/osm2pgsql/issues/129
---- a/parse-pbf.c
-+++ b/parse-pbf.c
-@@ -258,7 +258,7 @@ int processOsmHeader(void *data, size_t length)
-     return 0;
-   }
-   
--  header_block__free_unpacked (hmsg, &protobuf_c_system_allocator);
-+  header_block__free_unpacked (hmsg, NULL);
- 
-   return 1;
- }
-@@ -541,7 +541,7 @@ int processOsmData(struct osmdata_t *osmdata, void *data, size_t length)
-     if (!processOsmDataRelations(osmdata, group, string_table)) return 0;
-   }
- 
--  primitive_block__free_unpacked (pmsg, &protobuf_c_system_allocator);
-+  primitive_block__free_unpacked (pmsg, NULL);
- 
-   return 1;
- }
-@@ -606,8 +606,8 @@ int streamFilePbf(char *filename, int sanitize UNUSED, struct osmdata_t *osmdata
-       }
-     }
- 
--    blob__free_unpacked (blob_msg, &protobuf_c_system_allocator);
--    block_header__free_unpacked (header_msg, &protobuf_c_system_allocator);
-+    blob__free_unpacked (blob_msg, NULL);
-+    block_header__free_unpacked (header_msg, NULL);
-   } while (!feof(input));
- 
-   if (!feof(input)) {
diff --git a/debian/patches/series b/debian/patches/series
index bf6c655..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-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