diff -Nru osm2pgsql-1.5.2+ds/appveyor.yml osm2pgsql-1.6.0+ds/appveyor.yml
--- osm2pgsql-1.5.2+ds/appveyor.yml	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-environment:
-  global:
-    BZIP2_VER: 1.0.8.0
-    EXPAT_VER: 2.2.5
-    PROJ4_VER: 4.9.3
-    ZLIB_VER: 1.2.11
-    LUA_VER: 5.3.4
-    LUA_INCLUDE_DIR: C:\lua\include
-    LUA_LIBRARIES: C:\lua\lua53.lib
-    LUA_DLL: C:\lua\lua53.dll
-    WINGETOPT_VER: v0.95
-    GETOPT_INCLUDE_DIR: C:\wingetopt\src
-    GETOPT_LIBRARY: C:\wingetopt\build\wingetopt.lib
-    BZIP2_INCLUDE_DIR: C:\bzip2\dev
-    BZIP2_LIBRARY: C:\bzip2\dll
-    BOOST_PATH: C:\Libraries\boost_1_63_0
-    POSTGRESQL_VER: 11.2
-    TESTS_POSTGRESQL_ROOT: C:\Progra~1\PostgreSQL\9.6
-    POSTGIS_VER: 2.4.3
-    POSTGIS_URL: "https://osm2pgsql.org/ci/winbuild/postgis-bundle-pg96-2.4.3x64.zip"
-    PGUSER: postgres
-    PGPASSWORD: Password12!
-
-os: Visual Studio 2015
-
-services:
-  - postgresql96
-
-clone_folder: c:\osm2pgsql
-
-clone_depth: 1
-
-init:
-  - git config --global core.autocrlf input
-  - set bz2_dll_url=https://github.com/philr/bzip2-windows/releases/download/v%BZIP2_VER%/bzip2-dll-%BZIP2_VER%-win-x64.zip
-  - set bz2_dev_url=https://github.com/philr/bzip2-windows/releases/download/v%BZIP2_VER%/bzip2-dev-%BZIP2_VER%-win-x64.zip
-  - set vcvarsall_arg=amd64
-  - set conda_path=C:\Miniconda36-x64\Scripts
-  - set python_path=C:\Python38-x64
-  - set conda_library_path=C:\Miniconda36-x64\envs\osm2pgsql\Library
-  - set lua_url=https://osm2pgsql.org/ci/winbuild/lua_x64.zip
-  - set build_type=Release
-  - '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall" %vcvarsall_arg%'
-
-install:
-  - set PATH=%TESTS_POSTGRESQL_ROOT%\bin;%python_path%;%PATH%;%conda_path%
-  - cd c:\
-  - conda config --set always_yes yes
-  - conda create --name osm2pgsql
-  - activate osm2pgsql
-  - conda install expat=%EXPAT_VER% proj4=%PROJ4_VER% zlib=%ZLIB_VER% postgresql=%POSTGRESQL_VER%
-  - ps: if (!(Test-Path "C:\bzip2_dll_x64.zip")){(new-object net.webclient).DownloadFile($env:bz2_dll_url, "C:\bzip2_dll_x64.zip")}
-  - 7z x -y C:\bzip2_dll_x64.zip -o%BZIP2_LIBRARY%
-  - ps: if (!(Test-Path "C:\bzip2_dev_x64.zip")){(new-object net.webclient).DownloadFile($env:bz2_dev_url, "C:\bzip2_dev_x64.zip")}
-  - 7z x -y C:\bzip2_dev_x64.zip -o%BZIP2_INCLUDE_DIR%
-  - ps: if (!(Test-Path "C:\lua_x64.zip")){(new-object net.webclient).DownloadFile($env:lua_url, "C:\lua_x64.zip")}
-  - 7z x -y C:\lua_x64.zip -oC:\lua
-  - ps: if (!(Test-Path "C:\postgis.zip")){(new-object net.webclient).DownloadFile($env:POSTGIS_URL, "C:\postgis.zip")}
-  - 7z x C:\postgis.zip -oC:\postgis
-  - xcopy /e /y /q C:\postgis\postgis-bundle-pg96-2.4.3x64 %TESTS_POSTGRESQL_ROOT%
-  - git clone https://github.com/alex85k/wingetopt -b %WINGETOPT_VER% C:\wingetopt
-  - python -V
-  - python -m pip install psycopg2
-
-before_build:
-  - cd C:\wingetopt
-  - mkdir build
-  - cd build
-  - cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%build_type%
-  - nmake
-
-build_script:
-  - mkdir c:\osm2pgsql\build
-  - cd c:\osm2pgsql\build
-  - >
-    cmake .. -LA -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%build_type% -DBUILD_TESTS=ON
-    -DLUA_INCLUDE_DIR=%LUA_INCLUDE_DIR% -DLUA_LIBRARIES=%LUA_LIBRARIES% 
-    -DGETOPT_INCLUDE_DIR=%GETOPT_INCLUDE_DIR% -DGETOPT_LIBRARY=%GETOPT_LIBRARY%
-    -DBOOST_ROOT=%BOOST_PATH% -DBoost_USE_STATIC_LIBS=ON
-    -DBZIP2_INCLUDE_DIR=%BZIP2_INCLUDE_DIR%
-    -DBZIP2_LIBRARIES=%BZIP2_INCLUDE_DIR%\libbz2.lib
-  - nmake
-
-after_build:
-  - mkdir osm2pgsql-bin
-  - copy /y *.exe osm2pgsql-bin
-  - copy /y ..\*.style osm2pgsql-bin
-  - copy /y ..\*.lua osm2pgsql-bin
-  - copy /y %conda_library_path%\bin\libpq.dll osm2pgsql-bin
-  - copy /y %conda_library_path%\bin\zlib.dll osm2pgsql-bin
-  - copy /y %conda_library_path%\bin\expat.dll osm2pgsql-bin
-  - copy /y %conda_library_path%\bin\gssapi64.dll osm2pgsql-bin
-  - copy /y %conda_library_path%\bin\libcrypto-1_1-x64.dll osm2pgsql-bin
-  - copy /y %conda_library_path%\bin\libssl-1_1-x64.dll osm2pgsql-bin
-  - copy /y %conda_library_path%\bin\comerr64.dll osm2pgsql-bin
-  - copy /y %conda_library_path%\bin\krb5_64.dll osm2pgsql-bin
-  - copy /y %conda_library_path%\bin\k5sprt64.dll osm2pgsql-bin
-  - copy /y %conda_library_path%\bin\wshelp64.dll osm2pgsql-bin
-  - copy /y %BZIP2_LIBRARY%\libbz2.dll osm2pgsql-bin
-  - copy /y %LUA_DLL% osm2pgsql-bin
-  - 7z a c:\osm2pgsql\osm2pgsql_%build_type%_x64.zip osm2pgsql-bin -tzip
-
-before_test:
-  - cd c:\
-  - mkdir temp
-  - cacls temp /T /E /G Users:F
-  - cacls temp /T /E /G "Network Service":F
-  - |
-    psql -c "CREATE TABLESPACE tablespacetest LOCATION 'c:/temp'"
-  - set PATH=c:\osm2pgsql\build\osm2pgsql-bin;%PATH%
-  - set PROJ_LIB=%conda_library_path%\share
-
-test_script:
-  - cd c:\osm2pgsql\build
-  #- ctest -VV -L NoDB
-  - ctest -VV -LE FlatNodes # enable when Postgis will be available
-
-artifacts:
-  - path: osm2pgsql_%build_type%_x64.zip
-
-cache:
-  - C:\lua_x64.zip -> appveyor.yml
-  - C:\bzip2_dev_x64.zip -> appveyor.yml
-  - C:\bzip2_dll_x64.zip -> appveyor.yml
-  - C:\postgis.zip -> appveyor.yml
diff -Nru osm2pgsql-1.5.2+ds/CMakeLists.txt osm2pgsql-1.6.0+ds/CMakeLists.txt
--- osm2pgsql-1.5.2+ds/CMakeLists.txt	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/CMakeLists.txt	2022-01-24 15:04:03.000000000 +0000
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.5.0)
 
-project(osm2pgsql VERSION 1.5.2 LANGUAGES CXX C)
+project(osm2pgsql VERSION 1.6.0 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -185,7 +185,7 @@
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
 
-find_package(Osmium 2.17.2 REQUIRED COMPONENTS io)
+find_package(Osmium 2.17.3 REQUIRED COMPONENTS io)
 include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR})
 
 if (WITH_LUA)
@@ -335,5 +335,7 @@
 
 if (ENABLE_INSTALL)
     install(TARGETS osm2pgsql DESTINATION bin)
+    install(PROGRAMS scripts/osm2pgsql-replication DESTINATION bin)
+    install(FILES docs/osm2pgsql-replication.1 DESTINATION share/man/man1)
     install(FILES default.style empty.style DESTINATION share/osm2pgsql)
 endif()
diff -Nru osm2pgsql-1.5.2+ds/debian/changelog osm2pgsql-1.6.0+ds/debian/changelog
--- osm2pgsql-1.5.2+ds/debian/changelog	2022-01-12 06:41:58.000000000 +0000
+++ osm2pgsql-1.6.0+ds/debian/changelog	2022-01-24 18:20:23.000000000 +0000
@@ -1,3 +1,13 @@
+osm2pgsql (1.6.0+ds-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Require at least libosmium2-dev 2.17.3.
+  * Update copyright file.
+  * Add python3 dependencies for osm2pgsql-replication.
+  * Add patch to fix manpage issues.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 24 Jan 2022 19:20:23 +0100
+
 osm2pgsql (1.5.2+ds-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru osm2pgsql-1.5.2+ds/debian/control osm2pgsql-1.6.0+ds/debian/control
--- osm2pgsql-1.5.2+ds/debian/control	2022-01-12 06:40:27.000000000 +0000
+++ osm2pgsql-1.6.0+ds/debian/control	2022-01-24 18:20:23.000000000 +0000
@@ -8,12 +8,13 @@
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
                cmake,
+               dh-python,
                libboost-dev,
                libboost-system-dev,
                libboost-filesystem-dev,
                libbz2-dev,
                libexpat1-dev,
-               libosmium2-dev (>= 2.17.2),
+               libosmium2-dev (>= 2.17.3),
                libpq-dev,
                libproj-dev,
                rapidjson-dev,
@@ -21,7 +22,8 @@
                liblua5.3-dev,
                lua5.3,
                python3,
-               python3-psycopg2
+               python3-psycopg2,
+               python3-pyosmium
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/osm2pgsql
 Vcs-Git: https://salsa.debian.org/debian-gis-team/osm2pgsql.git
@@ -29,7 +31,10 @@
 
 Package: osm2pgsql
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: python3-psycopg2,
+         python3-pyosmium,
+         ${python3:Depends},
+         ${shlibs:Depends},
          ${misc:Depends}
 Recommends: postgis
 Description: OpenStreetMap data to PostgreSQL converter
diff -Nru osm2pgsql-1.5.2+ds/debian/copyright osm2pgsql-1.6.0+ds/debian/copyright
--- osm2pgsql-1.5.2+ds/debian/copyright	2022-01-12 06:41:37.000000000 +0000
+++ osm2pgsql-1.6.0+ds/debian/copyright	2022-01-24 18:20:23.000000000 +0000
@@ -9,7 +9,7 @@
  contrib/rapidjson/*
 
 Files: *
-Copyright: 2006-2021, the osm2pgsql developer community
+Copyright: 2006-2022, the osm2pgsql developer community
 Comment: osm2pgsql was written by Jon Burgess, Artem Pavlenko,
  Martijn van Oosterhout, Sarah Hoffmann, Kai Krueger, Frederik Ramm,
  Brian Quinion, Matt Amos, Kevin Kreiser, Paul Norman, Jochen Topf
diff -Nru osm2pgsql-1.5.2+ds/debian/patches/manpage.patch osm2pgsql-1.6.0+ds/debian/patches/manpage.patch
--- osm2pgsql-1.5.2+ds/debian/patches/manpage.patch	1970-01-01 00:00:00.000000000 +0000
+++ osm2pgsql-1.6.0+ds/debian/patches/manpage.patch	2022-01-24 18:20:23.000000000 +0000
@@ -0,0 +1,48 @@
+Description: Improve manpage issues reported by lintian.
+ * bad-whatis-entry
+ * groff-message: warning: macro '<foo>'' not defined
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: https://github.com/openstreetmap/osm2pgsql/pull/1626
+
+--- a/docs/osm2pgsql-replication.1
++++ b/docs/osm2pgsql-replication.1
+@@ -1,6 +1,6 @@
+ .TH osm2pgsql-replication "1" Manual
+ .SH NAME
+-osm2pgsql-replication
++osm2pgsql-replication - osm2pgsql database updater
+ .SH SYNOPSIS
+ .B osm2pgsql-replication
+ [-h] {init,update,status} ...
+@@ -269,25 +269,25 @@ With the '\-\-json' option, the status i
+ .br
+ 
+ .br
+-'status' is 0 if there were no problems getting the status. 1 & 2 for
++\(cqstatus\(cq is 0 if there were no problems getting the status. 1 & 2 for
+ .br
+ improperly set up replication. 3 for network issues. If status ≠ 0, then
+ .br
+-the 'error' key is an error message (as string). 'status' is used as the
++the \(cqerror\(cq key is an error message (as string). \(cqstatus\(cq is used
+ .br
+-exit code.
++as the exit code.
+ .br
+ 
+ .br
+-'server' is the replication server's current status. 'sequence' is it's
++\(cqserver\(cq is the replication server\(cqs current status. \(cqsequence\(cq is it\(cqs
+ .br
+-sequence number, 'timestamp' the time of that, and 'age_sec' the age of the
++sequence number, \(cqtimestamp\(cq the time of that, and \(cqage_sec\(cq the age of the
+ .br
+ data in seconds.
+ .br
+ 
+ .br
+-'local' is the status of your server.
++\(cqlocal\(cq is the status of your server.
+ 
+ 
+ .TP
diff -Nru osm2pgsql-1.5.2+ds/debian/patches/series osm2pgsql-1.6.0+ds/debian/patches/series
--- osm2pgsql-1.5.2+ds/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ osm2pgsql-1.6.0+ds/debian/patches/series	2022-01-24 18:20:23.000000000 +0000
@@ -0,0 +1 @@
+manpage.patch
diff -Nru osm2pgsql-1.5.2+ds/debian/rules osm2pgsql-1.6.0+ds/debian/rules
--- osm2pgsql-1.5.2+ds/debian/rules	2021-09-13 11:18:17.000000000 +0000
+++ osm2pgsql-1.6.0+ds/debian/rules	2022-01-24 18:20:23.000000000 +0000
@@ -14,7 +14,7 @@
 CXXFLAGS += $(CPPFLAGS) -DNDEBUG
 
 %:
-	dh $@ --buildsystem cmake
+	dh $@ --with python3 --buildsystem cmake
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DEXTERNAL_LIBOSMIUM=ON \
diff -Nru osm2pgsql-1.5.2+ds/docs/osm2pgsql.1 osm2pgsql-1.6.0+ds/docs/osm2pgsql.1
--- osm2pgsql-1.5.2+ds/docs/osm2pgsql.1	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/docs/osm2pgsql.1	2022-01-24 15:04:03.000000000 +0000
@@ -1,4 +1,4 @@
-.TH "OSM2PGSQL" "1" "1.5.2" "" ""
+.TH "OSM2PGSQL" "1" "1.6.0" "" ""
 .SH NAME
 .PP
 osm2pgsql - Openstreetmap data to PostgreSQL converter
diff -Nru osm2pgsql-1.5.2+ds/.github/actions/win-install/action.yml osm2pgsql-1.6.0+ds/.github/actions/win-install/action.yml
--- osm2pgsql-1.5.2+ds/.github/actions/win-install/action.yml	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/.github/actions/win-install/action.yml	2022-01-24 15:04:03.000000000 +0000
@@ -4,7 +4,7 @@
   using: composite
   steps:
     - name: Install packages
-      run: vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows proj4:x64-windows boost-algorithm:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-property-tree:x64-windows lua:x64-windows libpq:x64-windows
+      run: vcpkg install bzip2:x64-windows expat:x64-windows zlib:x64-windows proj4:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-property-tree:x64-windows lua:x64-windows libpq:x64-windows
       shell: bash
     - name: Install psycopg2
       run: python -m pip install psycopg2
diff -Nru osm2pgsql-1.5.2+ds/.github/actions/win-postgres/action.yml osm2pgsql-1.6.0+ds/.github/actions/win-postgres/action.yml
--- osm2pgsql-1.5.2+ds/.github/actions/win-postgres/action.yml	1970-01-01 00:00:00.000000000 +0000
+++ osm2pgsql-1.6.0+ds/.github/actions/win-postgres/action.yml	2022-01-24 15:04:03.000000000 +0000
@@ -0,0 +1,26 @@
+name: Set up postgresql on Windows
+
+runs:
+  using: composite
+  steps:
+    - name: Download postgis
+      run: |
+        if (!(Test-Path "C:\postgis.zip")){(new-object net.webclient).DownloadFile("https://osm2pgsql.org/ci/winbuild/postgis-bundle-pg14-3.2.0x64.zip", "c:\postgis.zip")}
+        7z x c:\postgis.zip -oc:\postgis_archive
+      shell: pwsh
+    - name: Install postgis
+      run: |
+        echo "Root: $PGROOT, Bin: $PGBIN"
+        cp -r c:/postgis_archive/postgis-bundle-*/* "$PGROOT"
+      shell: bash
+    - name: Start PostgreSQL on Windows
+      run: |
+        $pgService = Get-Service -Name postgresql*
+        Set-Service -InputObject $pgService -Status running -StartupType automatic
+        Start-Process -FilePath "$env:PGBIN\pg_isready" -Wait -PassThru
+      shell: pwsh
+    - name: Create test tablespace
+      run: |
+        mkdir c:\tablespace
+        & $env:PGBIN\psql -c "CREATE TABLESPACE tablespacetest LOCATION 'c:/tablespace'"
+      shell: pwsh
diff -Nru osm2pgsql-1.5.2+ds/.github/actions/win-test/action.yml osm2pgsql-1.6.0+ds/.github/actions/win-test/action.yml
--- osm2pgsql-1.5.2+ds/.github/actions/win-test/action.yml	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/.github/actions/win-test/action.yml	2022-01-24 15:04:03.000000000 +0000
@@ -4,7 +4,7 @@
   using: composite
   steps:
     - name: Test
-      run: ctest --output-on-failure -C Release -L NoDB
+      run: ctest --output-on-failure -C Release
       shell: bash
       working-directory: build
 
diff -Nru osm2pgsql-1.5.2+ds/.github/workflows/ci.yml osm2pgsql-1.6.0+ds/.github/workflows/ci.yml
--- osm2pgsql-1.5.2+ds/.github/workflows/ci.yml	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/.github/workflows/ci.yml	2022-01-24 15:04:03.000000000 +0000
@@ -216,33 +216,75 @@
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
-  windows-2019:
-    runs-on: windows-2019
+  windows:
+    strategy:
+      matrix:
+        os: [windows-2019, windows-2022]
+    runs-on: ${{ matrix.os }}
     env:
       GETOPT_INCLUDE_DIR: ${{ github.workspace }}/../wingetopt/src
       GETOPT_LIBRARY: ${{ github.workspace }}/../wingetopt/build/Release/wingetopt.lib
+      VCPKG_DEFAULT_BINARY_CACHE: C:/vcpkg_binary_cache
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/cache@v2
         with:
-          submodules: true
+          path: |
+            C:/vcpkg_binary_cache
+          key: vcpkg-binary-cache-${{ matrix.os }}
+      - uses: actions/cache@v2
+        with:
+          path: |
+            C:/postgis.zip
+          key: postgis-cache
+      - name: Prepare cache
+        run: if [ ! -d C:/vcpkg_binary_cache ]; then mkdir C:/vcpkg_binary_cache; fi
+        shell: bash
+      - uses: ./.github/actions/win-postgres
       - uses: ./.github/actions/win-install
       - uses: ./.github/actions/win-getopt
       - uses: ./.github/actions/win-cmake
       - uses: ./.github/actions/win-build
       - uses: ./.github/actions/win-test
+      - name: Package osm2pgsql
+        run: |
+          mkdir c:/artifact/
+          mkdir c:/artifact/osm2pgsql-bin
+          cp -r Release/* ../README.md ../COPYING ../*.style ../scripts ../flex-config c:/artifact/osm2pgsql-bin/
+        shell: bash
+        working-directory: build
+        if: matrix.os == 'windows-2022'
+      - name: 'Upload Artifact'
+        uses: actions/upload-artifact@v2
+        with:
+          name: osm2pgsql-win64
+          path: c:/artifact
+        if: matrix.os == 'windows-2022'
 
-  windows-2022:
+  windows-package:
+    needs: windows
     runs-on: windows-2022
     env:
-      GETOPT_INCLUDE_DIR: ${{ github.workspace }}/../wingetopt/src
-      GETOPT_LIBRARY: ${{ github.workspace }}/../wingetopt/build/Release/wingetopt.lib
+      OSMURL: https://download.geofabrik.de/europe/monaco-latest.osm.bz2
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/cache@v2
         with:
-          submodules: true
-      - uses: ./.github/actions/win-install
-      - uses: ./.github/actions/win-getopt
-      - uses: ./.github/actions/win-cmake
-      - uses: ./.github/actions/win-build
-      - uses: ./.github/actions/win-test
+          path: |
+            C:/postgis.zip
+          key: postgis-cache
+      - uses: actions/download-artifact@v2
+        with:
+          name: osm2pgsql-win64
+      - uses: ./.github/actions/win-postgres
+      - name: Set up database
+        run: |
+          & $env:PGBIN\createdb osm
+          & $env:PGBIN\psql -d osm -c "CREATE EXTENSION hstore; CREATE EXTENSION postgis;"
+        shell: pwsh
+      - name: Get test data
+        run: (new-object net.webclient).DownloadFile($env:OSMURL, "testfile.osm.bz2")
+      - name: Exceute osm2pgsql
+        run: ./osm2pgsql-bin/osm2pgsql --slim -d osm testfile.osm.bz2
+        shell: bash
 
diff -Nru osm2pgsql-1.5.2+ds/.github/workflows/test-install.yml osm2pgsql-1.6.0+ds/.github/workflows/test-install.yml
--- osm2pgsql-1.5.2+ds/.github/workflows/test-install.yml	1970-01-01 00:00:00.000000000 +0000
+++ osm2pgsql-1.6.0+ds/.github/workflows/test-install.yml	2022-01-24 15:04:03.000000000 +0000
@@ -0,0 +1,94 @@
+name: Test install
+
+on: [ push, pull_request ]
+
+jobs:
+  ubuntu-test-install:
+    runs-on: ubuntu-20.04
+
+    env:
+      LUA_VERSION: 5.3
+      POSTGRESQL_VERSION: 12
+      POSTGIS_VERSION: 3
+      BUILD_TYPE: Release
+      CXXFLAGS: -pedantic -Wextra -Werror
+      PREFIX: /usr/local
+      OSMURL: https://download.geofabrik.de/europe/monaco-latest.osm.pbf
+      OSMFILE: monaco-latest.osm.pbf
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Show installed PostgreSQL packages
+        run: apt-cache search postgresql | sort
+      - name: Install prerequisites
+        run: |
+          sudo apt-get purge -yq postgresql*
+          sudo apt-get install -yq --no-install-suggests --no-install-recommends \
+            libboost-filesystem-dev \
+            libboost-system-dev \
+            libbz2-dev \
+            libexpat1-dev \
+            liblua${LUA_VERSION}-dev \
+            libluajit-5.1-dev \
+            libpq-dev \
+            libproj-dev \
+            lua${LUA_VERSION} \
+            pandoc \
+            postgresql-${POSTGRESQL_VERSION} \
+            postgresql-${POSTGRESQL_VERSION}-postgis-${POSTGIS_VERSION} \
+            postgresql-${POSTGRESQL_VERSION}-postgis-${POSTGIS_VERSION}-scripts \
+            postgresql-client-${POSTGRESQL_VERSION} \
+            python3-pyosmium \
+            python3-psycopg2 \
+            zlib1g-dev
+      - name: Run CMake
+        run: |
+          mkdir build
+          cd build
+          cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+      - name: Build osm2pgsql
+        working-directory: build
+        run: make -j3 all man
+      - name: Install osm2pgsql
+        working-directory: build
+        run: sudo make install
+      - name: Check osm2pgsql install
+        run: |
+          test -d $PREFIX/bin
+          test -e $PREFIX/bin/osm2pgsql
+          test -e $PREFIX/bin/osm2pgsql-replication
+          test -d $PREFIX/share/man/man1
+          test -f $PREFIX/share/man/man1/osm2pgsql.1
+          test -f $PREFIX/share/man/man1/osm2pgsql-replication.1
+          test -d $PREFIX/share/osm2pgsql
+          test -f $PREFIX/share/osm2pgsql/default.style
+          test -f $PREFIX/share/osm2pgsql/empty.style
+      - name: Set up test databases
+        run: |
+          sudo systemctl start postgresql
+          sudo -u postgres createuser runner
+          sudo -u postgres createdb -O runner o2ptest
+          sudo -u postgres psql o2ptest -c "CREATE EXTENSION postgis;"
+          sudo -u postgres psql o2ptest -c "CREATE EXTENSION hstore;"
+      - name: Remove repository
+        # Remove contents of workspace to be sure the install runs independently
+        working-directory: /
+        run: rm -fr "${{github.workspace}}"/*
+      - name: Show man pages
+        run: |
+          man -P cat osm2pgsql
+          man -P cat osm2pgsql-replication
+      - name: Download test file
+        run: wget --quiet $OSMURL
+        working-directory: /tmp
+      - name: Test run of osm2pgsql
+        run: $PREFIX/bin/osm2pgsql -d o2ptest --slim $OSMFILE
+        working-directory: /tmp
+      - name: Test run osm2pgsql-replication
+        run: |
+          $PREFIX/bin/osm2pgsql-replication init -v -d o2ptest
+          $PREFIX/bin/osm2pgsql-replication status -v -d o2ptest
+          $PREFIX/bin/osm2pgsql-replication update -v -d o2ptest --once --max-diff-size=1
+          $PREFIX/bin/osm2pgsql-replication status -v -d o2ptest --json
+        working-directory: /tmp
+
diff -Nru osm2pgsql-1.5.2+ds/scripts/osm2pgsql-replication osm2pgsql-1.6.0+ds/scripts/osm2pgsql-replication
--- osm2pgsql-1.5.2+ds/scripts/osm2pgsql-replication	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/scripts/osm2pgsql-replication	2022-01-24 15:04:03.000000000 +0000
@@ -4,7 +4,7 @@
 #
 # This file is part of osm2pgsql (https://osm2pgsql.org/).
 #
-# Copyright (C) 2006-2021 by the osm2pgsql developer community.
+# Copyright (C) 2006-2022 by the osm2pgsql developer community.
 # For a full list of authors see the git log.
 
 """
@@ -27,18 +27,29 @@
 import subprocess
 import tempfile
 from textwrap import dedent
-import traceback
 from pathlib import Path
 import urllib.request as urlrequest
 
-import psycopg2
+missing_modules = []
 
-from osmium.replication.server import ReplicationServer
-from osmium.replication.utils import get_replication_header
-from osmium import WriteHandler
+try:
+    import psycopg2 as psycopg
+except ImportError:
+    try:
+        import psycopg
+    except ImportError:
+        missing_modules.append('psycopg2')
+
+try:
+    from osmium.replication.server import ReplicationServer
+    from osmium.replication.utils import get_replication_header
+    from osmium import WriteHandler
+except ImportError:
+    missing_modules.append('osmium')
 
 LOG = logging.getLogger()
 
+
 def pretty_format_timedelta(seconds):
     minutes = int(seconds/60)
     (hours, minutes) = divmod(minutes, 60)
@@ -64,8 +75,8 @@
 def connect(args):
     """ Create a connection from the given command line arguments.
     """
-    return psycopg2.connect(dbname=args.database, user=args.username,
-                            host=args.host, port=args.port)
+    return psycopg.connect(dbname=args.database, user=args.username,
+                           host=args.host, port=args.port)
 
 
 def compute_database_date(conn, prefix):
@@ -485,9 +496,17 @@
     parser = get_parser()
     args = parser.parse_args()
 
+    if missing_modules:
+        LOG.fatal("Missing required Python libraries %(mods)s.\n\n"
+                  "To install them via pip run: pip install %(mods)s\n\n"
+                  "ERROR: libraries could not be loaded.",
+                  dict(mods=" ".join(missing_modules)))
+        return 1
+
+
     if args.subcommand is None:
         parser.print_help()
-        exit(1)
+        return 1
 
     logging.basicConfig(stream=sys.stderr,
                         format='{asctime} [{levelname}]: {message}',
@@ -509,4 +528,4 @@
 
 
 if __name__ == '__main__':
-    exit(main())
+    sys.exit(main())
diff -Nru osm2pgsql-1.5.2+ds/src/db-check.cpp osm2pgsql-1.6.0+ds/src/db-check.cpp
--- osm2pgsql-1.5.2+ds/src/db-check.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/db-check.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/db-check.hpp osm2pgsql-1.6.0+ds/src/db-check.hpp
--- osm2pgsql-1.5.2+ds/src/db-check.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/db-check.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/db-copy.cpp osm2pgsql-1.6.0+ds/src/db-copy.cpp
--- osm2pgsql-1.5.2+ds/src/db-copy.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/db-copy.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/db-copy.hpp osm2pgsql-1.6.0+ds/src/db-copy.hpp
--- osm2pgsql-1.5.2+ds/src/db-copy.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/db-copy.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/db-copy-mgr.hpp osm2pgsql-1.6.0+ds/src/db-copy-mgr.hpp
--- osm2pgsql-1.5.2+ds/src/db-copy-mgr.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/db-copy-mgr.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/dependency-manager.cpp osm2pgsql-1.6.0+ds/src/dependency-manager.cpp
--- osm2pgsql-1.5.2+ds/src/dependency-manager.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/dependency-manager.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/dependency-manager.hpp osm2pgsql-1.6.0+ds/src/dependency-manager.hpp
--- osm2pgsql-1.5.2+ds/src/dependency-manager.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/dependency-manager.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/domain-matcher.hpp osm2pgsql-1.6.0+ds/src/domain-matcher.hpp
--- osm2pgsql-1.5.2+ds/src/domain-matcher.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/domain-matcher.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/expire-tiles.cpp osm2pgsql-1.6.0+ds/src/expire-tiles.cpp
--- osm2pgsql-1.5.2+ds/src/expire-tiles.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/expire-tiles.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/expire-tiles.hpp osm2pgsql-1.6.0+ds/src/expire-tiles.hpp
--- osm2pgsql-1.5.2+ds/src/expire-tiles.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/expire-tiles.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/flex-table-column.cpp osm2pgsql-1.6.0+ds/src/flex-table-column.cpp
--- osm2pgsql-1.5.2+ds/src/flex-table-column.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/flex-table-column.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/flex-table-column.hpp osm2pgsql-1.6.0+ds/src/flex-table-column.hpp
--- osm2pgsql-1.5.2+ds/src/flex-table-column.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/flex-table-column.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/flex-table.cpp osm2pgsql-1.6.0+ds/src/flex-table.cpp
--- osm2pgsql-1.5.2+ds/src/flex-table.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/flex-table.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/flex-table.hpp osm2pgsql-1.6.0+ds/src/flex-table.hpp
--- osm2pgsql-1.5.2+ds/src/flex-table.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/flex-table.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/format.hpp osm2pgsql-1.6.0+ds/src/format.hpp
--- osm2pgsql-1.5.2+ds/src/format.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/format.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/gazetteer-style.cpp osm2pgsql-1.6.0+ds/src/gazetteer-style.cpp
--- osm2pgsql-1.5.2+ds/src/gazetteer-style.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/gazetteer-style.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/gazetteer-style.hpp osm2pgsql-1.6.0+ds/src/gazetteer-style.hpp
--- osm2pgsql-1.5.2+ds/src/gazetteer-style.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/gazetteer-style.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/geom.cpp osm2pgsql-1.6.0+ds/src/geom.cpp
--- osm2pgsql-1.5.2+ds/src/geom.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/geom.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/geom.hpp osm2pgsql-1.6.0+ds/src/geom.hpp
--- osm2pgsql-1.5.2+ds/src/geom.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/geom.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/geom-transform.cpp osm2pgsql-1.6.0+ds/src/geom-transform.cpp
--- osm2pgsql-1.5.2+ds/src/geom-transform.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/geom-transform.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/geom-transform.hpp osm2pgsql-1.6.0+ds/src/geom-transform.hpp
--- osm2pgsql-1.5.2+ds/src/geom-transform.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/geom-transform.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/input.cpp osm2pgsql-1.6.0+ds/src/input.cpp
--- osm2pgsql-1.5.2+ds/src/input.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/input.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/input.hpp osm2pgsql-1.6.0+ds/src/input.hpp
--- osm2pgsql-1.5.2+ds/src/input.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/input.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/logging.cpp osm2pgsql-1.6.0+ds/src/logging.cpp
--- osm2pgsql-1.5.2+ds/src/logging.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/logging.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/logging.hpp osm2pgsql-1.6.0+ds/src/logging.hpp
--- osm2pgsql-1.5.2+ds/src/logging.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/logging.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/lua-init.hpp osm2pgsql-1.6.0+ds/src/lua-init.hpp
--- osm2pgsql-1.5.2+ds/src/lua-init.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/lua-init.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/lua-utils.cpp osm2pgsql-1.6.0+ds/src/lua-utils.cpp
--- osm2pgsql-1.5.2+ds/src/lua-utils.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/lua-utils.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/lua-utils.hpp osm2pgsql-1.6.0+ds/src/lua-utils.hpp
--- osm2pgsql-1.5.2+ds/src/lua-utils.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/lua-utils.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/middle.cpp osm2pgsql-1.6.0+ds/src/middle.cpp
--- osm2pgsql-1.5.2+ds/src/middle.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/middle.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/middle.hpp osm2pgsql-1.6.0+ds/src/middle.hpp
--- osm2pgsql-1.5.2+ds/src/middle.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/middle.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/middle-pgsql.cpp osm2pgsql-1.6.0+ds/src/middle-pgsql.cpp
--- osm2pgsql-1.5.2+ds/src/middle-pgsql.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/middle-pgsql.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/middle-pgsql.hpp osm2pgsql-1.6.0+ds/src/middle-pgsql.hpp
--- osm2pgsql-1.5.2+ds/src/middle-pgsql.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/middle-pgsql.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/middle-ram.cpp osm2pgsql-1.6.0+ds/src/middle-ram.cpp
--- osm2pgsql-1.5.2+ds/src/middle-ram.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/middle-ram.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/middle-ram.hpp osm2pgsql-1.6.0+ds/src/middle-ram.hpp
--- osm2pgsql-1.5.2+ds/src/middle-ram.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/middle-ram.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/node-locations.cpp osm2pgsql-1.6.0+ds/src/node-locations.cpp
--- osm2pgsql-1.5.2+ds/src/node-locations.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/node-locations.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/node-locations.hpp osm2pgsql-1.6.0+ds/src/node-locations.hpp
--- osm2pgsql-1.5.2+ds/src/node-locations.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/node-locations.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/node-persistent-cache.cpp osm2pgsql-1.6.0+ds/src/node-persistent-cache.cpp
--- osm2pgsql-1.5.2+ds/src/node-persistent-cache.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/node-persistent-cache.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/node-persistent-cache.hpp osm2pgsql-1.6.0+ds/src/node-persistent-cache.hpp
--- osm2pgsql-1.5.2+ds/src/node-persistent-cache.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/node-persistent-cache.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/options.cpp osm2pgsql-1.6.0+ds/src/options.cpp
--- osm2pgsql-1.5.2+ds/src/options.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/options.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/options.hpp osm2pgsql-1.6.0+ds/src/options.hpp
--- osm2pgsql-1.5.2+ds/src/options.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/options.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/ordered-index.cpp osm2pgsql-1.6.0+ds/src/ordered-index.cpp
--- osm2pgsql-1.5.2+ds/src/ordered-index.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/ordered-index.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/ordered-index.hpp osm2pgsql-1.6.0+ds/src/ordered-index.hpp
--- osm2pgsql-1.5.2+ds/src/ordered-index.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/ordered-index.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/osm2pgsql.cpp osm2pgsql-1.6.0+ds/src/osm2pgsql.cpp
--- osm2pgsql-1.5.2+ds/src/osm2pgsql.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/osm2pgsql.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/osmdata.cpp osm2pgsql-1.6.0+ds/src/osmdata.cpp
--- osm2pgsql-1.5.2+ds/src/osmdata.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/osmdata.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
@@ -88,6 +88,13 @@
 
 void osmdata_t::relation(osmium::Relation const &rel)
 {
+    if (rel.members().size() > 32767) {
+        log_warn(
+            "Relation id {} ignored, because it has more than 32767 members",
+            rel.id());
+        return;
+    }
+
     if (m_append && !rel.deleted()) {
         m_output->select_relation_members(rel.id());
     }
@@ -97,9 +104,6 @@
     if (rel.deleted()) {
         relation_delete(rel.id());
     } else {
-        if (rel.members().size() > 32767) {
-            return;
-        }
         if (m_append) {
             relation_modify(rel);
         } else {
diff -Nru osm2pgsql-1.5.2+ds/src/osmdata.hpp osm2pgsql-1.6.0+ds/src/osmdata.hpp
--- osm2pgsql-1.5.2+ds/src/osmdata.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/osmdata.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/osmium-builder.cpp osm2pgsql-1.6.0+ds/src/osmium-builder.cpp
--- osm2pgsql-1.5.2+ds/src/osmium-builder.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/osmium-builder.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/osmium-builder.hpp osm2pgsql-1.6.0+ds/src/osmium-builder.hpp
--- osm2pgsql-1.5.2+ds/src/osmium-builder.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/osmium-builder.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/osmtypes.hpp osm2pgsql-1.6.0+ds/src/osmtypes.hpp
--- osm2pgsql-1.5.2+ds/src/osmtypes.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/osmtypes.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/output.cpp osm2pgsql-1.6.0+ds/src/output.cpp
--- osm2pgsql-1.5.2+ds/src/output.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/output.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/output-flex.cpp osm2pgsql-1.6.0+ds/src/output-flex.cpp
--- osm2pgsql-1.5.2+ds/src/output-flex.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/output-flex.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/output-flex.hpp osm2pgsql-1.6.0+ds/src/output-flex.hpp
--- osm2pgsql-1.5.2+ds/src/output-flex.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/output-flex.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/output-gazetteer.cpp osm2pgsql-1.6.0+ds/src/output-gazetteer.cpp
--- osm2pgsql-1.5.2+ds/src/output-gazetteer.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/output-gazetteer.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/output-gazetteer.hpp osm2pgsql-1.6.0+ds/src/output-gazetteer.hpp
--- osm2pgsql-1.5.2+ds/src/output-gazetteer.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/output-gazetteer.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/output.hpp osm2pgsql-1.6.0+ds/src/output.hpp
--- osm2pgsql-1.5.2+ds/src/output.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/output.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/output-null.cpp osm2pgsql-1.6.0+ds/src/output-null.cpp
--- osm2pgsql-1.5.2+ds/src/output-null.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/output-null.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/output-null.hpp osm2pgsql-1.6.0+ds/src/output-null.hpp
--- osm2pgsql-1.5.2+ds/src/output-null.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/output-null.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/output-pgsql.cpp osm2pgsql-1.6.0+ds/src/output-pgsql.cpp
--- osm2pgsql-1.5.2+ds/src/output-pgsql.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/output-pgsql.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/output-pgsql.hpp osm2pgsql-1.6.0+ds/src/output-pgsql.hpp
--- osm2pgsql-1.5.2+ds/src/output-pgsql.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/output-pgsql.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/pgsql.cpp osm2pgsql-1.6.0+ds/src/pgsql.cpp
--- osm2pgsql-1.5.2+ds/src/pgsql.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/pgsql.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/pgsql-helper.cpp osm2pgsql-1.6.0+ds/src/pgsql-helper.cpp
--- osm2pgsql-1.5.2+ds/src/pgsql-helper.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/pgsql-helper.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/pgsql-helper.hpp osm2pgsql-1.6.0+ds/src/pgsql-helper.hpp
--- osm2pgsql-1.5.2+ds/src/pgsql-helper.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/pgsql-helper.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/pgsql.hpp osm2pgsql-1.6.0+ds/src/pgsql.hpp
--- osm2pgsql-1.5.2+ds/src/pgsql.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/pgsql.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/progress-display.cpp osm2pgsql-1.6.0+ds/src/progress-display.cpp
--- osm2pgsql-1.5.2+ds/src/progress-display.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/progress-display.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/progress-display.hpp osm2pgsql-1.6.0+ds/src/progress-display.hpp
--- osm2pgsql-1.5.2+ds/src/progress-display.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/progress-display.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/reprojection.cpp osm2pgsql-1.6.0+ds/src/reprojection.cpp
--- osm2pgsql-1.5.2+ds/src/reprojection.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/reprojection.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/reprojection-generic-none.cpp osm2pgsql-1.6.0+ds/src/reprojection-generic-none.cpp
--- osm2pgsql-1.5.2+ds/src/reprojection-generic-none.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/reprojection-generic-none.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/reprojection-generic-proj4.cpp osm2pgsql-1.6.0+ds/src/reprojection-generic-proj4.cpp
--- osm2pgsql-1.5.2+ds/src/reprojection-generic-proj4.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/reprojection-generic-proj4.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/table.cpp osm2pgsql-1.6.0+ds/src/table.cpp
--- osm2pgsql-1.5.2+ds/src/table.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/table.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/table.hpp osm2pgsql-1.6.0+ds/src/table.hpp
--- osm2pgsql-1.5.2+ds/src/table.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/table.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/taginfo.cpp osm2pgsql-1.6.0+ds/src/taginfo.cpp
--- osm2pgsql-1.5.2+ds/src/taginfo.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/taginfo.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/taginfo.hpp osm2pgsql-1.6.0+ds/src/taginfo.hpp
--- osm2pgsql-1.5.2+ds/src/taginfo.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/taginfo.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/taginfo-impl.hpp osm2pgsql-1.6.0+ds/src/taginfo-impl.hpp
--- osm2pgsql-1.5.2+ds/src/taginfo-impl.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/taginfo-impl.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/tagtransform-c.cpp osm2pgsql-1.6.0+ds/src/tagtransform-c.cpp
--- osm2pgsql-1.5.2+ds/src/tagtransform-c.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/tagtransform-c.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,11 +3,10 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
-#include <boost/algorithm/string/predicate.hpp>
 #include <cstdlib>
 #include <cstring>
 
@@ -99,6 +98,11 @@
     return std::make_unique<c_tagtransform_t>(m_options, m_export_list);
 }
 
+static bool starts_with(char const *input, std::string const& test) noexcept
+{
+    return std::strncmp(input, test.c_str(), test.size()) == 0;
+}
+
 bool c_tagtransform_t::check_key(std::vector<taginfo> const &infos,
                                  char const *k, bool *filter,
                                  unsigned int *flags)
@@ -131,7 +135,7 @@
     if (!m_options->hstore_columns.empty()) {
         /* does this column match any of the hstore column prefixes? */
         for (auto const &column : m_options->hstore_columns) {
-            if (boost::starts_with(k, column)) {
+            if (starts_with(k, column)) {
                 /* ... but if hstore_match_only is set then don't take this
                          as a reason for keeping the object */
                 if (!m_options->hstore_match_only) {
diff -Nru osm2pgsql-1.5.2+ds/src/tagtransform-c.hpp osm2pgsql-1.6.0+ds/src/tagtransform-c.hpp
--- osm2pgsql-1.5.2+ds/src/tagtransform-c.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/tagtransform-c.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/tagtransform.cpp osm2pgsql-1.6.0+ds/src/tagtransform.cpp
--- osm2pgsql-1.5.2+ds/src/tagtransform.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/tagtransform.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/tagtransform.hpp osm2pgsql-1.6.0+ds/src/tagtransform.hpp
--- osm2pgsql-1.5.2+ds/src/tagtransform.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/tagtransform.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/tagtransform-lua.cpp osm2pgsql-1.6.0+ds/src/tagtransform-lua.cpp
--- osm2pgsql-1.5.2+ds/src/tagtransform-lua.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/tagtransform-lua.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/tagtransform-lua.hpp osm2pgsql-1.6.0+ds/src/tagtransform-lua.hpp
--- osm2pgsql-1.5.2+ds/src/tagtransform-lua.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/tagtransform-lua.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/thread-pool.cpp osm2pgsql-1.6.0+ds/src/thread-pool.cpp
--- osm2pgsql-1.5.2+ds/src/thread-pool.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/thread-pool.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/thread-pool.hpp osm2pgsql-1.6.0+ds/src/thread-pool.hpp
--- osm2pgsql-1.5.2+ds/src/thread-pool.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/thread-pool.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/util.cpp osm2pgsql-1.6.0+ds/src/util.cpp
--- osm2pgsql-1.5.2+ds/src/util.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/util.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/util.hpp osm2pgsql-1.6.0+ds/src/util.hpp
--- osm2pgsql-1.5.2+ds/src/util.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/util.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/version.cpp.in osm2pgsql-1.6.0+ds/src/version.cpp.in
--- osm2pgsql-1.5.2+ds/src/version.cpp.in	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/version.cpp.in	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/version.hpp osm2pgsql-1.6.0+ds/src/version.hpp
--- osm2pgsql-1.5.2+ds/src/version.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/version.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/wildcmp.cpp osm2pgsql-1.6.0+ds/src/wildcmp.cpp
--- osm2pgsql-1.5.2+ds/src/wildcmp.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/wildcmp.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/wildcmp.hpp osm2pgsql-1.6.0+ds/src/wildcmp.hpp
--- osm2pgsql-1.5.2+ds/src/wildcmp.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/wildcmp.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/src/wkb.hpp osm2pgsql-1.6.0+ds/src/wkb.hpp
--- osm2pgsql-1.5.2+ds/src/wkb.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/src/wkb.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/catch-main.cpp osm2pgsql-1.6.0+ds/tests/catch-main.cpp
--- osm2pgsql-1.5.2+ds/tests/catch-main.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/catch-main.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/CMakeLists.txt osm2pgsql-1.6.0+ds/tests/CMakeLists.txt
--- osm2pgsql-1.5.2+ds/tests/CMakeLists.txt	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/CMakeLists.txt	2022-01-24 15:04:03.000000000 +0000
@@ -131,6 +131,7 @@
     set_tests_properties(regression-test-pbf PROPERTIES TIMEOUT ${TESTING_TIMEOUT})
     set_tests_properties(regression-test-pbf
                          PROPERTIES FIXTURES_REQUIRED Tablespace)
+    set_tests_properties(regression-test-pbf PROPERTIES ENVIRONMENT OSM2PGSQL_BINARY=$<TARGET_FILE:osm2pgsql>)
     message(STATUS "Added test: regression-test-pbf (needs Python with psycopg2 module)")
 else()
     message(WARNING "Can not find python, regression test disabled")
diff -Nru osm2pgsql-1.5.2+ds/tests/common-buffer.hpp osm2pgsql-1.6.0+ds/tests/common-buffer.hpp
--- osm2pgsql-1.5.2+ds/tests/common-buffer.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/common-buffer.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/common-cleanup.hpp osm2pgsql-1.6.0+ds/tests/common-cleanup.hpp
--- osm2pgsql-1.5.2+ds/tests/common-cleanup.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/common-cleanup.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/common-import.hpp osm2pgsql-1.6.0+ds/tests/common-import.hpp
--- osm2pgsql-1.5.2+ds/tests/common-import.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/common-import.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/common-options.hpp osm2pgsql-1.6.0+ds/tests/common-options.hpp
--- osm2pgsql-1.5.2+ds/tests/common-options.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/common-options.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/common-pg.hpp osm2pgsql-1.6.0+ds/tests/common-pg.hpp
--- osm2pgsql-1.5.2+ds/tests/common-pg.hpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/common-pg.hpp	2022-01-24 15:04:03.000000000 +0000
@@ -6,7 +6,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/regression.py osm2pgsql-1.6.0+ds/tests/regression.py
--- osm2pgsql-1.5.2+ds/tests/regression.py	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/regression.py	2022-01-24 15:04:03.000000000 +0000
@@ -18,6 +18,7 @@
 
 import logging
 from os import path as op
+from io import StringIO
 import os
 import subprocess
 import sys
@@ -193,6 +194,27 @@
             raise RuntimeError("Import failed.")
 
 
+    @classmethod
+    def import_from_string(cls, content, format='opl'):
+        cmdline = [CONFIG['executable']]
+        params = cls.get_def_params() + cls.extra_params
+        if not '-d' in params and not '--database' in params:
+            cmdline.extend(('-d', CONFIG['test_database']))
+        cmdline.extend(params)
+        cmdline.extend(('-r', format, '-'))
+        logging.info("Executing command: {}".format(' '.join(cmdline)))
+
+        proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE,
+                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        (outp, err) = proc.communicate(input=content.encode('utf-8'))
+
+        if proc.returncode == 0:
+            logging.debug(err.decode('utf-8'))
+        else:
+            logging.warning(err.decode('utf-8'))
+            raise RuntimeError("Import failed.")
+
     def assert_count(self, count, table, where=None):
         if self.schema:
             table = self.schema + '.' + table
@@ -873,3 +895,21 @@
                          PgsqlBaseTests):
     extra_params = ['--slim', '--output-pgsql-schema=osm']
 
+# Bad data tests
+
+class TestBadOSMData(BaseRunner, unittest.TestCase):
+
+    extra_params = ['--slim']
+
+    def test_large_relation(self):
+        content = StringIO()
+        content.write('n1 x45 y34\n')
+        content.write('r1 Ttype=multipolygon M')
+        for _ in range(33000):
+            content.write('n1@,')
+        content.write('n1@')
+        self.import_from_string(content.getvalue())
+
+        self.assert_count(1, 'planet_osm_nodes')
+        self.assert_count(0, 'planet_osm_rels')
+
diff -Nru osm2pgsql-1.5.2+ds/tests/regression-test.py.in osm2pgsql-1.6.0+ds/tests/regression-test.py.in
--- osm2pgsql-1.5.2+ds/tests/regression-test.py.in	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/regression-test.py.in	2022-01-24 15:04:03.000000000 +0000
@@ -1,5 +1,6 @@
 #! @PYTHON_EXECUTABLE@ -B
 
+import os
 import sys
 import unittest
 
@@ -7,7 +8,7 @@
 
 from regression import *
 
-CONFIG['executable'] = '@osm2pgsql_BINARY_DIR@/osm2pgsql'
+CONFIG['executable'] = os.environ['OSM2PGSQL_BINARY']
 CONFIG['test_data_path'] = '@CMAKE_CURRENT_SOURCE_DIR@/data'
 CONFIG['default_data_path'] = '@osm2pgsql_SOURCE_DIR@'
 CONFIG['have_lua'] = '@HAVE_LUA@' == '1'
diff -Nru osm2pgsql-1.5.2+ds/tests/test-check-input.cpp osm2pgsql-1.6.0+ds/tests/test-check-input.cpp
--- osm2pgsql-1.5.2+ds/tests/test-check-input.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-check-input.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-db-copy-mgr.cpp osm2pgsql-1.6.0+ds/tests/test-db-copy-mgr.cpp
--- osm2pgsql-1.5.2+ds/tests/test-db-copy-mgr.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-db-copy-mgr.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-db-copy-thread.cpp osm2pgsql-1.6.0+ds/tests/test-db-copy-thread.cpp
--- osm2pgsql-1.5.2+ds/tests/test-db-copy-thread.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-db-copy-thread.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-domain-matcher.cpp osm2pgsql-1.6.0+ds/tests/test-domain-matcher.cpp
--- osm2pgsql-1.5.2+ds/tests/test-domain-matcher.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-domain-matcher.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-expire-tiles.cpp osm2pgsql-1.6.0+ds/tests/test-expire-tiles.cpp
--- osm2pgsql-1.5.2+ds/tests/test-expire-tiles.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-expire-tiles.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-geom.cpp osm2pgsql-1.6.0+ds/tests/test-geom.cpp
--- osm2pgsql-1.5.2+ds/tests/test-geom.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-geom.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-middle.cpp osm2pgsql-1.6.0+ds/tests/test-middle.cpp
--- osm2pgsql-1.5.2+ds/tests/test-middle.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-middle.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-node-locations.cpp osm2pgsql-1.6.0+ds/tests/test-node-locations.cpp
--- osm2pgsql-1.5.2+ds/tests/test-node-locations.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-node-locations.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-options-database.cpp osm2pgsql-1.6.0+ds/tests/test-options-database.cpp
--- osm2pgsql-1.5.2+ds/tests/test-options-database.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-options-database.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-options-parse.cpp osm2pgsql-1.6.0+ds/tests/test-options-parse.cpp
--- osm2pgsql-1.5.2+ds/tests/test-options-parse.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-options-parse.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-options-projection.cpp osm2pgsql-1.6.0+ds/tests/test-options-projection.cpp
--- osm2pgsql-1.5.2+ds/tests/test-options-projection.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-options-projection.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-ordered-index.cpp osm2pgsql-1.6.0+ds/tests/test-ordered-index.cpp
--- osm2pgsql-1.5.2+ds/tests/test-ordered-index.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-ordered-index.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-area.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-area.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-area.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-area.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-attr.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-attr.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-attr.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-attr.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-bbox.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-bbox.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-bbox.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-bbox.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-example-configs.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-example-configs.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-example-configs.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-example-configs.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-invalid-geom.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-invalid-geom.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-invalid-geom.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-invalid-geom.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-line.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-line.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-line.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-line.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-lua-fail.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-lua-fail.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-lua-fail.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-lua-fail.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-multigeom.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-multigeom.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-multigeom.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-multigeom.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-multi-input.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-multi-input.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-multi-input.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-multi-input.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-nodes.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-nodes.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-nodes.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-nodes.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-nogeom.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-nogeom.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-nogeom.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-nogeom.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-relation-changes.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-relation-changes.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-relation-changes.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-relation-changes.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-relation-combinations.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-relation-combinations.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-relation-combinations.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-relation-combinations.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-relations.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-relations.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-relations.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-relations.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-schema.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-schema.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-schema.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-schema.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-stage2.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-stage2.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-stage2.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-stage2.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-tablespace.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-tablespace.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-tablespace.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-tablespace.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-types.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-types.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-types.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-types.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-uni.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-uni.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-uni.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-uni.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-update.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-update.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-update.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-update.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-validgeom.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-validgeom.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-validgeom.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-validgeom.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-way-add.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-way-add.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-way-add.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-way-add.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-way-change.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-way-change.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-way-change.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-way-change.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-way-del.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-way-del.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-way-del.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-way-del.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-way-relation-add.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-way-relation-add.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-way-relation-add.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-way-relation-add.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-flex-way-relation-del.cpp osm2pgsql-1.6.0+ds/tests/test-output-flex-way-relation-del.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-flex-way-relation-del.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-flex-way-relation-del.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-gazetteer.cpp osm2pgsql-1.6.0+ds/tests/test-output-gazetteer.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-gazetteer.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-gazetteer.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-pgsql-area.cpp osm2pgsql-1.6.0+ds/tests/test-output-pgsql-area.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-pgsql-area.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-pgsql-area.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-pgsql.cpp osm2pgsql-1.6.0+ds/tests/test-output-pgsql.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-pgsql.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-pgsql.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-pgsql-hstore-match-only.cpp osm2pgsql-1.6.0+ds/tests/test-output-pgsql-hstore-match-only.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-pgsql-hstore-match-only.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-pgsql-hstore-match-only.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-pgsql-int4.cpp osm2pgsql-1.6.0+ds/tests/test-output-pgsql-int4.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-pgsql-int4.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-pgsql-int4.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-pgsql-schema.cpp osm2pgsql-1.6.0+ds/tests/test-output-pgsql-schema.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-pgsql-schema.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-pgsql-schema.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-pgsql-style-file.cpp osm2pgsql-1.6.0+ds/tests/test-output-pgsql-style-file.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-pgsql-style-file.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-pgsql-style-file.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-pgsql-tablespace.cpp osm2pgsql-1.6.0+ds/tests/test-output-pgsql-tablespace.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-pgsql-tablespace.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-pgsql-tablespace.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-pgsql-validgeom.cpp osm2pgsql-1.6.0+ds/tests/test-output-pgsql-validgeom.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-pgsql-validgeom.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-pgsql-validgeom.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-output-pgsql-z_order.cpp osm2pgsql-1.6.0+ds/tests/test-output-pgsql-z_order.cpp
--- osm2pgsql-1.5.2+ds/tests/test-output-pgsql-z_order.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-output-pgsql-z_order.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-parse-osmium.cpp osm2pgsql-1.6.0+ds/tests/test-parse-osmium.cpp
--- osm2pgsql-1.5.2+ds/tests/test-parse-osmium.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-parse-osmium.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-persistent-cache.cpp osm2pgsql-1.6.0+ds/tests/test-persistent-cache.cpp
--- osm2pgsql-1.5.2+ds/tests/test-persistent-cache.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-persistent-cache.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-pgsql.cpp osm2pgsql-1.6.0+ds/tests/test-pgsql.cpp
--- osm2pgsql-1.5.2+ds/tests/test-pgsql.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-pgsql.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-reprojection.cpp osm2pgsql-1.6.0+ds/tests/test-reprojection.cpp
--- osm2pgsql-1.5.2+ds/tests/test-reprojection.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-reprojection.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-taginfo.cpp osm2pgsql-1.6.0+ds/tests/test-taginfo.cpp
--- osm2pgsql-1.5.2+ds/tests/test-taginfo.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-taginfo.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-util.cpp osm2pgsql-1.6.0+ds/tests/test-util.cpp
--- osm2pgsql-1.5.2+ds/tests/test-util.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-util.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */
 
diff -Nru osm2pgsql-1.5.2+ds/tests/test-wildcard-match.cpp osm2pgsql-1.6.0+ds/tests/test-wildcard-match.cpp
--- osm2pgsql-1.5.2+ds/tests/test-wildcard-match.cpp	2022-01-11 09:24:39.000000000 +0000
+++ osm2pgsql-1.6.0+ds/tests/test-wildcard-match.cpp	2022-01-24 15:04:03.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * This file is part of osm2pgsql (https://osm2pgsql.org/).
  *
- * Copyright (C) 2006-2021 by the osm2pgsql developer community.
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
  * For a full list of authors see the git log.
  */