From 3067e1592906a878c298f8c90300f482520ca44d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Fri, 3 Feb 2017 23:14:34 +0100 Subject: [PATCH] Fix and update LICENSE --- LICENSE | 26 ++++++++++++-------------- src/add-pronunciation.c | 1 - src/dictzip-input-stream.c | 1 - src/dictzip-input-stream.h | 1 - src/generator.c | 1 - src/generator.h | 1 - src/query-tool.c | 1 - src/sdtui.c | 1 - src/stardict-private.h | 1 - src/stardict.c | 1 - src/stardict.h | 1 - src/test-stardict.c | 1 - src/utils.c | 1 - src/utils.h | 1 - 14 files changed, 12 insertions(+), 27 deletions(-) diff --git a/LICENSE b/LICENSE index 1be9ed2..2bc063d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,15 +1,13 @@ - Copyright (c) 2013 - 2016, Přemysl Janouch - All rights reserved. - - 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. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +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. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/src/add-pronunciation.c b/src/add-pronunciation.c index 3fe7ae8..5c2a957 100644 --- a/src/add-pronunciation.c +++ b/src/add-pronunciation.c @@ -5,7 +5,6 @@ * It's far from ideal, rather good as a starting point. * * Copyright (c) 2013, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/dictzip-input-stream.c b/src/dictzip-input-stream.c index f17a3c2..ae54c1f 100644 --- a/src/dictzip-input-stream.c +++ b/src/dictzip-input-stream.c @@ -2,7 +2,6 @@ * dictzip-input-stream.c: dictzip GIO stream reader * * Copyright (c) 2013, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/dictzip-input-stream.h b/src/dictzip-input-stream.h index c10214e..99e3ae5 100644 --- a/src/dictzip-input-stream.h +++ b/src/dictzip-input-stream.h @@ -2,7 +2,6 @@ * dictzip-input-stream.h: dictzip GIO stream reader * * Copyright (c) 2013, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/generator.c b/src/generator.c index ab2a130..45d833d 100644 --- a/src/generator.c +++ b/src/generator.c @@ -2,7 +2,6 @@ * generator.c: dictionary generator * * Copyright (c) 2013, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/generator.h b/src/generator.h index 763fd28..0a23f44 100644 --- a/src/generator.h +++ b/src/generator.h @@ -5,7 +5,6 @@ * conveniently reused by the included tools. * * Copyright (c) 2013, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/query-tool.c b/src/query-tool.c index 55fd823..fa790be 100644 --- a/src/query-tool.c +++ b/src/query-tool.c @@ -9,7 +9,6 @@ * according to your needs, it's not very complicated. * * Copyright (c) 2013, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/sdtui.c b/src/sdtui.c index d2cccc1..406a780 100644 --- a/src/sdtui.c +++ b/src/sdtui.c @@ -2,7 +2,6 @@ * StarDict terminal UI * * Copyright (c) 2013 - 2016, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/stardict-private.h b/src/stardict-private.h index 5d3ae6a..831390d 100644 --- a/src/stardict-private.h +++ b/src/stardict-private.h @@ -2,7 +2,6 @@ * stardict-private.h: internal StarDict API * * Copyright (c) 2013 - 2015, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/stardict.c b/src/stardict.c index 4eb25fd..d5ed772 100644 --- a/src/stardict.c +++ b/src/stardict.c @@ -2,7 +2,6 @@ * stardict.c: StarDict API * * Copyright (c) 2013 - 2016, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/stardict.h b/src/stardict.h index 5bdbc63..ea3253c 100644 --- a/src/stardict.h +++ b/src/stardict.h @@ -6,7 +6,6 @@ * freely available on the Internet. * * Copyright (c) 2013 - 2016, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/test-stardict.c b/src/test-stardict.c index 3b62c08..2a63b32 100644 --- a/src/test-stardict.c +++ b/src/test-stardict.c @@ -2,7 +2,6 @@ * test-stardict.c: StarDict API test * * Copyright (c) 2013, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/utils.c b/src/utils.c index 02485d2..ea25255 100644 --- a/src/utils.c +++ b/src/utils.c @@ -2,7 +2,6 @@ * utils.c: miscellaneous utilities * * Copyright (c) 2013 - 2015, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/utils.h b/src/utils.h index 1b6942c..2212040 100644 --- a/src/utils.h +++ b/src/utils.h @@ -2,7 +2,6 @@ * utils.h: miscellaneous utilities * * Copyright (c) 2013 - 2015, Přemysl Janouch - * All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above