From e5faed57c22b7ac8390c454df026351d4e8e4a45 Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Sun, 24 Jun 2018 05:23:31 +0200 Subject: 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 ++------- po/cs.po | 2 +- src/add-pronunciation.c | 5 ++--- src/dictzip-input-stream.c | 5 ++--- src/dictzip-input-stream.h | 5 ++--- src/generator.c | 5 ++--- src/generator.h | 5 ++--- src/query-tool.c | 5 ++--- src/sdtui.c | 5 ++--- src/stardict-private.h | 5 ++--- src/stardict.c | 5 ++--- src/stardict.h | 5 ++--- src/test-stardict.c | 5 ++--- src/utils.c | 5 ++--- src/utils.h | 5 ++--- 17 files changed, 32 insertions(+), 51 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 81f57a2..4990a51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,7 +219,7 @@ endif (BUILD_TESTING) # CPack set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "StarDict terminal UI") set (CPACK_PACKAGE_VENDOR "Premysl 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_MAJOR ${project_VERSION_MAJOR}) set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR}) diff --git a/LICENSE b/LICENSE index 2bc063d..24a508c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,7 @@ -Copyright (c) 2013 - 2016, Přemysl Janouch +Copyright (c) 2013 - 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 1ee0163..c01c17b 100644 --- a/README.adoc +++ b/README.adoc @@ -117,10 +117,5 @@ Bitcoin donations: 12r5uEWEgcHC46xd64tt3hHt9EUvYYDHe9 License ------- -'sdtui' 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/po/cs.po b/po/cs.po index 576e97e..2b18d75 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: https://github.com/pjanouch/sdtui/issues\n" "POT-Creation-Date: 2016-09-28 16:12+0200\n" "PO-Revision-Date: 2016-09-28 16:15+0200\n" -"Last-Translator: Přemysl Janouch \n" +"Last-Translator: Přemysl Janouch \n" "Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" diff --git a/src/add-pronunciation.c b/src/add-pronunciation.c index 5c2a957..3bcf75d 100644 --- a/src/add-pronunciation.c +++ b/src/add-pronunciation.c @@ -4,11 +4,10 @@ * Here I use the `espeak' process rather than libespeak because of the GPL. * It's far from ideal, rather good as a starting point. * - * Copyright (c) 2013, Přemysl Janouch + * Copyright (c) 2013, 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/src/dictzip-input-stream.c b/src/dictzip-input-stream.c index ae54c1f..2c97ba6 100644 --- a/src/dictzip-input-stream.c +++ b/src/dictzip-input-stream.c @@ -1,11 +1,10 @@ /* * dictzip-input-stream.c: dictzip GIO stream reader * - * Copyright (c) 2013, Přemysl Janouch + * Copyright (c) 2013, 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/src/dictzip-input-stream.h b/src/dictzip-input-stream.h index 99e3ae5..f903919 100644 --- a/src/dictzip-input-stream.h +++ b/src/dictzip-input-stream.h @@ -1,11 +1,10 @@ /* * dictzip-input-stream.h: dictzip GIO stream reader * - * Copyright (c) 2013, Přemysl Janouch + * Copyright (c) 2013, 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/src/generator.c b/src/generator.c index 45d833d..cc8f780 100644 --- a/src/generator.c +++ b/src/generator.c @@ -1,11 +1,10 @@ /* * generator.c: dictionary generator * - * Copyright (c) 2013, Přemysl Janouch + * Copyright (c) 2013, 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/src/generator.h b/src/generator.h index 0a23f44..4d18d23 100644 --- a/src/generator.h +++ b/src/generator.h @@ -4,11 +4,10 @@ * Nothing fancy. Just something moved out off the `stardict' test to be * conveniently reused by the included tools. * - * Copyright (c) 2013, Přemysl Janouch + * Copyright (c) 2013, 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/src/query-tool.c b/src/query-tool.c index fa790be..54007d0 100644 --- a/src/query-tool.c +++ b/src/query-tool.c @@ -8,11 +8,10 @@ * So far only the `m' field is supported. Feel free to extend the program * according to your needs, it's not very complicated. * - * Copyright (c) 2013, Přemysl Janouch + * Copyright (c) 2013, 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/src/sdtui.c b/src/sdtui.c index 944d168..d8bed9c 100644 --- a/src/sdtui.c +++ b/src/sdtui.c @@ -1,11 +1,10 @@ /* * StarDict terminal UI * - * Copyright (c) 2013 - 2016, Přemysl Janouch + * Copyright (c) 2013 - 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/src/stardict-private.h b/src/stardict-private.h index 831390d..bf66138 100644 --- a/src/stardict-private.h +++ b/src/stardict-private.h @@ -1,11 +1,10 @@ /* * stardict-private.h: internal StarDict API * - * Copyright (c) 2013 - 2015, Přemysl Janouch + * Copyright (c) 2013 - 2015, 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/src/stardict.c b/src/stardict.c index d5ed772..8299d8b 100644 --- a/src/stardict.c +++ b/src/stardict.c @@ -1,11 +1,10 @@ /* * stardict.c: StarDict API * - * Copyright (c) 2013 - 2016, Přemysl Janouch + * Copyright (c) 2013 - 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/src/stardict.h b/src/stardict.h index ea3253c..bcb1830 100644 --- a/src/stardict.h +++ b/src/stardict.h @@ -5,11 +5,10 @@ * dictionaries, it should however be good enough for most of them that are * freely available on the Internet. * - * Copyright (c) 2013 - 2016, Přemysl Janouch + * Copyright (c) 2013 - 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/src/test-stardict.c b/src/test-stardict.c index 2a63b32..d0e5e50 100644 --- a/src/test-stardict.c +++ b/src/test-stardict.c @@ -1,11 +1,10 @@ /* * test-stardict.c: StarDict API test * - * Copyright (c) 2013, Přemysl Janouch + * Copyright (c) 2013, 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/src/utils.c b/src/utils.c index ea25255..1e8d436 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,11 +1,10 @@ /* * utils.c: miscellaneous utilities * - * Copyright (c) 2013 - 2015, Přemysl Janouch + * Copyright (c) 2013 - 2015, 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/src/utils.h b/src/utils.h index 2212040..afdf583 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,11 +1,10 @@ /* * utils.h: miscellaneous utilities * - * Copyright (c) 2013 - 2015, Přemysl Janouch + * Copyright (c) 2013 - 2015, 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 -- cgit v1.2.3-70-g09d2