[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.8.D.3-1-31-g5df3aa8

Sat Nov 12 10:24:18 UTC 2011

The following commit has been merged in the master-experimental branch:
commit 3a5348a57f1b7e667d669747df1845ad99aa9804
Author: Stephen Kitt <steve at sk2.org>
Date:   Wed Nov 9 07:52:58 2011 +0100

    Update copyright information.

diff --git a/debian/changelog b/debian/changelog
index 58dc32f..6a3f613 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mednafen (0.9.18-1) experimental; urgency=low
 
   * New upstream WIP version, adding PSX emulation.
+  * Update copyright information.
 
  -- Stephen Kitt <steve at sk2.org>  Wed, 09 Nov 2011 07:48:17 +0100
 
diff --git a/debian/copyright b/debian/copyright
index c0bbb87..9dbae23 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: mednafen
-Source: http://forum.fobby.net/index.php?t=msg&goto=2100&#msg_num_9
+Source: http://forum.fobby.net/index.php?t=msg&th=659&start=0&
 Copyright: 2005-2011 Mednafen Team
 License: GPL-2+
 
@@ -16,7 +16,7 @@ License: GPL-2+
 Files: include/mpcdec/* src/mpcdec/*
 Comment: libmpcdec <http://www.musepack.net/>
 Copyright: 2005 The Musepack Development Team
-License: mpcdec
+License: BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -49,33 +49,7 @@ License: mpcdec
 Files: src/tremor/*
 Comment: Tremor <http://xiph.org/>
 Copyright: 2002 Xiph.org Foundation
-License: Xiph
- 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-Xiph
 
 Files: include/blargg_common.h include/blip/* src/compress/blz.c src/hw_sound/gb_apu/* src/hw_sound/sms_apu/* src/hw_sound/ym2612/* src/nes/ntsc/* src/ngp/T6W28_Apu.cpp src/sound/Blip_Buffer.cpp src/sound/Fir_Resampler.cpp src/sound/Stereo_Buffer.cpp
 No-Header-Files: include/blargg_config.h include/blargg_endian.h include/blargg_source.h include/Fir_Resampler.h
@@ -297,6 +271,7 @@ Comment: FCE Ultra <http://fceultra.sourceforge.net/>
 Copyright: 1998 BERO
            2002 Xodnizel
            2002 Paul Kuliniewicz
+	   2003 CaH4e3
 License: GPL-2+
 
 Files: src/compress/quicklz.*
@@ -328,9 +303,38 @@ License: GPL-2+
 
 Files: src/md/cart/map_eeprom.cpp
 Comment: Genesis Plus GX
-Copyright: 2007 EkeEke
+Copyright: 2007-2009 EkeEke
 License: GPL-2+
 
+Files: src/md/cart/ssp16.*
+Copyright: 2008 Gražvydas "notaz" Ignotas
+License: BSD
+ 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 organization 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 COPYRIGHT
+ HOLDER 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.
+
 Files: src/hw_sound/ym2413/* src/nes/boards/emu2413.*
 Comment: EMU2413
 Copyright: 2004 Mitsutaka Okazaki
@@ -425,6 +429,12 @@ Comment: DSP Utils
 Copyright: 2000-2002 Fabrice Bellard
 License: LGPL-2+
 
+Files: src/resampler/*
+Comment: Speex resampler <http://speex.org/>
+Copyright: 2002-2008 Jean-Marc Valin
+	   2008 Thorvald Natvig
+License: BSD-Xiph
+
 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
@@ -497,3 +507,31 @@ 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: BSD-Xiph
+ 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.

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine

