[mednafen] 02/03: Correct debian/copyright.

Thu May 7 18:01:32 UTC 2015

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

skitt pushed a commit to branch master
in repository mednafen.

commit 3711343b6a283b68779a5b201a7539ed173f2dd3
Author: Stephen Kitt <steve at sk2.org>
Date:   Thu May 7 19:48:22 2015 +0200

    Correct debian/copyright.
---
 debian/changelog |   1 +
 debian/copyright | 114 +++++++++++++++----------------------------------------
 2 files changed, 32 insertions(+), 83 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48b8095..d41cef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mednafen (0.9.38.4+dfsg-2) UNRELEASED; urgency=medium
 
   * Move to optional to match the overrides.
+  * Correct debian/copyright.
 
  -- Stephen Kitt <skitt at debian.org>  Thu, 07 May 2015 06:56:13 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 6e4da51..b0f4be9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,7 +17,7 @@ License: GPL-2+
 Files: src/mpcdec/*
 Comment: libmpcdec <http://www.musepack.net/>
 Copyright: 2005 The Musepack Development Team
-License: BSD-3-clause
+License: BSD-3-clause-Musepack
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -60,33 +60,7 @@ License: LGPL-2.1+
 Files: src/tremor/*
 Comment: Tremor <http://xiph.org/>
 Copyright: 2002 Xiph.org Foundation
-License: BSD-3-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.
- .
- - Neither the name of the Xiph.org Foundation nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
- .
- 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: BSD-3-clause-Xiph
 
 Files:
  src/hw_sound/gb_apu/*
@@ -105,23 +79,6 @@ Files: src/lynx/*
 Comment: Handy <http://homepage.ntlworld.com/dystopia/>
 Copyright: 2004 K. Wilkins
 License: Zlib
- This software is provided 'as-is', without any express or implied warranty.
- In no event will the authors be held liable for any damages arising from
- the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- .
- 2. Altered source versions must be plainly marked as such, and must not
-    be misrepresented as being the original software.
- .
- 3. This notice may not be removed or altered from any source distribution.
 
 Files: src/pce/pcecd.cpp src/pce_fast/huc.cpp src/pce_fast/pcecd.cpp
 Comment: PC2e
@@ -204,21 +161,6 @@ Comment: Unzipping Code
 Copyright: 1998-2005 Gilles Vollant
            1990-2000 Info-ZIP
 License: Zlib
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
 
 Files:
  src/compress/lzo*
@@ -289,7 +231,7 @@ License: McPhail
 
 Files: src/wswan/dis/*
 Comment: NEC V30MZ disassembler (modified BOCHS x86 disassembler)
-Copyright: TODO
+Copyright: 2005-2012 Stanislav Shwartsman
 License: LGPL-2+
 
 Files:
@@ -377,21 +319,6 @@ Files:
 Comment: EMU2413
 Copyright: 2004 Mitsutaka Okazaki
 License: Zlib
- This software is provided 'as-is', without any express or implied warranty.
- In no event will the authors be held liable for any damages arising from
- the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not
-    be misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
 
 Files:
  src/cdrom/crc32.cpp
@@ -487,7 +414,15 @@ Files: src/resampler/*
 Comment: Speex resampler <http://speex.org/>
 Copyright: 2002-2008 Jean-Marc Valin
 	   2008 Thorvald Natvig
-License: BSD-3-clause
+License: BSD-3-clause-Xiph
+
+Files: src/drivers/shader_sabr.inc
+Comment: SABR Shader
+Copyright: Joshua Street
+License: GPL-2+
+
+
+License: BSD-3-clause-Xiph
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -515,12 +450,6 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: src/drivers/shader_sabr.inc
-Comment: SABR Shader
-Copyright: Joshua Street
-License: GPL-2+
-
-
 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 version 2 as
@@ -593,3 +522,22 @@ License: LGPL-2.1+
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1
+
+License: Zlib
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from
+ the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and must not
+    be misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source distribution.

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

