From 46ccca220dfc83c3bcbe4d13c21990f3827e07e4 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Sun, 9 Feb 2014 12:21:24 +0100 Subject: license change in artwork and hotkeys, with permission from contributors --- plugins/hotkeys/COPYING | 18 ------------------ plugins/hotkeys/hotkeys.c | 29 +++++++++++++++++------------ plugins/hotkeys/hotkeys.h | 34 +++++++++++++++++++--------------- 3 files changed, 36 insertions(+), 45 deletions(-) (limited to 'plugins/hotkeys') diff --git a/plugins/hotkeys/COPYING b/plugins/hotkeys/COPYING index 785a5a38..197bfba0 100644 --- a/plugins/hotkeys/COPYING +++ b/plugins/hotkeys/COPYING @@ -1,26 +1,8 @@ Hotkeys plugin for DeaDBeeF -hotkeys.c Copyright (C) 2009-2011 Viktor Semykin Copyright (C) 2012-2014 Alexey Yakovenko -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - - - -actionhandlers.c, actionhandlers.h -Copyright (C) 2012-2014 Alexey Yakovenko This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/plugins/hotkeys/hotkeys.c b/plugins/hotkeys/hotkeys.c index c8d1fa67..9ad4aead 100644 --- a/plugins/hotkeys/hotkeys.c +++ b/plugins/hotkeys/hotkeys.c @@ -3,18 +3,23 @@ Copyright (C) 2009-2011 Viktor Semykin Copyright (C) 2012-2013 Alexey Yakovenko - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. */ #include #include diff --git a/plugins/hotkeys/hotkeys.h b/plugins/hotkeys/hotkeys.h index cfc12108..7c7171f3 100644 --- a/plugins/hotkeys/hotkeys.h +++ b/plugins/hotkeys/hotkeys.h @@ -1,21 +1,25 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko + Hotkeys plugin for DeaDBeeF + Copyright (C) 2009-2011 Viktor Semykin Copyright (C) 2012-2013 Alexey Yakovenko - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. */ #ifndef __HOTKEYS_H #define __HOTKEYS_H -- cgit v1.2.3