Copyright notice changes

README.md

@@ -187,6 +187,18 @@ Lua 5.1.4 (LuaJIT 2.1.0-beta3)
 If you have problems with osm2pgsql or want to report a bug, go to
 https://osm2pgsql.org/support/ .
 
+## License
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
 ## Contributing
 
 We welcome contributions to osm2pgsql. See [CONTRIBUTING.md](CONTRIBUTING.md)

flex-config/README.md

@@ -1,4 +1,3 @@
-
 # Flex Output Configuration
 
 **The flex output is experimental. Everything in here is subject to change.**
@@ -48,3 +47,8 @@ source](https://github.com/kikito/inspect.lua) or using
 [LuaRocks](https://luarocks.org/modules/kikito/inspect). Debian/Ubuntu users
 can install the `lua-inspect` package.
 
+## Public Domain
+
+All the example config files in this directory are released into the Public
+Domain. You may use them in any way you like.
+

flex-config/compatible.lua

@@ -1,3 +1,4 @@
+-- This config example file is released into the Public Domain.
 
 -- This configuration for the flex output tries to be compatible with the
 -- original pgsql C transform output. There might be some corner cases but

flex-config/data-types.lua

@@ -1,3 +1,4 @@
+-- This config example file is released into the Public Domain.
 
 -- This is a very simple Lua config for the Flex Backend not intended for
 -- real-world use. Look at and understand "simple.lua" first, before looking

flex-config/generic.lua

@@ -1,3 +1,4 @@
+-- This config example file is released into the Public Domain.
 
 -- This is a generic configuration that is a good starting point for
 -- real-world projects. Data is split into tables according to geometry type

flex-config/geometries.lua

@@ -1,3 +1,4 @@
+-- This config example file is released into the Public Domain.
 
 -- This is a very simple Lua config for the Flex Backend not intended for
 -- real-world use. Look at and understand "simple.lua" first, before looking

flex-config/places.lua

@@ -1,3 +1,4 @@
+-- This config example file is released into the Public Domain.
 
 -- This example shows how you can use JSON and JSONB columns in your database.
 

flex-config/route-relations.lua

@@ -1,3 +1,4 @@
+-- This config example file is released into the Public Domain.
 
 -- This file shows how to use multi-stage processing to bring tags from
 -- relations into ways.

flex-config/simple.lua

@@ -1,3 +1,4 @@
+-- This config example file is released into the Public Domain.
 
 -- This is a very simple Lua config for the Flex Backend not intended for
 -- real-world use. Use it do understand the basic principles of the

flex-config/unitable.lua

@@ -1,3 +1,4 @@
+-- This config example file is released into the Public Domain.
 
 -- Put all OSM data into a single table
 

flex-config/with-schema.lua

@@ -1,3 +1,4 @@
+-- This config example file is released into the Public Domain.
 
 -- This configuration for the flex output shows how to define a table in
 -- a PostgreSQL schema.

src/db-check.cpp

@@ -1,3 +1,12 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include "db-check.hpp"
 #include "logging.hpp"
 #include "pgsql.hpp"

src/db-check.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_DB_CHECK_HPP
 #define OSM2PGSQL_DB_CHECK_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include "options.hpp"
 
 /**

src/db-copy-mgr.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_DB_COPY_MGR_HPP
 #define OSM2PGSQL_DB_COPY_MGR_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include <cassert>
 #include <memory>
 #include <string>

src/db-copy.cpp

@@ -1,3 +1,12 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include <cassert>
 
 #include "db-copy.hpp"

src/db-copy.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_DB_COPY_HPP
 #define OSM2PGSQL_DB_COPY_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include <condition_variable>
 #include <deque>
 #include <future>

src/dependency-manager.cpp

@@ -1,3 +1,11 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
 
 #include "dependency-manager.hpp"
 #include "middle.hpp"

src/dependency-manager.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_DEPENDENCY_MANAGER_HPP
 #define OSM2PGSQL_DEPENDENCY_MANAGER_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include "osmtypes.hpp"
 
 #include <osmium/index/id_set.hpp>

src/domain-matcher.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_DOMAIN_MATCHER_HPP
 #define OSM2PGSQL_DOMAIN_MATCHER_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include <osmium/osm/tag.hpp>
 
 #include <cstring>

src/expire-tiles.cpp

@@ -1,8 +1,15 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 /*
  * Dirty tile list generation
  *
- * Steve Hill <[email protected]>
- *
  * Please refer to the OpenPisteMap expire_tiles.py script for a demonstration
  * of how to make use of the output:
  * http://subversion.nexusuk.org/projects/openpistemap/trunk/scripts/expire_tiles.py

src/expire-tiles.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_EXPIRE_TILES_HPP
 #define OSM2PGSQL_EXPIRE_TILES_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include <memory>
 #include <unordered_set>
 

src/flex-table-column.cpp

@@ -1,3 +1,12 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include "flex-table-column.hpp"
 
 #include <algorithm>

src/flex-table-column.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_FLEX_TABLE_COLUMN_HPP
 #define OSM2PGSQL_FLEX_TABLE_COLUMN_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include "format.hpp"
 #include "reprojection.hpp"
 

src/flex-table.cpp

@@ -1,3 +1,12 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include "flex-table.hpp"
 #include "format.hpp"
 #include "logging.hpp"

src/flex-table.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_FLEX_TABLE_HPP
 #define OSM2PGSQL_FLEX_TABLE_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include "db-copy-mgr.hpp"
 #include "flex-table-column.hpp"
 #include "osmium-builder.hpp"

src/format.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_FORMAT_HPP
 #define OSM2PGSQL_FORMAT_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #define FMT_HEADER_ONLY
 #include <fmt/format.h>
 

src/gazetteer-style.cpp

@@ -1,3 +1,12 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include <algorithm>
 #include <cstring>
 #include <stdexcept>

src/gazetteer-style.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_GAZETTEER_STYLE_HPP
 #define OSM2PGSQL_GAZETTEER_STYLE_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include <memory>
 #include <string>
 #include <tuple>

src/geom-transform.cpp

@@ -1,3 +1,11 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
 
 #include "geom-transform.hpp"
 #include "logging.hpp"

src/geom-transform.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_GEOM_TRANSFORM_HPP
 #define OSM2PGSQL_GEOM_TRANSFORM_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include "flex-table-column.hpp"
 #include "osmium-builder.hpp"
 

src/geometry-processor.cpp

@@ -1,3 +1,12 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include "format.hpp"
 #include "geometry-processor.hpp"
 #include "middle.hpp"

src/geometry-processor.hpp

@@ -1,6 +1,15 @@
 #ifndef OSM2PGSQL_GEOMETRY_PROCESSOR_HPP
 #define OSM2PGSQL_GEOMETRY_PROCESSOR_HPP
 
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
 #include <cstddef>
 #include <memory>
 #include <string>