From 5a4c8c11564104afca14b787ef14131053977b5b Mon Sep 17 00:00:00 2001 From: Paul Norman Date: Thu, 11 Jul 2019 10:12:18 -0700 Subject: [PATCH] License the .proto and header files under MIT --- README | 3 +++ include/osmpbf/osmpbf.h | 11 +++++++++++ src/fileformat.proto | 13 +++---------- src/osmformat.proto | 13 +++---------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README b/README index 05c386d..a7fdc67 100644 --- a/README +++ b/README @@ -57,3 +57,6 @@ To install the Debian/Ubuntu packages: To clean up after: debclean +License +======= +The .proto definition files and osmpbf.h are licensed under the MIT license. The other source code is licensed under the LGPL v3+. diff --git a/include/osmpbf/osmpbf.h b/include/osmpbf/osmpbf.h index 7719476..977b66f 100644 --- a/include/osmpbf/osmpbf.h +++ b/include/osmpbf/osmpbf.h @@ -1,5 +1,16 @@ #ifndef OSMPBF_H #define OSMPBF_H +/* + Copyright 2011-2014 Jochen Topf , + Copyrigt 2012 Scott A. Crosby. + + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + */ // this describes the low-level blob storage #include // IWYU pragma: export diff --git a/src/fileformat.proto b/src/fileformat.proto index e6fd937..21e670a 100644 --- a/src/fileformat.proto +++ b/src/fileformat.proto @@ -1,17 +1,10 @@ /** Copyright (c) 2010 Scott A. Crosby. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - 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 Lesser General Public License for more details. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/src/osmformat.proto b/src/osmformat.proto index 82bde2f..e59bab7 100644 --- a/src/osmformat.proto +++ b/src/osmformat.proto @@ -1,17 +1,10 @@ /** Copyright (c) 2010 Scott A. Crosby. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - 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 Lesser General Public License for more details. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */