Merge C++ branch

Also increments the version to 0.87.0 Closes osm2pgsql-dev#187 Fixes osm2pgsql-dev#156 Fixes osm2pgsql-dev#186 Fixes osm2pgsql-dev#105 Fixes osm2pgsql-dev#111
pnorman · Oct 25, 2014 · 739d422 · 739d422
2 parents c3a203f + e5ad62e
commit 739d422
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ To install on a Debian or Ubuntu system, first install the prerequisites:
 sudo apt-get install autoconf automake libtool make g++ libboost-dev \
   libboost-system-dev libboost-filesystem-dev libboost-thread-dev libxml2-dev \
   libgeos-dev libgeos++-dev libpq-dev libbz2-dev libproj-dev
-  protobuf-c-compiler libprotobuf-c0-dev libbz2-dev lua5.2 liblua5.2-dev
+  protobuf-c-compiler libprotobuf-c0-dev lua5.2 liblua5.2-dev
 ```
 
 To install on a Fedora system, use

diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(osm2pgsql, 0.85.0)
+AC_INIT(osm2pgsql, 0.87.0)
 
 dnl Required autoconf version
 AC_PREREQ(2.61)