[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. upstream/0.8.D-18-g7c28e5a

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 6de787498d9c656797c00bf3b80636b4a582e42b
Author: Stephen Kitt <steve at sk2.org>
Date:   Tue Jun 1 07:13:20 2010 +0200

    Update debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 8f24d6a..6ec7ca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mednafen (0.8.D-1) unstable; urgency=low
 
   * New upstream version.
   * Mention homepage.
+  * Update debian/copyright.
 
  -- Stephen Kitt <steve at sk2.org>  Mon, 31 May 2010 06:49:35 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 62541f7..b92a870 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,9 @@ Tue, 22 Nov 2005 22:48:43 -0500.
 
 It was downloaded from http://mednafen.sourceforge.net
 
+It was adopted on Thu, 04 Feb 2010 14:50:12 +0100 by Stephen Kitt
+<steve at sk2.org> on behalf of the Debian games team.
+
 Copyright Holders: 
   Mednafen Team  <sarencele at hotmail.com>
   Firebug  High-level mapper information.
@@ -44,46 +47,46 @@ Copyright Holders:
   QuickLZ	Lasse Mikkel Reinhold
   dvdisaster	Carsten Gnoerlich
 
-  Copyright (C) 2005 Mednafen Team
-  Copyright (C) 2003-2005 Shay Green
-  Copyright (C) 1995-1997, 2000-2004 Ulrich Drepper
-  Copyright (C) 2002-2003 Xodnizel
-  Copyright (C) 1996-2005 Markus Franz Xaver Johannes Oberhumer
-  Copyright (C) 1998 BERO
-  Copyright (C) 2000, 2001, 2002 Fabrice Bellard
-  Copyright (C) 1997-1999 H. Dietz
-  Copyright (C) 2003 CaH4e3
-  Copyright (C) 2002 Jarek Burczynski
-  Copyright (C) 2002-2004 Jim Peters
-  Copyright (C) 1999-2003 Forgotten
-  Copyright (C) 2004 Forgotten and the VBA development team
-  Copyright (C) 2003 Tobias Diedrich
-  Copyright (C) 1998-2005 Gilles Vollant
-  Copyright (C) 1990-2005 Info-ZIP
-  Copyright (C) 2004 Ki
-  Copyright (C) 2001-2004 Andrea Mazzoleni
-  Copyright (C) 2002 Paul Kuliniewicz
-  Copyright (C) 2003 MaxSt
-  Copyright (C) 1996-1997, 2004 K. Wilkins
-  Copyright (C) 1998-2001 Bjorn Reese and Daniel Stenberg
-  Copyright (C) 2005 The Musepack Development Team
-  Copyright (C) 2002 Xiph.org Foundation
-  Copyright (C) 2001 Tetsuya Isaki
+  Copyright © 2005 Mednafen Team
+  Copyright © 2003-2005 Shay Green
+  Copyright © 1995-1997, 2000-2004 Ulrich Drepper
+  Copyright © 2002-2003 Xodnizel
+  Copyright © 1996-2005 Markus Franz Xaver Johannes Oberhumer
+  Copyright © 1998 BERO
+  Copyright © 2000, 2001, 2002 Fabrice Bellard
+  Copyright © 1997-1999 H. Dietz
+  Copyright © 2003 CaH4e3
+  Copyright © 2002 Jarek Burczynski
+  Copyright © 2002-2004 Jim Peters
+  Copyright © 1999-2003 Forgotten
+  Copyright © 2004 Forgotten and the VBA development team
+  Copyright © 2003 Tobias Diedrich
+  Copyright © 1998-2005 Gilles Vollant
+  Copyright © 1990-2005 Info-ZIP
+  Copyright © 2004 Ki
+  Copyright © 2001-2004 Andrea Mazzoleni
+  Copyright © 2002 Paul Kuliniewicz
+  Copyright © 2003 MaxSt
+  Copyright © 1996-1997, 2004 K. Wilkins
+  Copyright © 1998-2001 Bjorn Reese and Daniel Stenberg
+  Copyright © 2005 The Musepack Development Team
+  Copyright © 2002 Xiph.org Foundation
+  Copyright © 2001 Tetsuya Isaki
   Copyright 2001-2004 Unicode, Inc.
-  Copyright (C) Christophe Devine
-  Copyright (C) 2006 David Tucker
-  Copyright (C) 1996-2005 Markus Franz Xaver Johannes Oberhumer
-  Copyright (C) 1999-2004 Philip Kendall, Witold Filipczyk
-  Copyright (C) 2001-2002 by neopop_uk
-  Copyright (C) 1997,1998,1999,2000,2002,2003,2005,2006 
-     Free Software Foundation, Inc.
-  Copyright (C) 1991-1998, Thomas G. Lane.
-  Copyright (C) 1994-2000 Rich Geldreich
-  Copyright (C) 2001 Mitsutaka Okazaki
-  Copyright (C) 2002 Dox <dox at space.pl>
-  Copyright (C) 2006-2007 Lasse Mikkel Reinhold
-  Copyright (C) 2004-2007 Carsten Gnoerlich
-  Copyright (C) 2006 Phil Karn
+  Copyright © Christophe Devine
+  Copyright © 2006 David Tucker
+  Copyright © 1996-2005 Markus Franz Xaver Johannes Oberhumer
+  Copyright © 1999-2004 Philip Kendall, Witold Filipczyk
+  Copyright © 2001-2002 by neopop_uk
+  Copyright © 1997, 1998, 1999, 2000, 2002, 2003, 2005, 2006, 2007,
+    2008, 2009 Free Software Foundation, Inc.
+  Copyright © 1991-1998, Thomas G. Lane.
+  Copyright © 1994-2000 Rich Geldreich
+  Copyright © 2001 Mitsutaka Okazaki
+  Copyright © 2002 Dox <dox at space.pl>
+  Copyright © 2006-2007 Lasse Mikkel Reinhold
+  Copyright © 2004-2007 Carsten Gnoerlich
+  Copyright © 2006 Phil Karn
 
 License:
 
@@ -102,7 +105,8 @@ License:
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License version 2 can be found in
+`/usr/share/common-licenses/GPL-2'.
 
 Parts of Mednafen are also released under the LGPL:
 
@@ -121,7 +125,8 @@ Parts of Mednafen are also released under the LGPL:
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License version 2 can be found in
+`/usr/share/common-licenses/LGPL-2'.
 
 The unzipping code is released under the Info-ZIP license:
 
@@ -205,4 +210,7 @@ has been acquired (see http://www.quicklz.com/order.html). The commercial
 license does not cover derived or ported versions created by third parties 
 under GPL.
 
-The Debian packaging is Copyright (C) Ryan Schultz and is released under the terms of the GNU GPL v2.
+The Debian packaging is
+  Copyright © 2005-2008 Ryan Schultz
+  Copyright © 2010 Stephen Kitt
+and is released under the terms of the GNU GPL v2.

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