[SCM] supercollider/master: Update copyright file: Move license texts to License sections, sorted roughly by similarity with main licensing terms.

Sat Jun 11 21:14:31 UTC 2011

The following commit has been merged in the master branch:
commit bc7e48620e9823d6ca37d6aad86715a250b8143b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jun 11 18:56:51 2011 +0200

    Update copyright file: Move license texts to License sections, sorted roughly by similarity with main licensing terms.

diff --git a/debian/copyright b/debian/copyright
index aaa335c..eb553cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,39 +9,14 @@ Copyright: 2004, Paul Brossier <piem at altern.org>
            2010, Alexandre Quessy <alexandre at quessy.net>
 License: GPL-2+
 
-    This program 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.
-
-    This program 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.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- On Debian systems the full text of the GNU General Public License version 2
- can be found in the `/usr/share/common-licenses/GPL-2' file.
-
 Files: *
 Copyright: 2002, James McCartney
 License: GPL-2+
- On Debian systems the full text of the GNU General Public License version 2
- can be found in the `/usr/share/common-licenses/GPL-2' file.
 
 Files: common/build/Help/*
 Copyright: 2009, SuperCollider 3 documentation contributors
 License: CC-BY-SA-3.0
 
-     This work is licensed under the Creative Commons Attribution-Share Alike
-     3.0 Unported License. To view a copy of this license, visit
-     http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to
-     Creative Commons, 171 Second Street, Suite 300, San Francisco,
-     California, 94105, USA.
-
 Files: SC_StringParser*, SC_StringBuffer*,
  SC_LanguageClient*, SC_TerminalClient*,
  common/Source/server/Rendezvous.cpp, common/Source/server/SC_Jack.cpp,
@@ -51,8 +26,6 @@ Files: SC_StringParser*, SC_StringBuffer*,
  linux/scel/*
 Copyright: 2003-2006, Stefan Kersten <steve at k-hornz.de>
 License: GPL-2+
- On Debian systems the full text of the GNU General Public License version 2
- can be found in the `/usr/share/common-licenses/GPL-2' file.
 
 Files: common/Source/plugins/Onsets.*, common/Source/plugins/onsetsds.*,
  common/Source/plugins/ML_SpecStats.cpp,
@@ -61,19 +34,44 @@ Files: common/Source/plugins/Onsets.*, common/Source/plugins/onsetsds.*,
  common/build/SCClassLibrary/Common/Audio/FFTUnpacking.sc
 Copyright: 2006-2007, Dan Stowell
 License: GPL-2+
- On Debian systems the full text of the GNU General Public License version 2
- can be found in the `/usr/share/common-licenses/GPL-2' file.
 
 Files: common/Source/lang/LangPrimSource/SC_HID.cpp
 Copyright: 2003-2006, Jan Truetzschler
 License: GPL-2+
- On Debian systems the full text of the GNU General Public License version 2
- can be found in the `/usr/share/common-licenses/GPL-2' file.
 
 Files: editors/scvim/*
 Copyright: 2007, Alex Norman
 License: GPL-3+
 
+Files: editors/sced/*
+Copyright: 2006-2009, Артём Попов
+License: GPL-3+
+
+Files: common/Source/lang/LangPrimSource/WiiMote_OSX/*
+Copyright: 2006, Masayuki Akamatsu
+License: BSD-C3
+
+License: GPL-2+
+
+    This program 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.
+
+    This program 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.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ On Debian systems the full text of the GNU General Public License version 2
+ can be found in the `/usr/share/common-licenses/GPL-2' file.
+
+License: GPL-3+
+
     This program 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 3 of the License, or
@@ -90,14 +88,14 @@ License: GPL-3+
  On Debian systems the full text of the GNU General Public License version 3
  can be found in the `/usr/share/common-licenses/GPL-3' file.
 
-Files: editors/sced/*
-Copyright: 2006-2009, Артём Попов
-License: GPL-3+
- On Debian systems the full text of the GNU General Public License version 3
- can be found in the `/usr/share/common-licenses/GPL-3' file.
+License: CC-BY-SA-3.0
+
+     This work is licensed under the Creative Commons Attribution-Share Alike
+     3.0 Unported License. To view a copy of this license, visit
+     http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to
+     Creative Commons, 171 Second Street, Suite 300, San Francisco,
+     California, 94105, USA.
 
-Files: common/Source/lang/LangPrimSource/WiiMote_OSX/*
-Copyright: 2006, Masayuki Akamatsu
 License: BSD-C3
  Max porting by Masayuki Akamatsu
  Copyright (c) 2006, Masayuki Akamatsu
@@ -128,5 +126,3 @@ License: BSD-C3
  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.
-
-

-- 
supercollider packaging

