Skip to content

Commit 61bdfb4

Browse files
committed
Add/update copyright notice on all C++ files
This adds a copyright notice to all C++ files and the README clarifying the license. (There is no change of the license.) This also removes a few names explicitly mentioned as copyright holders, instead refering to the git log which has a full list of all osm2pgsql developers. (There is also still the AUTHORS file which names the most important developers.) The only exception is the sprompt.cpp file which was taken from PostgreSQL and keeps its original license information (and, of course, the files in contrib).
1 parent 8674b42 commit 61bdfb4

File tree

159 files changed

+1425
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+1425
-28
lines changed

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,18 @@ Lua 5.1.4 (LuaJIT 2.1.0-beta3)
187187
If you have problems with osm2pgsql or want to report a bug, go to
188188
https://osm2pgsql.org/support/ .
189189

190+
## License
191+
192+
This program is free software; you can redistribute it and/or
193+
modify it under the terms of the GNU General Public License
194+
as published by the Free Software Foundation; either version 2
195+
of the License, or (at your option) any later version.
196+
197+
This program is distributed in the hope that it will be useful,
198+
but WITHOUT ANY WARRANTY; without even the implied warranty of
199+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
200+
GNU General Public License for more details.
201+
190202
## Contributing
191203

192204
We welcome contributions to osm2pgsql. See [CONTRIBUTING.md](CONTRIBUTING.md)

src/db-check.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/**
2+
* SPDX-License-Identifier: GPL-2.0-or-later
3+
*
4+
* This file is part of osm2pgsql (https://osm2pgsql.org/).
5+
*
6+
* Copyright (C) 2006-2020 by the osm2pgsql developer community.
7+
* For a full list of authors see the git log.
8+
*/
9+
110
#include "db-check.hpp"
211
#include "logging.hpp"
312
#include "pgsql.hpp"

src/db-check.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
#ifndef OSM2PGSQL_DB_CHECK_HPP
22
#define OSM2PGSQL_DB_CHECK_HPP
33

4+
/**
5+
* SPDX-License-Identifier: GPL-2.0-or-later
6+
*
7+
* This file is part of osm2pgsql (https://osm2pgsql.org/).
8+
*
9+
* Copyright (C) 2006-2020 by the osm2pgsql developer community.
10+
* For a full list of authors see the git log.
11+
*/
12+
413
#include "options.hpp"
514

615
/**

src/db-copy-mgr.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
#ifndef OSM2PGSQL_DB_COPY_MGR_HPP
22
#define OSM2PGSQL_DB_COPY_MGR_HPP
33

4+
/**
5+
* SPDX-License-Identifier: GPL-2.0-or-later
6+
*
7+
* This file is part of osm2pgsql (https://osm2pgsql.org/).
8+
*
9+
* Copyright (C) 2006-2020 by the osm2pgsql developer community.
10+
* For a full list of authors see the git log.
11+
*/
12+
413
#include <cassert>
514
#include <memory>
615
#include <string>

src/db-copy.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/**
2+
* SPDX-License-Identifier: GPL-2.0-or-later
3+
*
4+
* This file is part of osm2pgsql (https://osm2pgsql.org/).
5+
*
6+
* Copyright (C) 2006-2020 by the osm2pgsql developer community.
7+
* For a full list of authors see the git log.
8+
*/
9+
110
#include <cassert>
211

312
#include "db-copy.hpp"

src/db-copy.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
#ifndef OSM2PGSQL_DB_COPY_HPP
22
#define OSM2PGSQL_DB_COPY_HPP
33

4+
/**
5+
* SPDX-License-Identifier: GPL-2.0-or-later
6+
*
7+
* This file is part of osm2pgsql (https://osm2pgsql.org/).
8+
*
9+
* Copyright (C) 2006-2020 by the osm2pgsql developer community.
10+
* For a full list of authors see the git log.
11+
*/
12+
413
#include <condition_variable>
514
#include <deque>
615
#include <future>

src/dependency-manager.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* SPDX-License-Identifier: GPL-2.0-or-later
3+
*
4+
* This file is part of osm2pgsql (https://osm2pgsql.org/).
5+
*
6+
* Copyright (C) 2006-2020 by the osm2pgsql developer community.
7+
* For a full list of authors see the git log.
8+
*/
19

210
#include "dependency-manager.hpp"
311
#include "middle.hpp"

src/dependency-manager.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
#ifndef OSM2PGSQL_DEPENDENCY_MANAGER_HPP
22
#define OSM2PGSQL_DEPENDENCY_MANAGER_HPP
33

4+
/**
5+
* SPDX-License-Identifier: GPL-2.0-or-later
6+
*
7+
* This file is part of osm2pgsql (https://osm2pgsql.org/).
8+
*
9+
* Copyright (C) 2006-2020 by the osm2pgsql developer community.
10+
* For a full list of authors see the git log.
11+
*/
12+
413
#include "osmtypes.hpp"
514

615
#include <osmium/index/id_set.hpp>

src/domain-matcher.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
#ifndef OSM2PGSQL_DOMAIN_MATCHER_HPP
22
#define OSM2PGSQL_DOMAIN_MATCHER_HPP
33

4+
/**
5+
* SPDX-License-Identifier: GPL-2.0-or-later
6+
*
7+
* This file is part of osm2pgsql (https://osm2pgsql.org/).
8+
*
9+
* Copyright (C) 2006-2020 by the osm2pgsql developer community.
10+
* For a full list of authors see the git log.
11+
*/
12+
413
#include <osmium/osm/tag.hpp>
514

615
#include <cstring>

src/expire-tiles.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1+
/**
2+
* SPDX-License-Identifier: GPL-2.0-or-later
3+
*
4+
* This file is part of osm2pgsql (https://osm2pgsql.org/).
5+
*
6+
* Copyright (C) 2006-2020 by the osm2pgsql developer community.
7+
* For a full list of authors see the git log.
8+
*/
9+
110
/*
211
* Dirty tile list generation
312
*
4-
* Steve Hill <[email protected]>
5-
*
613
* Please refer to the OpenPisteMap expire_tiles.py script for a demonstration
714
* of how to make use of the output:
815
* http://subversion.nexusuk.org/projects/openpistemap/trunk/scripts/expire_tiles.py

0 commit comments

Comments
 (0)