From 19faf99fac43e2af52f399f25d30343a98009dd7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 23 Nov 2010 16:46:41 +0000 Subject: updated copyright to standard FreeBSD license after conversation with Ville Pulkki svn path=/trunk/externals/vbap/; revision=14509 --- LICENSE.txt | 54 ++++++++++++++++++++++++------------------------------ README.txt | 6 +++++- debian/copyright | 48 +++++++++++++++++++++++++++++++++--------------- 3 files changed, 62 insertions(+), 46 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 331a78f..7522f1c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,36 +1,30 @@ -Copyright +Copyright (c) 1998-2010 Ville Pulkki. All rights reserved. -This software is being provided to you, the licensee, by Ville Pulkki, -under the following license. By obtaining, using and/or copying this -software, you agree that you have read, understood, and will comply -with these terms and conditions: Permission to use, copy, modify and -distribute, including the right to grant others rights to distribute -at any tier, this software and its documentation for any purpose and -without fee or royalty is hereby granted, provided that you agree to -comply with the following copyright notice and statements, including -the disclaimer, and that the same appear on ALL copies of the software -and documentation, including modifications that you make for internal -use or for distribution: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: -Copyright 1998-2002 by Ville Pulkki. All rights reserved. + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. -Written by Ville Pulkki -Helsinki University of Technology -Laboratory of acoustics and audio signal processing + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. +THIS SOFTWARE IS PROVIDED BY VILLE PULKKI ``AS IS'' AND WITHOUT ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL VILLE PULKKI OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -The software may be used, distributed, and included to commercial -products without any charges. When included to a commercial product, -the method "Vector Base Amplitude Panning" and its developer Ville -Pulkki must be referred to in documentation. +The views and conclusions contained in the software and documentation +are those of the authors and should not be interpreted as representing +official policies, either expressed or implied, of Ville Pulkki. -This software is provided "as is", and Ville Pulkki or Helsinki -University of Technology make no representations or warranties, -expressed or implied. By way of example, but not limitation, Helsinki -University of Technology or Ville Pulkki make no representations or -warranties of merchantability or fitness for any particular purpose or -that the use of the licensed software or documentation will not -infringe any third party patents, copyrights, trademarks or other -rights. The name of Ville Pulkki or Helsinki University of Technology -may not be used in advertising or publicity pertaining to distribution -of the software. diff --git a/README.txt b/README.txt index e42cbbc..34b7477 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,9 @@ -A Pd port of the VBAP object for Max/MSP by Ville Pulkki +A Pd port of the VBAP object for Max/MSP + +Written by Ville Pulkki +Helsinki University of Technology +Laboratory of acoustics and audio signal processing http://www.acoustics.hut.fi/research/cat/vbap/ diff --git a/debian/copyright b/debian/copyright index c5b67df..7b852e1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,20 +4,38 @@ Maintainer: Source: http://sourceforge.net/projects/pure-data/files/libraries/vbap/ Files: * -Copyright: 2001-2003, Free Software Foundation -License: GPL-2+ - This package 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. +Copyright: 1998-2010 Ville Pulkki + 2003, Olaf Matthes + 2006-2010, Hans-Christoph Steiner + 2007, Frank Barknecht +License: FreeBSD License + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: . - This package 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. + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. . - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -X-Comment: On Debian systems, the complete text of the GNU General - Public License can be found in `/usr/share/common-licenses/GPL-2'. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + . + THIS SOFTWARE IS PROVIDED BY VILLE PULKKI ``AS IS'' AND WITHOUT ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL VILLE PULKKI OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + . + The views and conclusions contained in the software and documentation + are those of the authors and should not be interpreted as representing + official policies, either expressed or implied, of Ville Pulkki. + + + -- cgit v1.2.1