[SCM] supercollider/master: Update copyright file: Merge Files sections with same Licensing and (subsets of) same copyright holders.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d925ff6045a7410ca016fbd68078a37705f02861
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Feb 7 21:17:35 2012 +0100

    Update copyright file: Merge Files sections with same Licensing and (subsets of) same copyright holders.

diff --git a/debian/copyright b/debian/copyright
index 643e668..c73266f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,7 @@ Copyright: 2002-2007, James McCartney
  2009-2011, Axel Balley <axel.lists at gmail.com>
  2009-2011, Batuhan Bozkurt <bbozkurt at users.sourceforge.net>
  2004-2005, Benjamin Golinvaux <Benjamin.Golinvaux at euresys.com>
- 2007-2010, Blackrain <blackrain.sc at gmail.com>
+ 2005,2007-2010, Blackrain <blackrain.sc at gmail.com>
  2008-2010, Charles Picasso <thelych at gmail.com>
  2002-2011, Chris Sattinger (Crucial Felix) <felix at crucial-systems.com>
  2006, Christian A.  Hresko <christian.hresko at verizon.net>
@@ -56,10 +56,6 @@ Files: common/build/Help/*
 Copyright: 2009, SuperCollider 3 documentation contributors
 License: CC-BY-SA-3.0
 
-Files: common/include/nova-simd/*
-Copyright: 2008-2010, Tim Blechmann <tim at klingt.org>
-License: GPL-2+
-
 Files: common/include/nova-simd/libsimdmath/*
 Copyright: 2008, Helmut Dersch
 License: GPL-3+
@@ -92,34 +88,12 @@ Files: common/Psycollider/PySCLang/pycxx/CXX/Exception.hxx
 Copyright: 1998, The Regents of the University of California
 License: LLNL
 
-Files: common/Headers/common/SC_fftlib.h
- common/Source/plugins/onsetsds.*
- common/Source/plugins/UnpackFFTUGens.cpp
- common/build/SCClassLibrary/Common/Audio/FFTUnpacking.sc
- common/build/examples/other/keepyuppy.scd
-Copyright: 2005-2008, Dan Stowell <danstowell at users.sourceforge.net>
-License: GPL-2+
-
 Files: editors/scel/el/sclang-vars.el.in
  editors/scel/el/sclang-widgets.el
  editors/scel/el/tree-widget.el
 Copyright: 2004-2005, Free Software Foundation, Inc
 License: GPL-2+
 
-Files: common/Source/common/SC_fftlib.cpp
- common/Source/plugins/FFT_UGens.cpp
- common/Source/plugins/ML_SpecStats.cpp
- common/Source/plugins/Onsets.cpp
- common/Source/plugins/Onsets.h
-Copyright: 2002, James McCartney
- 2006-2008, Dan Stowell
-License: GPL-2+
-
-Files: common/Headers/common/SC_DirUtils.h
- common/Source/common/SC_DirUtils.cpp
-Copyright: 2005, Tim Walters
-License: GPL-2+
-
 Files: common/Source/lang/LangPrimSource/SC_Speech.M
  common/Source/lang/LangPrimSource/SC_Speech.cpp
 Copyright: 2003, sampleAndHold.org
@@ -149,43 +123,16 @@ License: GPL-2+ with Bison exception
  files to be licensed under the GNU General Public License without this
  special exception.
 
-Files: common/Psycollider/Psycollider/Psycollider.py
-Copyright: Benjamin Golinvaux
-License: GPL-2+
-
 Files: common/Source/plugins/FilterUGens.cpp
 Copyright: 2002, James McCartney
  2007, Federico Fontana <federico.fontana at univr.it>
 License: GPL-2+
 
-Files: common/Source/server/SC_AU.cpp
-Copyright: 2002, James McCartney
- 2006-2008, Gerard Roma
-License: GPL-2+
-
 Files: common/Source/plugins/DynNoiseUGens.cpp
 Copyright: 2002, James McCartney
  2004, HfbK
 License: GPL-2+
 
-Files: common/Source/lang/LangPrimSource/SC_Wii.cpp
- editors/scel/sc/ScelDocument.sc
-Copyright: 2007, Marije Baalman <nescivi at gmail.com>
-License: GPL-2+
-
-Files: common/Headers/lang/PyrSlot64.h
-Copyright: 2002, James McCartney
- 2009, Tim Blechmann
-License: GPL-2+
-
-Files: common/Source/lang/LangPrimSource/SC_HID.cpp
-Copyright: 2003, Jan Truetzschler
-License: GPL-2+
-
-Files: common/Headers/lang/SC_LibraryConfig.h
-Copyright: 2003, Maurizio Umberto Puxeddu <umbpux at tin.it>
-License: GPL-2+
-
 Files: common/include/nova-simd/benchmarks/perf_counter.hpp
 Copyright: 2008, Tim Blechmann <tim at klingt.org>
  2008-2009, Red Hat, Inc., Ingo Molnar
@@ -193,10 +140,6 @@ Copyright: 2008, Tim Blechmann <tim at klingt.org>
  2008-2009, Thomas Gleixner <tglx at linutronix.de>
 License: GPL-2+
 
-Files: common/Source/plugins/TestUGens.cpp
-Copyright: 2007, Scott Wilson <i at scottwilson.ca>.
-License: GPL-2+
-
 Files: common/Headers/plugin_interface/SC_sndfile_stub.h
 Copyright: 1999-2009, Erik de Castro Lopo <erikd at mega-nerd.com>
 License: LGPL-2.1+
@@ -205,22 +148,10 @@ Files: common/Packager/pkg-dmg
 Copyright: 2005, Mark Mentovai <mark at moxienet.com>
 License: MPL-1.1 GPL
 
-Files: editors/scel/el/sclang-minor-mode.el
-Copyright: 2007, Marije Baalman - nescivi <nescivi at gmail.com>
-License: GPL-2+
-
-Files: common/Source/lang/LangSource/SC_LibraryConfig.cpp
-Copyright: 2003, Maurizio Umberto Puxeddu
-License: GPL-2+
-
 Files: common/build/examples/GUI examples/ColorBrowser.scd
 Copyright: 2007, Tom Hall <scth at ludions.com>
 License: GPL-2+
 
-Files: common/Source/plugins/ReverbUGens.cpp
-Copyright: 2005, blackrain <blackrain.sc at gmail.com>.
-License: GPL-2+
-
 Files: debian/*
 Copyright: 2004, Paul Brossier <piem at altern.org>
            2008, Артём Попов <artfwo at gmail.com>

-- 
supercollider packaging