Update copyright file

1 files changed, 21 insertions, 54 deletions

diff --git a/debian/copyright b/debian/copyright
index ed4433e..d282b7a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,17 +3,16 @@ Upstream-Name: audacious-plugins
 Source: http://www.audacious-media-player.org/
 
 Files: *
-Copyright: 2005-2007 Audacious development team
+Copyright: 2001-2015 Audacious development team
            2007-2008 R. Belmont and Richard Bannister
            2000-2008 Richard F. Bannister
 License: BSD-3-clause
 
-Files: src/aac/*
-       src/adplug/core/adl.cxx
+Files: src/aac-raw/*
+       src/adplug/core/adl.cc
        src/alarm/*
        src/amidi-plug/*
        src/aosd/*
-       src/asx/asx.c
        src/blur_scope/*
        src/bs2b/*
        src/cd-menu-items/*
@@ -24,23 +23,17 @@ Files: src/aac/*
        src/gio/*
        src/gnomeshortcuts/*
        src/hotkey/*
-       src/jack/configure.c
-       src/kanashi/*
        src/m3u/*
        src/metronom/*
        src/mms/*
        src/neon/*
-       src/null/*
-       src/OSS/*
        src/pls/*
        src/psf/peops*/*
        src/pulse_audio/*
        src/sid/*
-       src/smb/*
        src/sndfile/*
        src/statusicon/*
        src/tonegen/*
-       src/vfstrace/*
        src/vorbis/*
        src/vtx/*
        src/xsf/desmume/*
@@ -92,7 +85,6 @@ License: GPL-2+
 
 Files: src/adplug/*
        src/console/*
-       src/jack/*
        src/ladspa/ladspa.h
 Copyright: 2003-2006 Shay Green
            2003-2006 Chris Morgan
@@ -107,6 +99,10 @@ Copyright: 2006 William Pitcock <nenolod -at- atheme.org>
 License: public-domain
  This code is in the public domain.
 
+Files: src/jack-ng/*
+Copyright: 2014 John Lindgren
+License: BSD-2-clause
+
 Files: src/alsa/*
        src/audpl/*
        src/compressor/*
@@ -117,18 +113,24 @@ Files: src/alsa/*
        src/oss4/*
        src/resample/*
        src/sdlout/*
-       src/unix-io/*
-Copyright: 2010-2011 Michał Lipski <tallica@o2.pl>
-           2009-2011 John Lindgren
+       src/sox-resampler/*
+Copyright: 2010-2011,2013 Michał Lipski <tallica@o2.pl>
+           2009-2012 John Lindgren
+License: BSD-2-clause
+
+Files: src/asx/*
+Copyright: 2010-2013 John Lindgren
+           2010-2013 William Pitcock
+License: BSD-2-clause
+
+Files: src/search-tool/search-tool.cc
+Copyright: 2011-2012 John Lindgren
 License: BSD-2-clause
 
 Files: src/albumart/*
        src/cairo-spectrum/*
-       src/dockalbumart/*
        src/crystalizer/*
        src/voice_removal/*
-       src/console/abstract_file.cxx
-       src/console/Gzip_File.cxx
        src/aosd/ghosd*
        src/mpg123/*
        src/lyricwiki/*
@@ -138,7 +140,7 @@ Copyright: 2010-2011 John Lindgren <john.lindgren@tds.net>
            2005 Shay Green
 License: Expat
 
-Files: src/flacng/metadata.c
+Files: src/flacng/metadata.cc
        src/notify/*
 Copyright: 2010-2011 John Lindgren <john.lindgren@tds.net>
            2010 Michał Lipski <tallica@o2.pl>
@@ -146,13 +148,9 @@ Copyright: 2010-2011 John Lindgren <john.lindgren@tds.net>
            2005 Ralf Ertzinger
 License: GPL-3+
 
-Files: src/asx/util.*
-       src/cdaudio-ng/*
-       src/gntui/*
+Files: src/cdaudio-ng/*
        src/gtkui/*
        src/lirc/*
-       src/mtp_up/*
-       src/pls/util.*
        src/skins/*
        src/song_change/*
 Copyright: 2009 John Lindgren
@@ -176,27 +174,12 @@ Comment: A list of original authors follows:
  Adam Goode
  Kenton Varda
 
-Files: src/sid/xd_md5.c
-Copyright: No copyright holders
-License: public-domain
- This code was written by Colin Plumb in 1993, no copyright is claimed.
- This code is in the public domain; do with it what you wish.
-
-Files: src/sndstretch/*
-Copyright: 2009-2011 John Lindgren
-           2000-2001 Florian Berger
-License: GPL-2
-
 Files: src/vorbis/vcedit.*
        src/vtx/ayemu*
 Copyright: 2003-2004 Sashnov Alexander
            2000-2001 Michael Smith <msmith@labyrinth.net.au>
 License: LGPL-2
 
-Files: src/search-tool/search-tool.c
-Copyright: 2011 John Lindgren
-License: GPL-2 or GPL-3
-
 Files: debian/*
 Copyright:
   2012-2013 Alessio Treglia <alessio@debian.org>
@@ -205,22 +188,6 @@ Copyright:
   2006-2009 Adam Cécile (Le_Vert)
 License: GPL-2+
 
-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; under 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:
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses>.
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
-
 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