Your message dated Sun, 27 Jul 2014 18:34:07 +0000
with message-id <e1xbtgp-0006lw...@franck.debian.org>
and subject line Bug#755553: fixed in osm2pgsql 0.84.0-2
has caused the Debian Bug report #755553,
regarding osm2pgsql: changes needed for protobuf-c transition
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
755553: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755553
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: osm2pgsql
Severity: important
Version: 0.84.0-1

Hi,

Per #755212, a new major version of protobuf-c is about to be uploaded
to unstable, requiring a transition.  The osm2pgsql package needs
sourceful changes in order to be compatible with the upcoming protobuf-c
1.0.0 release.

Please apply the changes in the attached patch to the osm2pgsql package.
The changes are compatible with the version of the protobuf-c package
currently in testing/unstable, and will allow for compatibility with
protobuf-c >= 1.0.0 once it has been uploaded to unstable.

The upstream issue corresponding to this transition is here:

    https://github.com/openstreetmap/osm2pgsql/issues/129

Thanks!

-- 
Robert Edmonds
edmo...@debian.org
diff -Npru osm2pgsql-0.84.0.orig/debian/control osm2pgsql-0.84.0/debian/control
--- osm2pgsql-0.84.0.orig/debian/control	2014-07-10 03:22:12.000000000 -0400
+++ osm2pgsql-0.84.0/debian/control	2014-07-21 19:36:16.556259459 -0400
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
                libpq-dev,
                libxml2-dev,
                libproj-dev,
-               libprotobuf-c0-dev (>= 0.14),
+               libprotobuf-c-dev | libprotobuf-c0-dev (>= 0.14),
                protobuf-c-compiler,
                liblua5.2-dev,
                lua5.2
diff -Npru osm2pgsql-0.84.0.orig/debian/patches/03-fix-build-for-protobuf-c-1.0.0.patch osm2pgsql-0.84.0/debian/patches/03-fix-build-for-protobuf-c-1.0.0.patch
--- osm2pgsql-0.84.0.orig/debian/patches/03-fix-build-for-protobuf-c-1.0.0.patch	1969-12-31 19:00:00.000000000 -0500
+++ osm2pgsql-0.84.0/debian/patches/03-fix-build-for-protobuf-c-1.0.0.patch	2014-07-21 19:35:16.803450416 -0400
@@ -0,0 +1,15 @@
+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 -Npru osm2pgsql-0.84.0.orig/debian/patches/04-api-changes-for-protobuf-c-1.0.0.patch osm2pgsql-0.84.0/debian/patches/04-api-changes-for-protobuf-c-1.0.0.patch
--- osm2pgsql-0.84.0.orig/debian/patches/04-api-changes-for-protobuf-c-1.0.0.patch	1969-12-31 19:00:00.000000000 -0500
+++ osm2pgsql-0.84.0/debian/patches/04-api-changes-for-protobuf-c-1.0.0.patch	2014-07-21 19:35:16.803450416 -0400
@@ -0,0 +1,34 @@
+Description: Update for API changes in protobuf-c >= 1.0.0
+Author: Robert Edmonds <edmo...@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 -Npru osm2pgsql-0.84.0.orig/debian/patches/series osm2pgsql-0.84.0/debian/patches/series
--- osm2pgsql-0.84.0.orig/debian/patches/series	2014-07-10 03:22:12.000000000 -0400
+++ osm2pgsql-0.84.0/debian/patches/series	2014-07-21 19:35:16.803450416 -0400
@@ -1,3 +1,5 @@
 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
+04-api-changes-for-protobuf-c-1.0.0.patch

--- End Message ---
--- Begin Message ---
Source: osm2pgsql
Source-Version: 0.84.0-2

We believe that the bug you reported is fixed in the latest version of
osm2pgsql, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 755...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Bas Couwenberg <sebas...@xs4all.nl> (supplier of updated osm2pgsql package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sat, 26 Jul 2014 13:33:01 +0200
Source: osm2pgsql
Binary: osm2pgsql
Architecture: source amd64
Version: 0.84.0-2
Distribution: unstable
Urgency: medium
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Changed-By: Bas Couwenberg <sebas...@xs4all.nl>
Description:
 osm2pgsql  - OpenStreetMap data to PostgreSQL converter
Closes: 755553
Changes:
 osm2pgsql (0.84.0-2) unstable; urgency=medium
 .
   * Add patches for protobuf-c 1.0.0 support.
     Thanks to Robert Edmonds for the patches.
     (closes: #755553)
Checksums-Sha1:
 9940c64898c57f119b02cfecdc299ddb12a14aad 2228 osm2pgsql_0.84.0-2.dsc
 2ad1edbdb8a1c6432c21140333c3e8f6afcf51dc 9220 osm2pgsql_0.84.0-2.debian.tar.xz
 6d8821fb5b592ff0e9dd8dac16ba6d9a14a0d572 205638 osm2pgsql_0.84.0-2_amd64.deb
Checksums-Sha256:
 1287476abdef44389b47225cccb72c6b893c8603d2a0b88ba5cd8f9eee337ad1 2228 
osm2pgsql_0.84.0-2.dsc
 fbff5eba3f0e470722a694ec940383ee494505530c2b369a6581ee103ccd5c71 9220 
osm2pgsql_0.84.0-2.debian.tar.xz
 4f97cd68147fb15701d4f4faee6beb268a763846a4a524f357592dff60353892 205638 
osm2pgsql_0.84.0-2_amd64.deb
Files:
 af2ea1f511d899ab0e887e654448f21f 205638 utils optional 
osm2pgsql_0.84.0-2_amd64.deb
 906ee5f4b45a4bdb5e5fb4816bee49fa 2228 utils optional osm2pgsql_0.84.0-2.dsc
 46d045eaeeef265da60762aa104ee323 9220 utils optional 
osm2pgsql_0.84.0-2.debian.tar.xz

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJT1UUDAAoJEFeKBJTRxkbRAzYP/25Is+cRW69HyQbrrc/+H31U
l+VpcMF1YisJF3BaDpVWYQrhNtkaAuH65w3ZswB+Xfi2aZOCB3tMeMWIpix69Jt9
0MqOdYjasMAPW5ID9qArQ4clMplJBPrJkxemynMH7gSjf7zpfqaFqENM8/g42vKv
ZZpbZV0SiqIt3a/zjmTC7nBFU8jfr58GMMq6dCAmQptUG1o3TJmOA3tIeN78KGme
X3Qpf9F1Ix+Q5rO9mDe0ZdZb/qLCNiy3YEGJgubaIbrYJoyBSLTJ6zQGHO8bfX0A
U47u6/w4YP6exvDETMCwXhfqa9SEaT4UGbEhqUNnWl9XUHZH//7K7ThpEcn+Iq+I
51IgDFbnet15l7N3BO+UVaCyrCyfD37/tqE3hpDllVYzFQWzZlDEOjSBsIQiLKo8
MC16mN+LSXaJ4Gf5KIQ607Zh3GsWtbJ3lk540wJqjyGyalf4fqnNwsxW0p0oT7Sz
T4XqqjVHhxjIS/Wfgn0SbtA19ba2W4cufHoPuSD4JhnrJFK/7ZCrq3i99QAnzz/L
VbqGZ7ZJhIo2aLIG3htPSKZFe7yjjHPnXnSKrPzXtTtqMyPu04zRfSBfEriHuySN
bwBKLyldbFOvG3NyxE5t8RAI8RmMTDMbJ74CAPO0rxpXLx7+AsUbnjiKBkXtmeme
EbIVLRyynqwMqS7r+f78
=UpTs
-----END PGP SIGNATURE-----

--- End Message ---
_______________________________________________
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