[SCM] rubberband/master: Fix debian/copyright.

Sat Dec 8 19:08:23 UTC 2012

The following commit has been merged in the master branch:
commit e3ee35483a856098a38d319b6c10711466eda7d3
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Dec 7 14:55:54 2012 +0000

    Fix debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index df7df4b..632783c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,30 +6,37 @@ Copyright: 2007-2011 Chris Cannam <cannam at all-day-breakfast.com>
 
 Files: *
 Copyright:
- 2007-2011 Chris Cannam <cannam at all-day-breakfast.com>
+  2007-2012 Particular Programs Ltd
+  2007-2011 Chris Cannam <cannam at all-day-breakfast.com>
 License: GPL-2+
 
 Files: debian/*
 Copyright:
- 2008-2012 Székelyi Szabolcs <cc at mail.3d.hu>
- 2012 Jaromír Mikeš <mira.mikes at seznam.cz>
+  2012 Alessio Treglia <alessio at debian.org>
+  2008-2012 Székelyi Szabolcs <cc at mail.3d.hu>
+  2012 Jaromír Mikeš <mira.mikes at seznam.cz>
 License: GPL-2+
 
-Files: src/bsd-3rdparty/float_cast/float_cast.h
-Copyright:
- 2001 Erik de Castro Lopo <erikd AT mega-nerd DOT com>o
-License: UNKNOWN
+Files: src/float_cast/float_cast.h
+Copyright: 2001 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+License: other-1
 
-Files: src/bsd-3rdparty/getopt/getopt.c
-Copyright:
- 1987, 1993, 1994 The Regents of the University of California
-License: BSD 1987
+Files: src/getopt/getopt.c
+Copyright: 1987, 1993, 1994 The Regents of the University of California
+License: other-bsd-4-clause-1
 
-Files: src/bsd-3rdparty/getopt/getopt.h
- src/bsd-3rdparty/getopt/getopt_long.c
-Copyright:
- 2000 The NetBSD Foundation, Inc.
-License: BSD 2000
+Files: src/getopt/getopt.h
+ src/getopt/getopt_long.c
+Copyright: 2000 The NetBSD Foundation, Inc.
+License: other-bsd-4-clause-2
+
+Files: src/pommier/*
+Copyright: 2011  Julien Pommier
+License: zlib
+
+Files: src/kissfft/*
+Copyright: 2003-2004 Mark Borgerding
+License: other-bsd-3-clause-kissft
 
 License: GPL-2+
  This program is free software: you can redistribute it and/or modify
@@ -41,20 +48,21 @@ License: GPL-2+
  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.
-Comment: You should have received a copy of the GNU General Public License
+ .
+ You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-License: UNKNOWN
+License: other-1
  Permission to use, copy, modify, distribute, and sell this file for any
  purpose is hereby granted without fee, provided that the above copyright
  and this permission notice appear in all copies.  No representations are
  made about the suitability of this software for any purpose.  It is
  provided "as is" without express or implied warranty.
 
-License: BSD 1987
+License: other-bsd-4-clause-1
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -83,7 +91,7 @@ License: BSD 1987
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-License: BSD 2000
+License: other-bsd-4-clause-2
  This code is derived from software contributed to The NetBSD Foundation
  by Dieter Baron and Thomas Klausner.
  .
@@ -115,3 +123,46 @@ License: BSD 2000
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
+License: zlib
+ 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.
+
+License: other-bsd-3-clause-kissft
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the author nor the names of any contributors may be used
+      to endorse or promote products derived from this software
+      without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND 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 THE COPYRIGHT
+ OWNER 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.

-- 
rubberband packaging

