aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Janouch <p@janouch.name>2018-06-24 00:21:10 +0200
committerPřemysl Janouch <p@janouch.name>2018-06-24 00:21:10 +0200
commit4078c8845ce4549edb23e3138e45d32af8858ee5 (patch)
tree2bd1643b01bb6dab090bdde11a571f48433e8a39
parent333efdc70f89f5582cf21976d127e17ecd5c5b03 (diff)
downloadjson-rpc-shell-4078c8845ce4549edb23e3138e45d32af8858ee5.tar.gz
json-rpc-shell-4078c8845ce4549edb23e3138e45d32af8858ee5.tar.xz
json-rpc-shell-4078c8845ce4549edb23e3138e45d32af8858ee5.zip
Relicense to 0BSD, update mail address
I've come to the conclusion that copyright mostly just stands in the way of software development. In my jurisdiction I cannot give up my own copyright and 0BSD seems to be the closest thing to public domain. The updated mail address, also used in my author/committer lines, is shorter and looks nicer. People rarely interact anyway.
-rw-r--r--CMakeLists.txt2
-rw-r--r--LICENSE5
-rw-r--r--README.adoc9
-rw-r--r--demo-json-rpc-server.c5
4 files changed, 7 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 895a6e5..c78736a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ endforeach (page)
# CPack
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Continuous Integration Daemon")
set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
-set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p.janouch@gmail.com>")
+set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR})
set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR})
diff --git a/LICENSE b/LICENSE
index 8cc3add..01dc408 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,7 @@
-Copyright (c) 2015, Přemysl Janouch <p.janouch@gmail.com>
+Copyright (c) 2015 - 2018, Přemysl Janouch <p@janouch.name>
Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/README.adoc b/README.adoc
index e8f0404..2f80d73 100644
--- a/README.adoc
+++ b/README.adoc
@@ -61,10 +61,5 @@ Bitcoin donations: 12r5uEWEgcHC46xd64tt3hHt9EUvYYDHe9
License
-------
-'acid' is written by Přemysl Janouch <p.janouch@gmail.com>.
-
-You may use the software under the terms of the ISC license, the text of which
-is included within the package, or, at your option, you may relicense the work
-under the MIT or the Modified BSD License, as listed at the following site:
-
-http://www.gnu.org/licenses/license-list.html
+This software is released under the terms of the 0BSD license, the text of which
+is included within the package along with the list of authors.
diff --git a/demo-json-rpc-server.c b/demo-json-rpc-server.c
index c8ce29d..10c808e 100644
--- a/demo-json-rpc-server.c
+++ b/demo-json-rpc-server.c
@@ -1,11 +1,10 @@
/*
* demo-json-rpc-server.c: JSON-RPC 2.0 demo server
*
- * Copyright (c) 2015 - 2016, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2015 - 2018, Přemysl Janouch <p@janouch.name>
*
* Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF