Skip to content

Commit

Permalink
prepare release v1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lonvia committed Jul 28, 2020
1 parent 9552b96 commit 9d6d39e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
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 and other OpenStreetMap project members.
Kevin Kreiser, Paul Norman, Jochen Topf and other OpenStreetMap project members.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(PACKAGE osm2pgsql)
set(PACKAGE_NAME osm2pgsql)
set(PACKAGE_VERSION 1.2.0)
set(PACKAGE_VERSION 1.3.0)

cmake_minimum_required(VERSION 2.8.7)

Expand Down
10 changes: 4 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ in modern C++, making use of data structures in the standard library.

## Versioning

Osm2pgsql uses a X.Y.Z version number, where Y tells you if you are on a stable
or development series. Even numbers are stable and development versions are odd.
Osm2pgsql uses [semantic versioning](https://semver.org/).

Bugs and known issues are fixed on the main branch only. Exceptions may be made
for easy bug fixes, or if a patch backporting a fix is provided.
for severe bugs.

## Code style

Expand All @@ -42,7 +41,7 @@ Template parameters must use all upper case.
Headers should be included in the order `config.h`, C++ standard library headers,
C library headers, Boost headers, and last osm2pgsql files.

There is a .clang-format configuration avialable and all code must be run through
There is a .clang-format configuration available and all code must be run through
clang-format before submitting. You can use git-clang-format after staging all
your changes:

Expand Down Expand Up @@ -132,5 +131,4 @@ the report.
## Maintainers

The current maintainers of osm2pgsql are [Sarah Hoffmann](https://github.com/lonvia/)
and [Paul Norman](https://github.com/pnorman/). Sarah has more experience with
the gazetteer backend and Paul with the pgsql and multi backends.
and [Paul Norman](https://github.com/pnorman/).

0 comments on commit 9d6d39e

Please sign in to comment.