[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.9.21-2-6-g08984bc

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 38be0ad5c83b8475ccabab218c6fd64fb6eeff8c
Author: Stephen Kitt <steve at sk2.org>
Date:   Wed May 30 06:51:16 2012 +0200

    New upstream WIP version.

diff --git a/debian/changelog b/debian/changelog
index 128e7cb..d052e52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mednafen (0.9.22-1) UNRELEASED; urgency=low
+
+  * New upstream WIP version.
+  * Drop hardening-fixes.patch and cdromif-memset-fix.patch, merged
+    upstream.
+
+ -- Stephen Kitt <steve at sk2.org>  Wed, 30 May 2012 06:47:49 +0200
+
 mednafen (0.9.21-2) experimental; urgency=low
 
   * Add a Built-Using relationship on the package MiniLZO was copied
diff --git a/debian/copyright b/debian/copyright
index afce242..f561e4a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -177,7 +177,8 @@ License: GPL-2+
 
 Files: src/hw_cpu/z80-fuse/*
 Comment: Fuse Z80 emulation code <http://fuse-emulator.sourceforge.net/>
-Copyright: 1999-2004 Philip Kendall, Witold Filipczyk
+Copyright: 1999-2005 Philip Kendall, Witold Filipczyk
+	   1999-2011 Philip Kendall
 License: GPL-2+
 
 Files: src/ngp/*
@@ -301,7 +302,7 @@ Comment: Genesis Plus <http://cgfm2.emuviews.com/>
 Copyright: 1998-2003 Charles MacDonald
 License: GPL-2+
 
-Files: src/md/cart/map_eeprom.cpp
+Files: src/md/hvc.h src/md/cart/map_eeprom.cpp
 Comment: Genesis Plus GX
 Copyright: 2007-2009 EkeEke
 License: GPL-2+
diff --git a/debian/patches/cdromif-memset-fix.patch b/debian/patches/cdromif-memset-fix.patch
deleted file mode 100644
index 39b63f9..0000000
--- a/debian/patches/cdromif-memset-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: Fix memset invocation
-Author: Stephen Kitt <steve at sk2.org>
-Forwarded: yes, http://forum.fobby.net/index.php?t=msg&goto=2458&#msg_2458
-
-This memset call has its last two arguments swapped.
-
---- mednafen.orig/src/cdrom/cdromif.cpp
-+++ mednafen/src/cdrom/cdromif.cpp
-@@ -344,7 +344,7 @@
- 
-  if(UnrecoverableError)
-  {
--  memset(buf, 2352 + 96, 0);
-+  memset(buf, 0, 2352 + 96);
-   return(false);
-  }
- 
diff --git a/debian/patches/hardening-fixes.patch b/debian/patches/hardening-fixes.patch
deleted file mode 100644
index 538defb..0000000
--- a/debian/patches/hardening-fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Always use format specifier when formatting a variable string
-Author: Stephen Kitt <steve at sk2.org>
-
---- mednafen.orig/src/ngp/TLCS-900h/TLCS900h_disassemble.cpp
-+++ mednafen/src/ngp/TLCS-900h/TLCS900h_disassemble.cpp
-@@ -209,7 +209,7 @@
- 
- 	if (size == 0 && first == 0xC7)
- 	{
--		sprintf(str_r, extra);
-+		sprintf(str_r, "%s", extra);
- 		return;
- 	}
- 
diff --git a/debian/patches/series b/debian/patches/series
index 71fa0f7..a355c18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 use-system-tremor.patch
 use-system-mpcdec.patch
-hardening-fixes.patch
-cdromif-memset-fix.patch

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