[SCM] supercollider/master: Update paths & content of copyright file for SC 3.5

Sat Apr 7 15:20:59 UTC 2012

The following commit has been merged in the master branch:
commit 7f6c3573a034d30c12a03c6f1c45bb7c50448285
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Sat Apr 7 13:58:43 2012 +0100

    Update paths & content of copyright file for SC 3.5

diff --git a/debian/copyright b/debian/copyright
index ece0541..e3ba13d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -52,22 +52,20 @@ Copyright: 2002-2007, James McCartney <asynth at gmail.com>
  2010-2011, Patrick Borgeat <patrick at borgeat.de>
 License: GPL-2+
 
-Files: common/build/Help/*
+Files: Help/*
+ HelpSource/*
 Copyright: 2009, SuperCollider 3 documentation contributors
 License: CC-BY-SA-3.0
 
-Files: common/include/nova-simd/libsimdmath/*
-Copyright: 2008, Helmut Dersch
-License: GPL-3+
-
-Files: common/Headers/lang/SC_LanguageClient.h
- common/Headers/lang/SC_TerminalClient.h
- common/Headers/common/SC_StringParser.h
- common/Headers/common/SC_StringBuffer.h
- common/Source/server/Rendezvous.cpp common/Source/server/SC_Jack.cpp
- common/Source/lang/LangPrimSource/PyrSerialPrim.cpp
- common/Source/lang/LangPrimSource/SC_AlsaMIDI.cpp
- common/Source/lang/LangPrimSource/SC_LID.cpp
+Files: include/lang/SC_LanguageClient.h
+ include/lang/SC_TerminalClient.h
+ include/common/SC_StringParser.h
+ include/common/SC_StringBuffer.h
+ server/scsynth/Rendezvous.cpp
+ server/scsynth/SC_Jack.cpp
+ lang/LangPrimSource/PyrSerialPrim.cpp
+ lang/LangPrimSource/SC_AlsaMIDI.cpp
+ lang/LangPrimSource/SC_LID.cpp
  editors/scel/*
 Copyright: 2003-2006, Stefan Kersten <steve at k-hornz.de>
 License: GPL-2+
@@ -80,34 +78,25 @@ Files: editors/sced/*
 Copyright: 2006-2009, Артём Попов <artfwo at gmail.com>
 License: GPL-3+
 
-Files: common/Psycollider/PySCLang/pycxx/CXX/Exception.hxx
- common/Psycollider/PySCLang/pycxx/CXX/Extensions.hxx
- common/Psycollider/PySCLang/pycxx/CXX/Objects.hxx
- common/Psycollider/PySCLang/pycxx/Src/cxxextensions.c
- common/Psycollider/PySCLang/pycxx/Src/cxxsupport.cxx
-Copyright: 1998, The Regents of the University of California
-License: LLNL
-
 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/lang/LangPrimSource/SC_Speech.M
- common/Source/lang/LangPrimSource/SC_Speech.cpp
+Files: lang/LangPrimSource/SC_Speech.M
+ lang/LangPrimSource/SC_Speech.cpp
 Copyright: 2003, sampleAndHold.org
 License: GPL-2+
 
-Files: common/include/nova-simd/benchmarks/cache_aligned_array.hpp
+Files: external_libraries/nova-simd/benchmarks/cache_aligned_array.hpp
 Copyright: 2001, Nicolai M. Josuttis
 License: BSL-1.0
  Distributed under the Boost Software License, Version 1.0. (See
  accompanying file LICENSE_1_0.txt or copy at
  http://www.boost.org/LICENSE_1_0.txt)
 
-Files: common/Source/lang/LangSource/Bison/lang11d_tab.cpp
- common/build/examples/other/keepyuppy.scd
+Files: lang/LangSource/Bison/lang11d_tab.cpp
 Copyright: 1984, 1989-1990, 2000-2006, Free Software Foundation, Inc.
 License: GPL-2+ with Bison exception
  As a special exception, you may create a larger work that contains part
@@ -120,32 +109,32 @@ License: GPL-2+ with Bison exception
  files to be licensed under the GNU General Public License without this
  special exception.
 
-Files: common/Source/plugins/FilterUGens.cpp
+Files: server/plugins/FilterUGens.cpp
 Copyright: 2002, James McCartney
  2007, Federico Fontana <federico.fontana at univr.it>
 License: GPL-2+
 
-Files: common/Source/plugins/DynNoiseUGens.cpp
+Files: server/plugins/DynNoiseUGens.cpp
 Copyright: 2002, James McCartney
  2004, HfbK
 License: GPL-2+
 
-Files: common/include/nova-simd/benchmarks/perf_counter.hpp
+Files: external_libraries/nova-simd/benchmarks/perf_counter.hpp
 Copyright: 2008, Tim Blechmann <tim at klingt.org>
  2008-2009, Red Hat, Inc., Ingo Molnar
  2008-2009, Red Hat, Inc., Peter Zijlstra
  2008-2009, Thomas Gleixner <tglx at linutronix.de>
 License: GPL-2+
 
-Files: common/Headers/plugin_interface/SC_sndfile_stub.h
+Files: include/plugin_interface/SC_sndfile_stub.h
 Copyright: 1999-2009, Erik de Castro Lopo <erikd at mega-nerd.com>
 License: LGPL-2.1+
 
-Files: common/Packager/pkg-dmg
+Files: package/pkg-dmg
 Copyright: 2005, Mark Mentovai <mark at moxienet.com>
 License: MPL-1.1 GPL
 
-Files: common/build/examples/GUI examples/ColorBrowser.scd
+Files: examples/GUI examples/ColorBrowser.scd
 Copyright: 2007, Tom Hall <scth at ludions.com>
 License: GPL-2+
 
@@ -262,36 +251,6 @@ License: BSD-3-clause~author
  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-License: LLNL
- Permission to use, copy, modify, and distribute this software for any
- purpose without fee is hereby granted, provided that this entire notice
- is included in all copies of any software which is or includes a copy
- or modification of this software and in all copies of the supporting
- documentation for such software.
- .
- This work was produced at the University of California, Lawrence
- Livermore National Laboratory under contract no. W-7405-ENG-48 between
- the U.S. Department of Energy and The Regents of the University of
- California for the operation of UC LLNL.
- .
- DISCLAIMER
- .
- This software was prepared as an account of work sponsored by an agency
- of the United States Government. Neither the United States Government
- nor the University of California nor any of their employees, makes any
- warranty, express or implied, or assumes any liability or
- responsibility for the accuracy, completeness, or usefulness of any
- information, apparatus, product, or process disclosed, or represents
- that its use would not infringe privately-owned rights. Reference
- herein to any specific commercial products, process, or service by
- trade name, trademark, manufacturer, or otherwise, does not necessarily
- constitute or imply its endorsement, recommendation, or favoring by the
- United States Government or the University of California. The views and
- opinions of authors expressed herein do not necessarily state or
- reflect those of the United States Government or the University of
- California, and shall not be used for advertising or product
- endorsement purposes.
-
 License: MPL-1.1
  MOZILLA PUBLIC LICENSE
  Version 1.1

-- 
supercollider packaging

