[SCM] ghostess packaging branch, master, updated. debian/20100326-1-4-gaf987c9

[rosea-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c82b473ea69d49724d97ed819608bdf982377d92
Author: Rosea Grammostola <rosea.grammostola at gmail.com>
Date:   Wed Aug 25 22:03:20 2010 +0200

    * changed gpl v 3 to v 2
    
    * added other copyright holders at bottom of the copyright file

diff --git a/debian/copyright b/debian/copyright
index ff10a8a..54a5c1f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,31 +10,15 @@ Upstream Author:
 
     Sean Bolton <sean at smbolton.com>
     
-    Contributions from:
-    - configure.ac fix from Gentoo Pro Audio Overlay
-    - execlp fix for 64 bit architectures from Dmitry Baikov
-    - XML patch list export by JP Mercury
-    - ALSA client type and JACK MIDI API fixes from Dmitry Baikov
-    - JACK session support by Torben Hohn
-
-
 Copyright:
 
     Copyright (C) 2009 by Sean Bolton and others.
 
-    GPL-licensed code was borrowed from:    
-    Ardour, copyright (C) 1999-2002 Paul Davis.
-    Aube, copyright (c) 2002 Conrad Parker.
-    GAlan 0.2.0, copyright (C) 1999 Tony Garnock-Jones.
-    Midisine.c, copyright (C) 2004 Ian Esten.
-    Rosegarden-4, copyright (C) 2000-2004 Guillaume Laurent, Chris Cannam and Richard Bown.
-
 License:
 
     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
-    (at your option) any later version.
+    the Free Software Foundation, either version 2 of the License.
 
     This package is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,19 +29,25 @@ 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 version 3 can be found in "/usr/share/common-licenses/GPL-3".
+Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 The Debian packaging is:
 
-    Copyright (C) 2010 d <rosea.grammostola at gmail.com>
+    Copyright (C) 2010 rosea grammostola <rosea.grammostola at gmail.com>
 
 # Please chose a license for your packaging work. If the program you package
 # uses a mainstream license, using the same license is the safest choice.
 # Please avoid to pick license terms that are more restrictive than the
 # packaged work, as it may make Debian's contributions unacceptable upstream.
-# If you just want it to be GPL version 3, leave the following line in.
+# If you just want it to be GPL version 2, leave the following line in.
 
-and is licensed under the GPL version 3, see above.
+and is licensed under the GPL version 2, see above.
 
 # Please also look if there are files or directories which have a
 # different copyright/license attached and list them here.
+
+    Ardour, copyright (C) 1999-2002 Paul Davis.
+    Aube, copyright (c) 2002 Conrad Parker.
+    GAlan 0.2.0, copyright (C) 1999 Tony Garnock-Jones.
+    Midisine.c, copyright (C) 2004 Ian Esten.
+    Rosegarden-4, copyright (C) 2000-2004 Guillaume Laurent, Chris Cannam and Richard Bown.

-- 
ghostess packaging