Changed license for Files: * to BSD-2-clause

1 files changed, 39 insertions, 87 deletions

diff --git a/debian/copyright b/debian/copyright
index caa7211..e0eeef7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,14 +5,21 @@ Source: https://www.audacious-media-player.org/
 Files: *
 Copyright: 2001-2018, Audacious development team
            2017-2018, René J.V. Bertin
+           2017, John Lindgren and Eugene Paskevich
            2015-2016, Róbert Čerňanský
            2015-2016, Róbert Čerňanský and John Lindgren
            2015, Eugene Paskevich <eugene@raptor.kiev.ua>
+           2014, Michał Lipski and William Pitcock
            2013, Martin Steiger and John Lindgren
+           2012-2013, Luís Picciochi Oliveira <Pitxyoki@Gmail.com>
+           2011-2017, John Lindgren and René J.V. Bertin
+           2011-2012, John Lindgren, William Pitcock, and Michał Lipski
            2011, Joachim Bengtsson
+           2010-2017, Michał Lipski and John Lindgren
            2010-2017, John Lindgren
-           2012-2013, Luís Picciochi Oliveira <Pitxyoki@Gmail.com>
            2010-2015, Michał Lipski <tallica@o2.pl>
+           2010-2014, William Pitcock
+           2010-2013, William Pitcock and John Lindgren
            2010, Spotify AB
            2009-2012, William Pitcock, Tomasz Moń, Michał Lipski, and John Lindgren
            2007-2008, R. Belmont and Richard Bannister
@@ -21,7 +28,7 @@ Copyright: 2001-2018, Audacious development team
            2006-2014, William Pitcock <nenolod@nenolod.net>
            2005-2007, Giacomo Lozito <james@develia.org>
            2000-2008, Richard F. Bannister
-License: BSD-3-clause
+License: BSD-2-clause
 
 Files: src/alarm/*
        src/amidiplug/amidi-plug.cc
@@ -91,9 +98,10 @@ Copyright: 2005-2015, Audacious development team
            2006-2007, Yoshiki Yazawa
            2006, Christian Birchinger <joker@netswarm.net>
            2006, Evan Martin <martine@danga.com>
-           2006, thoduv
            2006, The ScummVM project
+           2006, thoduv
            2006, Torbjorn Andersson and Johannes Schickel
+           2006, William Pitcock, Tony Vroon, George Averill
            2006, yopyop
            2005-2014, William Pitcock <nenolod@dereferenced.org>
            2005-2008, Marcel Holtmann
@@ -101,9 +109,9 @@ Copyright: 2005-2015, Audacious development team
            2005-2007, Giacomo Lozito <james@develia.org>
            2005-2006, Guillaume Duhamel
            2004, Clemens Ladisch <clemens@ladisch.de>
-           2003, Chris Moeller, eh, whatever
            2003-2005, M. Bakker, Nero AG, http://www.nero.com
            2003-2004, BMP development team
+           2003, Chris Moeller, eh, whatever
            2002-2004, Sashnov Alexander
            2002, Gian-Carlo Pascutto <gcp@sjeng.org>
            2002, Lars Siebold <khandha5@gmx.net>
@@ -129,6 +137,7 @@ Copyright: 2005-2014, Audacious development team
            2002, Brad Martin
            2002, Jarek Burczynski
            2002, Stéphane Dallongeville <gens@consolemul.com>
+           2000-2002, Richard W.E. Furse, Paul Barton-Davis
            2000-2002, Richard W.E. Furse, Paul Barton-Davis, Stefan Westerfeld
            1999-2000, Tatsuyuki Satoh , MultiArcadeMachineEmurator development
            1998-2001, Ken Silverman
@@ -185,73 +194,17 @@ Files: src/cdaudio/cdaudio-ng.cc
        src/skins/*
        src/songchange/formatter.cc
 Copyright: 2005-2015, Audacious development team
-           2005-2007, Audacious team
-           2003-2004, BMP development team
-           2007-2012, Calin Crisan <ccrisan@gmail.com>
-           1999-2003, Haavard Kvaalen
-           2009-2011, John Lindgren
            2009-2012, John Lindgren <john.lindgren@aol.com>
-           1998-2003, Peter Alm, Mikael Alm, Olle Hallnas
-           Thomas Nilsson and 4Front Technologies
-           2007-2008, Tomasz Moń
-           2009, Tomasz Moń <desowin@gmail.com>
-           2008, William Pitcock
-           1998-2003, XMMS development team
-License: GPL-3
-
-Files: src/skins/actions-mainwin.h
-       src/skins/actions-playlist.h
-       src/skins/actions.cc
-       src/skins/button.cc
-       src/skins/button.h
-       src/skins/dnd.h
-       src/skins/eq-graph.cc
-       src/skins/eq-graph.h
-       src/skins/eq-slider.cc
-       src/skins/eq-slider.h
-       src/skins/equalizer.cc
-       src/skins/equalizer.h
-       src/skins/hslider.cc
-       src/skins/hslider.h
-       src/skins/main.cc
-       src/skins/main.h
-       src/skins/menurow.cc
-       src/skins/menurow.h
-       src/skins/monostereo.cc
-       src/skins/monostereo.h
-       src/skins/number.cc
-       src/skins/number.h
-       src/skins/playlist-slider.cc
-       src/skins/playlist-slider.h
-       src/skins/playlist-widget.cc
-       src/skins/playlist-widget.h
-       src/skins/playlistwin.cc
-       src/skins/playlistwin.h
-       src/skins/playstatus.cc
-       src/skins/playstatus.h
-       src/skins/plugin.cc
-       src/skins/plugin.h
-       src/skins/search-select.cc
-       src/skins/skin-ini.cc
-       src/skins/skin.cc
-       src/skins/skin.h
-       src/skins/skins_cfg.cc
-       src/skins/skins_cfg.h
-       src/skins/skins_util.cc
-       src/skins/skins_util.h
-       src/skins/skinselector.h
-       src/skins/svis.cc
-       src/skins/textbox.cc
-       src/skins/textbox.h
-       src/skins/vis-callbacks.cc
-       src/skins/vis-callbacks.h
-       src/skins/vis.cc
-       src/skins/vis.h
-Copyright: 2005-2015, Audacious development team
            2009-2011, John Lindgren
+           2009, Tomasz Moń <desowin@gmail.com>
            2008, William Pitcock
+           2007-2012, Calin Crisan <ccrisan@gmail.com>
            2007-2008, Tomasz Moń
+           2005-2007, Audacious team
            2003-2004, BMP development team
+           1999-2003, Haavard Kvaalen
+           1998-2003, Peter Alm, Mikael Alm, Olle Hallnas
+           Thomas Nilsson and 4Front Technologies
            1998-2003, XMMS development team
 License: GPL-3
 
@@ -265,25 +218,6 @@ License: GPL-2+
 Comment: No explicit license found, using license(s) from:
  src/xsf/desmume/COPYING
 
-Files: src/alsa/*
-       src/audpl/*
-       src/compressor/*
-       src/crossfade/*
-       src/ladspa/Makefile
-       src/ladspa/effect.cc
-       src/ladspa/loaded-list.cc
-       src/ladspa/plugin-list.cc
-       src/ladspa/plugin.cc
-       src/ladspa/plugin.h
-       src/mixer/*
-       src/mpris2/*
-       src/oss4/*
-       src/resample/*
-       src/sdlout/*
-Copyright: 2009-2016, John Lindgren
-           2010-2013, Michał Lipski <tallica@o2.pl>
-License: BSD-2-clause
-
 Files: src/skins-qt/dock.cc
        src/skins-qt/drag-handle.cc
        src/skins-qt/drag-handle.h
@@ -339,6 +273,24 @@ Copyright: 2010-2013, John Lindgren <john.lindgren@tds.net>
            1994, X Consortium
 License: Expat
 
+Files: src/mac-media-keys/SPInvocationGrabbing.h
+       src/mac-media-keys/SPInvocationGrabbing.m
+       src/mac-media-keys/SPMediaKeyTap.h
+       src/mac-media-keys/SPMediaKeyTap.m
+       src/psf/corlett.cc
+       src/psf/eng_psf.cc
+       src/psf/eng_psf2.cc
+       src/psf/eng_spx.cc
+       src/psf/plugin.cc
+       src/psf/psx_hw.cc
+       src/xsf/corlett.cc
+       src/xsf/plugin.cc
+Copyright: 2011, Joachim Bengtsson
+           2007-2008, R. Belmont and Richard Bannister
+           2000-2008, Richard F. Bannister
+           2010, Spotify AB
+License: BSD-3-clause
+
 Files: src/modplug/*
 Copyright: No copyright holders
 License: public-domain
@@ -378,13 +330,13 @@ Files: src/vorbis/vcedit.cc
        src/vtx/ayemu_8912.h
        src/vtx/ayemu_vtxfile.h
 Copyright: 2000-2001, Michael Smith <msmith@labyrinth.net.au>
-         2003-2004, Sashnov Alexander
+           2003-2004, Sashnov Alexander
 License: LGPL-2
 
 Files: debian/*
 Copyright: 2012-2013, Alessio Treglia <alessio@debian.org>
-           2010, Chris Taylor
            2010, Benjamin Drung <bdrung@ubuntu.com>
+           2010, Chris Taylor
            2006-2009, Adam Cécile (Le_Vert)
 License: GPL-2+