[SCM] audacious-plugins/master: Group files by License, add Comment: fields, many corrections

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Feb 19 19:00:03 UTC 2012


The following commit has been merged in the master branch:
commit 540bdfd05f064e6410a8329156940a5ff55c3811
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Feb 19 19:58:56 2012 +0100

    Group files by License, add Comment: fields, many corrections

diff --git a/debian/copyright b/debian/copyright
index d911006..39d594f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,48 +6,77 @@ Files: *
 Copyright: 2005-2007 Audacious development team
 License: BSD-3-clause
 
-Files: scripts/makerelease.sh
-Copyright: 2007 atheme.org
-License: Expat
-
-Files: src/CoreAudio/*
-       src/crossfade/*
-       src/spectrum/*
-Copyright: 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
-License: GPL-2+
-
-Files: src/CoreAudio/convert.c
-       src/OSS4/convert.c
-       src/tonegen/*
-Copyright: 1999-2001 Haavard Kvaalen
-License: GPL-2+
-
-Files: src/CoreAudio/db*
-Copyright: 1999, Bob Dean
-License: GPL-2+
-
-Files: src/OSS*/*
-       src/blur-scope
-Copyright: 1998-2003 XMMS development team
-License: GPL-2+
-
-Files: src/aac/*
-       src/alarm/*
-       src/cue/*
-       src/ffaudio/*
-       src/gio/*
-       src/kanashi/*
-       src/mms/*
-       src/vfstrace/*
-       src/adplug/core/adl.cxx
+Files:
+ src/bs2b/*
+ src/tonegen/*
+ src/OSS*/*
+ src/aac/*
+ src/alarm/*
+ src/cd-menu-items/*
+ src/cue/*
+ src/ffaudio/*
+ src/gio/*
+ src/kanashi/*
+ src/mms/*
+ src/vfstrace/*
+ src/adplug/core/adl.cxx
+ src/amidi-plug/*
+ src/aosd/*
+ src/jack/configure.c
+ src/statusicon/*
+ src/gnomeshortcuts/*
+ src/hotkey/*
+ src/filewriter/*
+ src/flacng/*
+ src/m3u/*
+ src/pls/*
+ src/metronom/*
+ src/neon/*
+ src/null/*
+ src/sid/*
+ src/smb/*
+ src/sndfile/*
+ src/vorbis/*
+ src/vtx/*
 Copyright:
+ 2009, Sebastian Pipping <sebastian at pipping.org>
+ 2009, Tony Vroon <chainsaw at gentoo.org>
+ 2009-2011, John Lindgren <john.lindgren at tds.net>
+ 2010-2011, Michał Lipski <tallica at o2.pl>
+ 2009 Jussi Judin
+ 2008 Cristi Măgherușan <majeru at gentoo.ro>
+ 2008 Eugene Zagidullin <e.asphyx at gmail.com>
+ 2007 Michael Färber
+ 2007 Daniel Bradshaw
+ 2007-2008 Sascha Hlusiak <contact at saschahlusiak.de>
+ 2006-2010 William Pitcock, Tony Vroon, George Averill, Giacomo
+ Lozito, Derek Pomery and Yoshiki Yazawa, and John Lindgren.
+ 2006-2007 Vladimir Paskov <vlado.paskov at gmail.com>
+ 2006-2007 Yoshiki Yazawa
+ 2006-2007 Bastien Nocera
  2006 The ScummVM project
+ 2006 Evan Martin <martine at danga.com>
  2006 Torbjorn Andersson and Johannes Schickel
- 2005-2006 William Pitcock
-License: GPL-2+
-
-Files: src/aac/mp4ff/*
-Copyright: 2003-2005 M. Bakker, Nero AG,
+ 2006 Christian Birchinger <joker at netswarm.net>
+ 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
+ 2004 Clemens Ladisch <clemens at ladisch.de>
+ 2003-2004  BMP development team
+ 2003-2005 M. Bakker, Nero AG, http://www.nero.com
+ 2003 by Chris Moeller, eh, whatever
+ 2003-2004 Sashnov Alexander
+ 2002 Gian-Carlo Pascutto <gcp at sjeng.org>
+ 2002 Lars Siebold
+ 2002 by Pete Bernert
+ 2000, 2002 Erik de Castro Lopo
+ 2000-2002 Ville Syrjälä <syrjala at sci.fi>
+ 2000 Martin Strau? <mys at faveve.uni-stuttgart.de>
+ 1999-2007 Tecnic Software productions (TNSP)
+ 1998-2003 XMMS development team
+ 1999-2001 Haavard Kvaalen <havardk at sol.no>
 License: GPL-2+
 
 Files: src/adplug/*
@@ -58,138 +87,83 @@ Files: src/adplug/core/adlibemu.*
 Copyright: 1998-2001 Ken Silverman
 License: LGPL-2.1+
 
-Files: src/adplug/core/binio-ual.h
-Copyright: 2006 William Pitcock
-License: PD
+Files: src/adplug/core/binio_virtual.h
+Copyright: 2006 William Pitcock <nenolod -at- atheme.org>
+License: public-domain
+ This code is in the public domain.
 
 Files: src/adplug/core/fmopl.*
-Copyright: 1999, 2000 Tatsuyuki Satoh
-License: GPL-2+
-
-Files: src/amidi-plug/*
-       src/aosd/*
-       src/evdev-plug/*
-       src/jack/*
-       src/statusicon/*
-Copyright: 2005-2007 Giacomo Lozito
-License: GPL-2+
+Copyright: 1999,2000 Tatsuyuki Satoh , MultiArcadeMachineEmurator development
+License: LGPL-2.1+
 
 Files: src/aosd/ghosd*
 Copyright: 2006 Evan Martin
 License: Expat
 
-Files: src/bluetooth/*
-Copyright: 2008 Paula Stanciu
-License: GPL-3
-
-Files: src/bluetooth/agent.*
-Copyright: 2008 Paula Stanciu
-           2005-2008 Marcel Holtmann
-           2006-2007 Bastien Nocera
-License: GPL-2+
-
-Files: src/bs2b/*
-Copyright: 2009, Sebastian Pipping
-           2009, Tony Vroon
-           2010, John Lindgren
-License: GPL-2+
-
-Files: src/cd-menu-items/*
-Copyright: 2009 John Lindgren
-License: GPL-2+
-
-Files: src/cdaudio-ng/*
-Copyright: 2007 Calin Crisan
-           2009 John Lindgren
-           2009-2010 Tomasz MoÅ
-           2007 Calin Crisan
-License: GPL-3
-
-Files: src/alsa/*
-       src/compressor/*
-       src/resample/*
-       src/unix-io/*
-Copyright: 2010 John Lindgren
-License: BSD-2
-
-Files: src/crystalizer/*
-Copyright: 2008 William Pitcock
-           2010 John Lindgren
-License: Expat
+Files:
+ src/alsa/*
+ src/compressor/*
+ src/resample/*
+ src/unix-io/*
+ src/crossfade/*
+ src/ladspa/*
+Copyright: 2010-2011 John Lindgren
+License: BSD-2-clause
 
-Files: src/dockalbumart/*
-Copyright: 2007 William Pitcock
+Files:
+ src/albumart/*
+ src/cairo-spectrum/*
+ src/dockalbumart/*
+ src/crystalizer/*
+ src/voice_removal/*
+Copyright:
+ 2007-2011 William Pitcock <nenolod at dereferenced.org>
+ 2010 John Lindgren
 License: Expat
 
-Files: src/esd/*
-Copyright: 2003-2004 BMP development team
-           1999 Galex Yen
-License: GPL-2+
-
-Files: src/filewriter/*
-copyright: 2007 Michael Färber
-           2007 William Pitcock
-           2002 Lars Siebold
-           2006-2007 Yoshiki Yazawa
-License: GPL-2+
-
-Files: src/flacng/*
-Copyright: 2005 Ralf Ertzinger
-License: GPL-2+
-
-Files: src/flacng/metadata.c
+Files:
+ src/flacng/metadata.c
  src/notify/*
 Copyright:
  2010-2011 John Lindgren <john.lindgren at tds.net>
  2010 Michał Lipski <tallica at o2.pl>
  2010 Maximilian Bogner <max at mbogner.de>
+ 2005 Ralf Ertzinger
 License: GPL-3+
 
-Files: src/gnomeshortcuts/*
-       src/hotkey/*
-Copyright: 2007-2008 Sascha Hlusiak
-License: GPL-2+
-
-Files: src/gntui/*
-Copyright: 2009 Tomasz MoÅ
-License: GPL-3
-
-Files: src/gtkui/*
-       src/lirc/*
-       src/song_change/*
-Copyright: 2005-2008  Audacious development team.
+Files:
+ src/gtkui/*
+ src/lirc/*
+ src/song_change/*
+ src/gntui/*
+ src/skins/*
+ src/pls/util.*
+ src/mtp_up/*
+ src/cdaudio-ng/*
+Copyright:
+ 2005-2011 Audacious development team
+ 2009 John Lindgren
+ 2007-2009 Tomasz Moń <desowin at gmail.com>
+ 2007 Calin Crisan <ccrisan at gmail.com>
+ 2007 Cristian Magherusan
+ 1998-2003 Peter Alm, Mikael Alm, Olle Hallnas,
+ Thomas Nilsson and 4Front Technologies
+ 1999-2003 Haavard Kvaalen
+ 1998-2003 XMMS development team
+ 2003-2004 BMP development team
 License: GPL-3
 
-Files: src/icecast/*
-Copyright: 2008 Andrew O. Shadoura
-           2007 Michael Färber
-           2002 Lars Siebold
-           2006-2007 Yoshiki Yaza
-License: GPL-2+
-
-Files: src/jack/bio2jack.*
-Copyright: 2003-2006 Chris Morgan
-License: LGPL-2.1+
-
-Files: src/ladspa/ladspa.c
-Copyright: 2002,2003 Nick Lamb
-License: GPL-2+
-
-Files: src/ladspa/ladspa.h
-Copyright: 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan Westerfeld
-License: LGPL-2.1+
-
 Files:
- src/m3u/*
- src/pls/*
- src/metronom/*
+ src/jack/*
+ src/ladspa/ladspa.h
 Copyright:
- 2000 Martin Strau? <mys at faveve.uni-stuttgart.de>
- 2006-2010 William Pitcock, Tony Vroon, George Averill, Giacomo
- Lozito, Derek Pomery and Yoshiki Yazawa
-License: GPL-2+
+ 2003-2006 Chris Morgan
+ 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan Westerfeld
+License: LGPL-2.1+
 
-Files: src/modplug/*
+Files:
+ src/modplug/*
+ sid/xs_md5.c
 Copyright: No copyright holders
 License: public-domain
  This source code is public domain.
@@ -198,41 +172,11 @@ Comment: A list of original authors follows:
  Adam Goode
  Kenton Varda
 
-Files: src/mtp_up/*
-Copyright: 2007 Cristian Magherusan
-License: GPL-3
-
-Files: src/neon/*
-Copyright: 2005 Ralf Ertzinger
-License: GPL-2+
-
-Files: src/neon/cert_*
-Copyright: 2009 Jussi Judin
-License: GPL-2+
-
-Files: src/null/*
-Copyright: 2006 Christian Birchinger
-License: GPL-2+
-
-Files: src/paranormal/*
-       src/paranormal-ng/*
-Copyright: 2006, 2007 William Pitcock
-           2001 Jamie Gennis
-License: GPL-2
-
-Files: src/paranormal/libcalc/*
-       src/paranormal-ng/libcalc/*
-Copyright: 2001 Janusz Gregorczyk
-License: GPL-2+
-
-Files: src/projectm/*
-Copyright: Carmelo Piccione, Peter Sperl
-License: GPL-3
-
-Files: src/projectm-1.0/*
-Copyright: 2008 William Pitcock
-           2004-2006 Peter Sperl
-License: GPL-2
+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/psf/*
 Copyright:
@@ -240,69 +184,20 @@ Copyright:
  2000-2008 Richard F. Bannister
 License: BSD-3-clause
 
-Files: src/psf/peops/*
- src/psf/peops2/*
-Copyright:
- 2003 by Chris Moeller, eh, whatever
- 2002 by Pete Bernert
-License: GPL-2+
-
-Files: src/rocklight/*
-Copyright: 2006 Tony Vroon
-           2007 Michael Hanselmann
-           2009 William Pitcock
-License: GPL-2+
-
-Files: src/sid/*
-Copyright: 1999-2007 Tecnic Software productions (TNSP)
-License: GPL-2+
-
-Files: src/skins/*
-Copyright: 2006-2007 Audacious development team
-           2007 Tomasz MoÅ
-License: GPL-3
-
-Files: src/smb/*
-Copyright: 2007 Daniel Bradshaw
-License: GPL-2+
-
-Files: src/sndfile/*
-Copyright: 2005, 2009 Audacious development team
-License: GPL-2+
-
 Files: src/sndstretch/*
-Copyright: 2001 Florian Berger
+Copyright:
+ 2009-2011 John Lindgren
+ 2000-2001 Florian Berger
 License: GPL-2
 
-Files: src/streambrowser/*
-Copyright: 2008 Calin Crisan
-License: GPL-3
-
-Files: src/sun/*
-Copyright: 2001 CubeSoft Communications, Inc.
-License: GPL-2+
-
-Files: src/voice_removal/*
-Copyright: 2000-2001 Konstantin Laevsky
-License: GPL-2+
-
-Files: src/vorbis/*
-Copyright: Tony Arcieri
-           2001-2002 Haavard Kvaalen
-           2007 William Pitcock
-           2008 Cristi MÄgheruÈan
-           2008 Eugene Zagidullin
-           2009 Audacious Developers
-License: GPL-2+
-
-Files: src/vorbis/vcedit.*
-Copyright: 2000-2001 Michael Smith
+Files:
+ src/vorbis/vcedit.*
+ src/vtx/ayemu*
+Copyright:
+ 2003-2004 Sashnov Alexander
+ 2000-2001 Michael Smith <msmith at labyrinth.net.au>
 License: LGPL-2
 
-Files: src/vtx/*
-Copyright: 2002-2004 Sashnov Alexander
-License: GPL-2+
-
 Files: debian/*
 Copyright: 2006-2009, Adam Cécile (Le_Vert)
            2010, Chris Taylor
@@ -318,10 +213,9 @@ License: GPL-2
  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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 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'.
@@ -336,10 +230,9 @@ License: GPL-2+
  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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 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'.
@@ -370,7 +263,7 @@ License: GPL-3
  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>.
  .
@@ -387,9 +280,9 @@ License: LGPL-2
  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.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this plugin; if not, write to the Free Software
+Comment:
+ 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>.
  .
  On Debian systems, the full text of the GNU Lesser General Public License
  version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'.
@@ -404,15 +297,14 @@ License: LGPL-2.1+
  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.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this plugin; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Comment:
+ 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>.
  .
  On Debian systems, the full text of the GNU Lesser General Public License
  version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'.
 
-License: BSD-2
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .

-- 
Plugins for audacious



More information about the pkg-multimedia-commits mailing list