From 5bd9844317789f3a1456dc8f1fbd1f815c3768b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Sun, 24 Jun 2018 05:33:30 +0200 Subject: [PATCH] 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. --- CMakeLists.txt | 2 +- LICENSE | 5 ++--- README.adoc | 9 ++------- cmake/FindVala.cmake | 6 ++---- cmake/ValaPrecompile.cmake | 6 ++---- wdmtg.vala | 5 ++--- xext.vapi | 3 +-- 7 files changed, 12 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd3fd20..27c68db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ install (TARGETS ${PROJECT_NAME} DESTINATION bin) # CPack set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Activity tracker") set (CPACK_PACKAGE_VENDOR "Přemysl Janouch") -set (CPACK_PACKAGE_CONTACT "Přemysl Janouch ") +set (CPACK_PACKAGE_CONTACT "Přemysl Janouch ") set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set (CPACK_PACKAGE_VERSION ${project_VERSION}) set (CPACK_GENERATOR "TGZ;ZIP") diff --git a/LICENSE b/LICENSE index b1ffce3..5d8799e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,7 @@ -Copyright (c) 2016, Přemysl Janouch +Copyright (c) 2016, Přemysl Janouch 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 b94e5d4..cce385a 100644 --- a/README.adoc +++ b/README.adoc @@ -48,10 +48,5 @@ Vala just makes all sorts of things complicated but it's a necessary evil here. License ------- -'wdmtg' is written by Přemysl Janouch . - -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/cmake/FindVala.cmake b/cmake/FindVala.cmake index fb6f9bd..63cdc88 100644 --- a/cmake/FindVala.cmake +++ b/cmake/FindVala.cmake @@ -6,12 +6,10 @@ # VALA_VERSION #============================================================================= -# Copyright (c) 2011, 2016, Přemysl Janouch -# All rights reserved. +# Copyright (c) 2011, 2016, Přemysl Janouch # # 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/cmake/ValaPrecompile.cmake b/cmake/ValaPrecompile.cmake index d18afe3..8c5468b 100644 --- a/cmake/ValaPrecompile.cmake +++ b/cmake/ValaPrecompile.cmake @@ -14,12 +14,10 @@ # #============================================================================= -# Copyright (c) 2011, 2016, Přemysl Janouch -# All rights reserved. +# Copyright (c) 2011, 2016, Přemysl Janouch # # 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/wdmtg.vala b/wdmtg.vala index 7158f58..0a7f959 100644 --- a/wdmtg.vala +++ b/wdmtg.vala @@ -1,11 +1,10 @@ // // wdmtg.vala: activity tracker // -// Copyright (c) 2016, Přemysl Janouch +// Copyright (c) 2016, Přemysl Janouch // // 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/xext.vapi b/xext.vapi index 8fb09e8..e3f39df 100644 --- a/xext.vapi +++ b/xext.vapi @@ -4,8 +4,7 @@ // Copyright (c) 2016, Přemysl Janouch // // 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