[SCM] mixxx/master: debian/copyright: Some updates and fixes.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ef902c1c29c98b0eaaf07bafa1033a048be7a9f0
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Nov 8 15:19:22 2011 +0100

    debian/copyright: Some updates and fixes.

diff --git a/debian/copyright b/debian/copyright
index 6bda8db..2ca5a12 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,14 +15,13 @@ Copyright:
  2006 David Yeh <dtyeh at ccrma.stanford.edu>
  2003 by Svein Magne Bang
  2002,2003 Erik de Castro Lopo <erikd at mega-nerd.com>
+ 2000-2002 Richard W.E. Furse
 License: GPL-2+
 
-Files: lib/cmetrics/*
-Copyright: 2007 John Sully.
-License: GPL-2
-
-Files: lib/cmetrics/fsinfo/*
-Copyright: 2007 John Sully, Phillip Mendonça-Vieira
+Files: lib/cmetrics/* lib/cmetrics/fsinfo/*
+Copyright:
+ 2007 John Sully
+ 2007 John Sully, Phillip Mendonça-Vieira
 License: GPL-2
 
 Files: lib/cmetrics/utf/ConvertUTF.*
@@ -108,17 +107,13 @@ Copyright:
  2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan Westerfeld
 License: LGPL-2.1+
 
-Files: lib/ladspa/cmt/*
-Copyright: 2000-2002 Richard W.E. Furse
-License: GPL-2
-
 Files: lib/scratchlib/*
 Copyright: 2006 Stefan Langhammer, Thomas Rogg
 License: LGPL-2.1+
 
 Files: debian/*
 Copyright:
- 2010 Alessio Treglia <alessio at debian.org>
+ 2010-2011 Alessio Treglia <alessio at debian.org>
  2007-2008 Free Ekanayaka <freee at debian.org>
  2004-2009 Paul Brossier <piem at debian.org>
 License: GPL-2+
@@ -142,6 +137,21 @@ License: CC-BY-SA
  distribute the resulting work only under the same or similar license to
  this one.
 
+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; version 2 of the License.
+ .
+ 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.
+Comment: On Debian systems the full text of the GNU General Public
+ License can be found in the `/usr/share/common-licenses/GPL-2' file.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 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
@@ -158,6 +168,22 @@ Comment: On Debian systems the full text of the GNU General Public
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation;
+ version 2.1 of the License.
+ .
+ This library 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
+ Lesser General Public License for more details.
+Comment: On Debian systems the full text of the GNU Lesser General Public
+ License can be found in the `/usr/share/common-licenses/LGPL-2.1' file.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

-- 
mixxx packaging