From 7fe3811c65a7c63154f03610e289a6d196f3ae2e Mon Sep 17 00:00:00 2001 From: thomascube Date: Wed, 18 Jan 2012 11:10:46 +0000 Subject: Changed license to GNU GPLv3+ with exceptions for skins and plugins --- installer/client.js | 17 +++++++++++++++++ installer/index.php | 29 ++++++++++++++++++++--------- installer/rcube_install.php | 7 +++++-- installer/utils.php | 18 ++++-------------- 4 files changed, 46 insertions(+), 25 deletions(-) (limited to 'installer') diff --git a/installer/client.js b/installer/client.js index 3121b2693..5a1e6daf5 100644 --- a/installer/client.js +++ b/installer/client.js @@ -1,3 +1,20 @@ +/* + +-----------------------------------------------------------------------+ + | Roundcube installer cleint function | + | | + | This file is part of the Roundcube web development suite | + | Copyright (C) 2009-2012, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | + | | + +-----------------------------------------------------------------------+ + | Author: Thomas Bruederli | + +-----------------------------------------------------------------------+ + + $Id$ +*/ function toggleblock(id, link) { diff --git a/installer/index.php b/installer/index.php index 7ed52240b..6653ac159 100644 --- a/installer/index.php +++ b/installer/index.php @@ -3,22 +3,33 @@ /* +-------------------------------------------------------------------------+ | Roundcube Webmail setup tool | - | Version 0.6 | + | Version 0.8 | | | - | Copyright (C) 2009-2011, The Roundcube Dev Team | + | Copyright (C) 2009-2012, The Roundcube Dev Team | | | - | This program is free software; you can redistribute it and/or modify | - | it under the terms of the GNU General Public License version 2 | - | as published by the Free Software Foundation. | + | This program is free software: you can redistribute it and/or modify | + | it under the terms of the GNU General Public License (with exceptions | + | for skins & plugins) as published by the Free Software Foundation, | + | either version 3 of the License, or (at your option) any later version. | + | | + | This file forms part of the Roundcube Webmail Software for which the | + | following exception is added: Plugins and Skins which merely make | + | function calls to the Roundcube Webmail Software, and for that purpose | + | include it by reference shall not be considered modifications of | + | the software. | + | | + | If you wish to use this file in another project or create a modified | + | version that will not be part of the Roundcube Webmail Software, you | + | may remove the exception above and use this source code under the | + | original version of the license. | | | | 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 | + | 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. | + | You should have received a copy of the GNU General Public License | + | along with this program. If not, see http://www.gnu.org/licenses/. | | | +-------------------------------------------------------------------------+ | Author: Thomas Bruederli | diff --git a/installer/rcube_install.php b/installer/rcube_install.php index 2e1a473ca..8591f1e74 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -6,10 +6,13 @@ | | | This file is part of the Roundcube Webmail package | | Copyright (C) 2008-2011, The Roundcube Dev Team | - | Licensed under the GNU Public License | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | +-----------------------------------------------------------------------+ - $Id: $ + $Id$ */ diff --git a/installer/utils.php b/installer/utils.php index a7521b980..d559df14e 100644 --- a/installer/utils.php +++ b/installer/utils.php @@ -1,23 +1,13 @@ | -- cgit v1.2.3