[SCM] packaging for the mame arcade game emulator branch, master, updated. aeb8929d23062753299231ed987d17c540ed90f0

[Cesare Falco]

The following commit has been merged in the master branch:
commit aeb8929d23062753299231ed987d17c540ed90f0
Author: Cesare Falco <cesare.falco at gmail.com>
Date:   Thu Jun 9 23:28:54 2011 +0200

    Regenerated patches with CR-stripped source.

diff --git a/debian/patches/fix-help-file.patch b/debian/patches/fix-help-file.patch
index da5b405..c5848f6 100644
--- a/debian/patches/fix-help-file.patch
+++ b/debian/patches/fix-help-file.patch
@@ -2,14 +2,14 @@ From: Emmanuel Kasper <emmanuel at libera.cc>
 Subject: Fix usage file as shown when calling mame -h
 Forwarded: yes
 Bug: http://www.mametesters.org/view.php?id=4298
---- a/src/emu/clifront.c
-+++ b/src/emu/clifront.c
-@@ -342,7 +342,7 @@
- 		   "        MAME -showusage    for a brief list of options\n"
- 		   "        MAME -showconfig   for a list of configuration options\n"
- 		   "        MAME -createconfig to create a " CONFIGNAME ".ini\n\n"
--		   "For usage instructions, please consult the file windows.txt\n");
-+		   "For usage instructions, please consult the file config.txt\n");
- #else
- 	mess_display_help();
- #endif
+--- mame-0.142.orig/src/emu/clifront.c	2011-06-09 23:04:15.000000000 +0200
++++ mame-0.142/src/emu/clifront.c	2011-06-09 23:04:37.000000000 +0200
+@@ -361,7 +361,7 @@
+ 		   "        MAME -showusage    for a brief list of options\n"
+ 		   "        MAME -showconfig   for a list of configuration options\n"
+ 		   "        MAME -createconfig to create a " CONFIGNAME ".ini\n\n"
+-		   "For usage instructions, please consult the file windows.txt\n");
++		   "For usage instructions, please consult the file config.txt\n");
+ #else
+ 	mess_display_help();
+ #endif
diff --git a/debian/patches/kfreebsd-build.patch b/debian/patches/kfreebsd-build.patch
index 8fdddb4..de572b9 100644
--- a/debian/patches/kfreebsd-build.patch
+++ b/debian/patches/kfreebsd-build.patch
@@ -4,14 +4,14 @@ Description: Fix kfreebsd build
 Forwarded: yes
 Bug: http://mametesters.org/view.php?id=4127
 
---- a/src/osd/sdl/sdlprefix.h
-+++ b/src/osd/sdl/sdlprefix.h
+--- mame-0.142.orig/src/osd/sdl/sdlprefix.h	2011-06-09 23:01:26.000000000 +0200
++++ mame-0.142/src/osd/sdl/sdlprefix.h	2011-06-09 23:01:51.000000000 +0200
 @@ -42,7 +42,7 @@
- /* Large file support on IRIX needs _SGI_SOURCE */
- #undef _POSIX_SOURCE
- 
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__FreeBSD_kernel__)
- #define SDLMAME_LINUX 1
- 
- #elif defined(__FreeBSD__)
+ /* Large file support on IRIX needs _SGI_SOURCE */
+ #undef _POSIX_SOURCE
+ 
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__FreeBSD_kernel__)
+ #define SDLMAME_LINUX 1
+ 
+ #elif defined(__FreeBSD__)

-- 
packaging for the mame arcade game emulator