[SCM] audacious-plugins/master: Sort debian/copyright.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Feb 19 20:37:28 UTC 2012


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

    Sort debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index bf8a758..6e44cca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,101 +10,101 @@ Copyright:
 License: BSD-3-clause
 
 Files:
- src/bs2b/*
- src/tonegen/*
- src/OSS/*
  src/aac/*
+ src/adplug/core/adl.cxx
  src/alarm/*
+ src/amidi-plug/*
+ src/aosd/*
+ src/asx/asx.c
+ src/blur_scope/*
+ src/bs2b/*
  src/cd-menu-items/*
  src/cue/*
  src/ffaudio/*
+ src/filewriter/*
+ src/flacng/*
  src/gio/*
- src/kanashi/*
- src/mms/*
- src/vfstrace/*
- src/adplug/core/adl.cxx
- src/amidi-plug/*
- src/aosd/*
- src/blur_scope/*
- src/jack/configure.c
- src/statusicon/*
  src/gnomeshortcuts/*
  src/hotkey/*
- src/filewriter/*
- src/flacng/*
+ src/jack/configure.c
+ src/kanashi/*
  src/m3u/*
- src/pls/*
- src/pulse_audio/*
  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/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>
- 2009-2011, John Lindgren <john.lindgren at tds.net>
  2010-2011, Michał Lipski <tallica at o2.pl>
+ 2009, Tony Vroon <chainsaw at gentoo.org>
+ 2009, Sebastian Pipping <sebastian at pipping.org>
  2009 Jussi Judin
- 2008 Cristi Măgherușan <majeru at gentoo.ro>
+ 2009-2011, John Lindgren <john.lindgren at tds.net>
  2008 Eugene Zagidullin <e.asphyx at gmail.com>
+ 2008 Cristi Măgherușan <majeru at gentoo.ro>
  2007 Michael Färber
  2007 Daniel Bradshaw
  2007-2008 Sascha Hlusiak <contact at saschahlusiak.de>
+ 2006 yopyop
+ 2006 Torbjorn Andersson and Johannes Schickel
+ 2006 thoduv
+ 2006 The ScummVM project
+ 2006 Evan Martin <martine at danga.com>
+ 2006 Christian Birchinger <joker at netswarm.net>
  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-2007 shash
+ 2006-2007 Vladimir Paskov <vlado.paskov at gmail.com>
  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
+ 2006-2007 shash
+ 2006-2007 Bastien Nocera
  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-2008 Marcel Holtmann
  2005-2007 Ralf Ertzinger
+ 2005-2007 Giacomo Lozito <james at develia.org>
  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
  2003 by Chris Moeller, eh, whatever
+ 2003-2005 M. Bakker, Nero AG, http://www.nero.com
  2003-2004 Sashnov Alexander
- 2002 Gian-Carlo Pascutto <gcp at sjeng.org>
+ 2003-2004  BMP development team
  2002 Lars Siebold
+ 2002 Gian-Carlo Pascutto <gcp at sjeng.org>
  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>
+ 2000-2002 Ville Syrjälä <syrjala at sci.fi>
+ 2000, 2002 Erik de Castro Lopo
  1999-2007 Tecnic Software productions (TNSP)
- 1998-2003 XMMS development team
  1999-2001 Haavard Kvaalen <havardk at sol.no>
+ 1998-2003 XMMS development team
 License: GPL-2+
 
 Files:
+ src/adplug/*
+ src/console/*
  src/jack/*
  src/ladspa/ladspa.h
- src/console/*
- src/adplug/*
 Copyright:
- 2003-2006 Chris Morgan
  2003-2006 Shay Green
+ 2003-2006 Chris Morgan
  2002-2007 Simon Peter
  2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan Westerfeld
- 1998-2001 Ken Silverman
  1999,2000 Tatsuyuki Satoh , MultiArcadeMachineEmurator development
+ 1998-2001 Ken Silverman
 License: LGPL-2.1+
 
 Files: src/adplug/core/binio_virtual.h
@@ -114,16 +114,16 @@ License: public-domain
 
 Files:
  src/alsa/*
+ src/audpl/*
  src/compressor/*
- src/resample/*
- src/unix-io/*
  src/crossfade/*
  src/ladspa/*
- src/audpl/*
- src/oss4/*
+ src/mixer/*
  src/mpris2/*
+ src/oss4/*
+ src/resample/*
  src/sdlout/*
- src/mixer/*
+ src/unix-io/*
 Copyright:
  2010-2011 Michał Lipski <tallica at o2.pl>
  2009-2011 John Lindgren
@@ -141,8 +141,8 @@ Files:
  src/mpg123/*
  src/lyricwiki/*
 Copyright:
- 2007-2011 William Pitcock <nenolod at dereferenced.org>
  2010-2011 John Lindgren <john.lindgren at tds.net>
+ 2007-2011 William Pitcock <nenolod at dereferenced.org>
  2006 Evan Martin
  2005 Shay Green
 License: Expat
@@ -158,31 +158,30 @@ Copyright:
 License: GPL-3+
 
 Files:
+ src/asx/util.*
+ src/cdaudio-ng/*
+ src/gntui/*
  src/gtkui/*
  src/lirc/*
- src/song_change/*
- src/gntui/*
- src/skins/*
- src/pls/util.*
  src/mtp_up/*
- src/cdaudio-ng/*
- src/asx/util.*
+ src/pls/util.*
+ src/skins/*
+ src/song_change/*
 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
+ 2007 Calin Crisan <ccrisan at gmail.com>
+ 2007-2009 Tomasz Moń <desowin at gmail.com>
+ 2005-2011 Audacious development team
+ 2003-2004 BMP development team
  1999-2003 Haavard Kvaalen
  1998-2003 XMMS development team
- 2003-2004 BMP development team
+ 1998-2003 Peter Alm, Mikael Alm, Olle Hallnas,
+ Thomas Nilsson and 4Front Technologies
 License: GPL-3
 
 Files:
  src/modplug/*
- sid/xs_md5.c
 Copyright: No copyright holders
 License: public-domain
  This source code is public domain.
@@ -216,9 +215,10 @@ Copyright: 2011 John Lindgren
 License: GPL-2 or GPL-3
 
 Files: debian/*
-Copyright: 2006-2009, Adam Cécile (Le_Vert)
-           2010, Chris Taylor
-           2010, Benjamin Drung <bdrung at ubuntu.com>
+Copyright:
+ 2010 Chris Taylor
+ 2010 Benjamin Drung <bdrung at ubuntu.com>
+ 2006-2009 Adam Cécile (Le_Vert)
 License: GPL-2+
 
 License: GPL-2

-- 
Plugins for audacious



More information about the pkg-multimedia-commits mailing list