summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Janouch <p@janouch.name>2018-06-24 04:29:24 +0200
committerPřemysl Janouch <p@janouch.name>2018-06-24 04:29:24 +0200
commit7f8ad9430f8a08169eb4ddf756ca6570bac2535b (patch)
tree74d0d6ad1e4b11773c7cce2763486b5c3a311348
parent64ba783d0f6e4884664c0449803f6857b672a571 (diff)
downloadnncmpp-7f8ad9430f8a08169eb4ddf756ca6570bac2535b.tar.gz
nncmpp-7f8ad9430f8a08169eb4ddf756ca6570bac2535b.tar.xz
nncmpp-7f8ad9430f8a08169eb4ddf756ca6570bac2535b.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--nncmpp.c5
4 files changed, 7 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 614adf5..d80401b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ endforeach (page)
# CPack
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPD client")
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 7678a10..44aed90 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,7 @@
-Copyright (c) 2016 - 2017, Přemysl Janouch <p.janouch@gmail.com>
+Copyright (c) 2016 - 2017, 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 8a5a14d..5f8d29d 100644
--- a/README.adoc
+++ b/README.adoc
@@ -100,10 +100,5 @@ Bitcoin donations: 12r5uEWEgcHC46xd64tt3hHt9EUvYYDHe9
License
-------
-'nncmpp' 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/nncmpp.c b/nncmpp.c
index 7e86f12..72d30fd 100644
--- a/nncmpp.c
+++ b/nncmpp.c
@@ -1,11 +1,10 @@
/*
* nncmpp -- the MPD client you never knew you needed
*
- * Copyright (c) 2016 - 2017, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2016 - 2017, 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