edit Icinga license info so that GitHub recognizes it

GitHub uses a library called Licensee to identify a project's license
type. It shows this information in the status bar and via the API if it
can unambiguously identify the license.

This commit modifies a few of Icinga's license-related docs so that
Licensee is able to recognize the repository's license type. It moves
the contents of COPYING.Exceptions to the relevant section of the
README, which has been renamed to "Licensing". It then removes the
COPYING.Exceptions file and updates CMakeLists.txt accordingly.

Collectively, these changes allow Licensee to successfully identify the
license type of Icinga as GPL 2.0.

Signed-off-by: Andrea Kao <eirinikos@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c778bbfcdd65a1fb84114cc6118b6dbc0bee279f..e66efb2e83ddcbae8ff359be5e245129b28aa7b1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,6 @@ endif()
 set(ICINGA2_BUILD_COMPILER_VERSION "${CMAKE_CXX_COMPILER_VERSION}")
 
 file(READ "${CMAKE_CURRENT_SOURCE_DIR}/COPYING" ICINGA2_LICENSE_GPL)
-file(READ "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.Exceptions" ICINGA2_LICENSE_ADDITIONS)
 set(ICINGA2_LICENSE "${ICINGA2_LICENSE_GPL}\n\n---\n\n${ICINGA2_LICENSE_ADDITIONS}")
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt" ${ICINGA2_LICENSE})
 
@@ -344,7 +343,7 @@ endif()
 configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ESCAPE_QUOTES)
 
 install(
-  FILES README.md COPYING COPYING.Exceptions AUTHORS CHANGELOG.md NEWS
+  FILES README.md COPYING AUTHORS CHANGELOG.md NEWS
   DESTINATION ${CMAKE_INSTALL_DOCDIR}
 )
 

diff --git a/COPYING.Exceptions b/COPYING.Exceptions
deleted file mode 100644 (file)
index d84e355..0000000
--- a/COPYING.Exceptions
+++ /dev/null
@@ -1,13 +0,0 @@
-In addition, as a special exception, the copyright holders give
-permission to link the code of portions of this program with the
-OpenSSL library under certain conditions as described in each
-individual source file, and distribute linked combinations including
-the two.
-
-You must obey the GNU General Public License in all respects for all
-of the code used other than OpenSSL. If you modify file(s) with this
-exception, you may extend this exception to your version of the
-file(s), but you are not obligated to do so. If you do not wish to do
-so, delete this exception statement from your version. If you delete
-this exception statement from all source files in the program, then
-also delete it here.

diff --git a/README.md b/README.md
index 17d29cda14d3cbf0cd1bd732a94143452f886d63..7e5314b1ff491309e1cc30b15176c84359904c58 100644 (file)
--- a/README.md
+++ b/README.md
@@ -27,12 +27,26 @@ as web interface.
 More information can be found at [www.icinga.com](https://www.icinga.com/products/icinga-2/)
 and inside the [documentation](https://www.icinga.com/docs/icinga2/latest/).
 
-## License
+## Licensing
 
 Icinga 2 and the Icinga 2 documentation are licensed under the terms of the GNU
 General Public License Version 2, you will find a copy of this license in the
 COPYING file included in the source package.
 
+In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the
+OpenSSL library under certain conditions as described in each
+individual source file, and distribute linked combinations including
+the two.
+
+You must obey the GNU General Public License in all respects for all
+of the code used other than OpenSSL. If you modify file(s) with this
+exception, you may extend this exception to your version of the
+file(s), but you are not obligated to do so. If you do not wish to do
+so, delete this exception statement from your version. If you delete
+this exception statement from all source files in the program, then
+also delete it here.
+
 ## Installation
 
 Read the [INSTALL.md](INSTALL.md) file for more information about how to install it.