[SCM] audacious-plugins/master: Various fixes.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit abc1a2e3fb8515551bea0d2822b9c45fd8317776
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Feb 19 21:27:29 2012 +0100

    Various fixes.
    
    Git-Dch: Ignore

diff --git a/debian/copyright b/debian/copyright
index 855c539..bf8a758 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,13 +3,16 @@ Upstream-Name: audacious-plugins
 Source: http://www.audacious-media-player.org/
 
 Files: *
-Copyright: 2005-2007 Audacious development team
+Copyright:
+ 2005-2007 Audacious development team
+ 2007-2008 R. Belmont and Richard Bannister
+ 2000-2008 Richard F. Bannister
 License: BSD-3-clause
 
 Files:
  src/bs2b/*
  src/tonegen/*
- src/OSS*/*
+ src/OSS/*
  src/aac/*
  src/alarm/*
  src/cd-menu-items/*
@@ -31,6 +34,7 @@ Files:
  src/flacng/*
  src/m3u/*
  src/pls/*
+ src/pulse_audio/*
  src/metronom/*
  src/neon/*
  src/null/*
@@ -40,6 +44,9 @@ Files:
  src/vorbis/*
  src/vtx/*
  src/asx/asx.c
+ src/xsf/desmume/*
+ src/xspf/*
+ src/psf/peops*/*
 Copyright:
  2009, Sebastian Pipping <sebastian at pipping.org>
  2009, Tony Vroon <chainsaw at gentoo.org>
@@ -56,15 +63,20 @@ Copyright:
  2006-2007 Vladimir Paskov <vlado.paskov at gmail.com>
  2006-2007 Yoshiki Yazawa
  2006-2007 Bastien Nocera
+ 2006-2007 shash
+ 2006-2007 Theo Berkau
  2006 The ScummVM project
  2006 Evan Martin <martine at danga.com>
  2006 Torbjorn Andersson and Johannes Schickel
  2006 Christian Birchinger <joker at netswarm.net>
+ 2006 yopyop
+ 2006 thoduv
  2005-2011 Audacious development team
  2005-2008 Marcel Holtmann
  2005-2007 Giacomo Lozito <james at develia.org>
  2005-2010 William Pitcock <nenolod at dereferenced.org>
  2005-2007 Ralf Ertzinger
+ 2005-2006 Guillaume Duhamel
  2004 Clemens Ladisch <clemens at ladisch.de>
  2003-2004  BMP development team
  2003-2005 M. Bakker, Nero AG, http://www.nero.com
@@ -108,7 +120,13 @@ Files:
  src/crossfade/*
  src/ladspa/*
  src/audpl/*
-Copyright: 2009-2011 John Lindgren
+ src/oss4/*
+ src/mpris2/*
+ src/sdlout/*
+ src/mixer/*
+Copyright:
+ 2010-2011 Michał Lipski <tallica at o2.pl>
+ 2009-2011 John Lindgren
 License: BSD-2-clause
 
 Files:
@@ -120,9 +138,11 @@ Files:
  src/console/abstract_file.cxx
  src/console/Gzip_File.cxx
  src/aosd/ghosd*
+ src/mpg123/*
+ src/lyricwiki/*
 Copyright:
  2007-2011 William Pitcock <nenolod at dereferenced.org>
- 2010 John Lindgren
+ 2010-2011 John Lindgren <john.lindgren at tds.net>
  2006 Evan Martin
  2005 Shay Green
 License: Expat
@@ -177,12 +197,6 @@ 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/psf/*
-Copyright:
- 2007-2008 R. Belmont and Richard Bannister
- 2000-2008 Richard F. Bannister
-License: BSD-3-clause
-
 Files: src/sndstretch/*
 Copyright:
  2009-2011 John Lindgren
@@ -197,6 +211,10 @@ Copyright:
  2000-2001 Michael Smith <msmith at 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: 2006-2009, Adam Cécile (Le_Vert)
            2010, Chris Taylor

-- 
Plugins for audacious