[SCM] supercollider/master: Update copyright file

Thu Dec 27 14:06:48 UTC 2012

The following commit has been merged in the master branch:
commit c72a737178d3b4f1a761b1b60040b986f5ae6951
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Thu Dec 20 20:06:46 2012 +0000

    Update copyright file

diff --git a/debian/copyright b/debian/copyright
index a2ae387..6f34c1a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -58,8 +58,7 @@ Copyright: 2002-2007, James McCartney <asynth at gmail.com>
  2010-2011, Patrick Borgeat <patrick at borgeat.de>
 License: GPL-2+
 
-Files: Help/*
- HelpSource/*
+Files: HelpSource/*
 Copyright: 2009, SuperCollider 3 documentation contributors
 License: CC-BY-SA-3.0
 
@@ -76,6 +75,11 @@ Files: include/lang/SC_LanguageClient.h
 Copyright: 2003-2006, Stefan Kersten <steve at k-hornz.de>
 License: GPL-2+
 
+Files: editors/sc-ide/*
+Copyright: 2012, Tim Blechmann <tim at klingt.org>
+ 2012, Jakob Leben <jakob.leben at gmail.com>
+License: GPL-2+
+
 Files: editors/scvim/*
 Copyright: 2007, Alex Norman
 License: GPL-3+
@@ -99,22 +103,22 @@ Files: external_libraries/boost_endian/*
 Copyright: 2000 Darin Adler, 2006 - 2009 Beman Dawes
 License: BSL-1.0
 
-Files: external_libraries/boost_lockfree/libs/lockfree/*
- external_libraries/boost_lockfree/boost/lockfree/*
+Files: external_libraries/boost-lockfree/libs/lockfree/*
+ external_libraries/boost-lockfree/boost/lockfree/*
 Copyright: 2007-2011 Tim Blechmann
 License: BSL-1.0
 
-Files: external_libraries/boost_lockfree/boost/atomic.hpp
- external_libraries/boost_lockfree/boost/atomic/*
+Files: external_libraries/boost-lockfree/boost/atomic.hpp
+ external_libraries/boost-lockfree/boost/atomic/*
 Copyright: 2009 Helge Bahmann
 License: BSL-1.0
 
-Files: external_libraries/boost_lockfree/boost/atomic/detail/linux-arm.hpp
- external_libraries/boost_lockfree/boost/atomic/detail/gcc-armv6+.hpp
+Files: external_libraries/boost-lockfree/boost/atomic/detail/linux-arm.hpp
+ external_libraries/boost-lockfree/boost/atomic/detail/gcc-armv6+.hpp
 Copyright: 2009 Helge Bahmann, Phil Endecott
 License: BSL-1.0
 
-Files: external_libraries/boost_lockfree/boost/memory_order.hpp
+Files: external_libraries/boost-lockfree/boost/memory_order.hpp
 Copyright: 2008, 2009 Peter Dimov
 License: BSL-1.0
 
@@ -166,55 +170,6 @@ License: BSD-like-oscpack
  CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Files: external_libraries/pycxx-6.2.2/*
-Copyright: 1998 - 2007, The Regents of the University of California
-License: BSD-like-pycxx
- 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 disclaimer below.
-  - Redistributions in  binary form must reproduce the above  copyright notice,
-    this  list of  conditions  and  the  disclaimer (as  noted  below)  in  the
-    documentation and/or materials provided with the distribution.
-  - Neither the name  of the UC/LLNL nor  the names of its  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 REGENTS OF THE UNIVERSITY OF CALIFORNIA,
- THE U.S.  DEPARTMENT  OF  ENERGY  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.
- .
- Additional BSD Notice
- .
- 1. This notice  is required to be  provided under our  contract with  the U.S.
-    Department of Energy  (DOE).  This work was produced  at the  University of
-    California,  Lawrence  Livermore  National Laboratory  under  Contract  No.
-    W-7405-ENG-48 with the DOE.
- .
- 2. 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.
- .
- 3. Also, reference  herein to any  specific commercial  products,  process, or
-    services 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.
-
 Files: external_libraries/threadpool/*
 Copyright: 2005-2007 Philipp Henkel
 License: BSL-1.0

-- 
supercollider packaging

