[Pkg-mpd-commits] [pkg-mpd] 04/13: Update debian/copyright, particularly noting all BSD-2-clause licensed files

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 28503a050a9dda6de884f3337a9055996d5ebb42
Author: Florian Schlichting <fsfs at debian.org>
Date:   Thu Oct 31 22:49:03 2013 +0100

    Update debian/copyright, particularly noting all BSD-2-clause licensed files
---
 debian/copyright |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index fe6647a..f101487 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,9 +4,33 @@ Source: http://sourceforge.net/projects/musicpd/files/mpd/
 Upstream-Contact: Max Kellermann <max at duempel.org>
 
 Files: *
-Copyright: 2003-2012, The Music Player Daemon Project (see AUTHORS for details)
+Copyright: 2003-2013, The Music Player Daemon Project (see AUTHORS for details)
 License: GPL-2+
 
+Files: src/mixer/RoarMixerPlugin.cxx src/output/RoarOutputPlugin.cxx
+Copyright: 2003-2013, The Music Player Daemon Project
+  2010-2011, Philipp 'ph3-der-loewe' Schafft
+  2010-2011, Hans-Kristian 'maister' Arntzen
+License: GPL-2+
+
+Files: src/system/fd_util.c src/system/fd_util.h
+ src/util/RefCount.hxx
+ src/util/fifo_buffer.c src/util/fifo_buffer.h
+ src/util/growing_fifo.c src/util/growing_fifo.h
+Copyright: 2003-2011, The Music Player Daemon Project
+License: BSD-2-clause
+
+Files: src/system/ByteOrder.hxx src/thread/CriticalSection.hxx
+ src/thread/GLibCond.hxx src/thread/GLibMutex.hxx
+ src/thread/PosixCond.hxx src/thread/PosixMutex.hxx
+ src/thread/WindowsCond.hxx
+ src/util/ASCII.hxx src/util/CharUtil.hxx
+ src/util/FifoBuffer.hxx src/util/Macros.hxx
+ src/util/Manual.hxx src/util/NumberParser.hxx
+ src/util/ReusableArray.hxx src/util/WritableBuffer.hxx
+Copyright: 2003-2013, Max Kellermann <max at duempel.org>
+License: BSD-2-clause
+
 Files: aclocal.m4 Makefile.in
 Copyright: 1994-2012, Free Software Foundation, Inc.
 License: GAP~autotools
@@ -82,6 +106,14 @@ License: GPL-3+ with Autoconf exception
  modified version of the Autoconf Macro, you may extend this special
  exception to the GPL to apply to your modified version as well.
 
+Files: m4/ax_cxx_compile_stdcxx_0x.m4
+Copyright: 2008, Benjamin Kosnik <bkoz at redhat.com>
+License: permissive
+ Copying and distribution of this file, with or without modification, are
+ permitted in any medium without royalty provided the copyright notice
+ and this notice are preserved. This file is offered as-is, without any
+ warranty.
+
 Files: m4/pkg.m4
 Copyright: 2004, Scott James Remnant <scott at netsplit.com>
 License: GPL-2+ with Autoconf exception
@@ -98,6 +130,30 @@ Copyright: 2003-2004, Warren Dukes (aka shank) <shank at mercury.chem.pitt.edu>
  2013, Florian Schlichting <fsfs at debian.org>
 License: GPL-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:
+ .
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git