prepare relase 2.1.1

CMakeLists.txt

@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.10.0)
 
-project(osm2pgsql VERSION 2.1.0 LANGUAGES CXX C)
+project(osm2pgsql VERSION 2.1.1 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 

CONTRIBUTING.md

@@ -213,7 +213,9 @@ the report.
 
 * Decide on a new version. (See [semantic versioning](https://semver.org/).)
 * Update version in [CMakeLists.txt](CMakeLists.txt), look for `project` function.
-* Build man page (`make man`) and copy it to `man/osm2pgsql.1`.
+* Update man pages
+  * Build man page: `make man`
+  * Copy to source: `cp man/*1 ../man/`
 * Tag release with release notes in commit message and upload the tag to Github.
 * Fill out release notes on Github.
 * Copy Windows binaries and source tarball to osm2pgsql.org.

man/osm2pgsql-gen.1

@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "2.1.0" "" ""
+.TH "OSM2PGSQL" "1" "2.1.1" "" ""
 .SH NAME
 .PP
 osm2pgsql-gen - Generalize OpenStreetMap data - EXPERIMENTAL!

man/osm2pgsql-replication.1

@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL-REPLICATION" "1" "2.1.0" "" ""
+.TH "OSM2PGSQL-REPLICATION" "1" "2.1.1" "" ""
 .SH NAME
 osm2pgsql-replication \- osm2pgsql database updater
 .SH SYNOPSIS

man/osm2pgsql.1

@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "2.1.0" "" ""
+.TH "OSM2PGSQL" "1" "2.1.1" "" ""
 .SH NAME
 .PP
 osm2pgsql - OpenStreetMap data to PostgreSQL converter

scripts/osm2pgsql-replication

@@ -676,7 +676,7 @@ def get_parser():
     cmd.add_argument('--max-diff-size', type=int, default=500,
                      help='Maximum data to load in MB (default: 500MB)')
     cmd.add_argument('--osm2pgsql-cmd', default=str(OSM2PGSQL_PATH),
-                     help=f'Path to osm2pgsql command (default: {OSM2PGSQL_PATH})')
+                     help=f'Path to osm2pgsql command')
     cmd.add_argument('--once', action='store_true',
                      help='Run updates only once, even when more data is available.')
     cmd.add_argument('--post-processing', metavar='SCRIPT',