[SCM] packaging for the mame arcade game emulator branch, master, updated. debian/0.146-2-9-g242a696

Cesare Falco cesare.falco at gmail.com
Wed Sep 19 21:19:11 UTC 2012 

The following commit has been merged in the master branch:
commit 1e38389e25c7f25008439abf6183e2be968942a0
Author: Cesare Falco <cesare.falco at gmail.com>
Date:   Wed Aug 22 21:38:44 2012 +0200

    Removed duplicate NOWERROR makefile override

diff --git a/debian/changelog b/debian/changelog
index 6598faa..a706a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mame (0.146u5-1~ppa1~oneiric) oneiric; urgency=low
+
+  * New upstream release
+
+ -- Cesare Falco <cesare.falco at gmail.com>  Mon, 20 Aug 2012 18:30:00 +0200
+
 mame (0.146-2) unstable; urgency=low
 
   [ Cesare Falco ] 
diff --git a/debian/patches/gnu_fixes.patch b/debian/patches/gnu_fixes.patch
index 1b921d6..dedc5d1 100644
--- a/debian/patches/gnu_fixes.patch
+++ b/debian/patches/gnu_fixes.patch
@@ -4,38 +4,25 @@ Description: Check for GNU.
  that defines NO_AFFINITY_NP.
 Forwarded: no
 
-Index: mess-0.145/src/osd/sdl/sdlprefix.h
+Index: mame-0.146u1/makefile
 ===================================================================
---- mess-0.145.orig/src/osd/sdl/sdlprefix.h	2012-05-22 01:10:19.818402982 +0200
-+++ mess-0.145/src/osd/sdl/sdlprefix.h	2012-05-22 01:10:24.134403145 +0200
-@@ -42,7 +42,7 @@
- /* Large file support on IRIX needs _SGI_SOURCE */
- #undef _POSIX_SOURCE
- 
--#elif defined(__linux__) || defined(__FreeBSD_kernel__)
-+#elif defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__)
- #define SDLMAME_LINUX 1
- 
- #elif defined(__FreeBSD__)
-Index: mess-0.145/makefile
-===================================================================
---- mess-0.145.orig/makefile	2012-05-22 01:10:19.706402978 +0200
-+++ mess-0.145/makefile	2012-05-22 01:23:19.302431871 +0200
-@@ -95,6 +95,9 @@
- ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
- TARGETOS = macosx
+--- mame-0.146u1.orig/makefile	2012-06-14 15:41:52.000000000 +0200
++++ mame-0.146u1/makefile	2012-06-14 15:58:23.000000000 +0200
+@@ -77,6 +77,9 @@
+ ifeq ($(firstword $(filter Linux,$(UNAME))),Linux)
+ TARGETOS = linux
  endif
 +ifeq ($(firstword $(filter GNU,$(UNAME))),GNU)
 +TARGETOS = gnu
 +endif
- 
- ifndef TARGETOS
- $(error Unable to detect TARGETOS from uname -a: $(UNAME))
-Index: mess-0.145/src/osd/sdl/sdl.mak
+ ifeq ($(firstword $(filter Solaris,$(UNAME))),Solaris)
+ TARGETOS = solaris
+ endif
+Index: mame-0.146u1/src/osd/sdl/sdl.mak
 ===================================================================
---- mess-0.145.orig/src/osd/sdl/sdl.mak	2012-05-22 00:57:29.000000000 +0200
-+++ mess-0.145/src/osd/sdl/sdl.mak	2012-05-22 01:26:09.374438171 +0200
-@@ -201,6 +201,13 @@
+--- mame-0.146u1.orig/src/osd/sdl/sdl.mak	2012-06-14 15:41:52.000000000 +0200
++++ mame-0.146u1/src/osd/sdl/sdl.mak	2012-06-14 15:57:11.000000000 +0200
+@@ -241,6 +241,13 @@
  
  endif
  
@@ -49,3 +36,16 @@ Index: mess-0.145/src/osd/sdl/sdl.mak
  ifeq ($(TARGETOS),win32)
  BASE_TARGETOS = win32
  SYNC_IMPLEMENTATION = win32
+Index: mame-0.146u1/src/osd/sdl/sdlprefix.h
+===================================================================
+--- mame-0.146u1.orig/src/osd/sdl/sdlprefix.h	2012-06-14 15:41:52.000000000 +0200
++++ mame-0.146u1/src/osd/sdl/sdlprefix.h	2012-06-14 15:54:21.000000000 +0200
+@@ -42,7 +42,7 @@
+ /* Large file support on IRIX needs _SGI_SOURCE */
+ #undef _POSIX_SOURCE
+ 
+-#elif defined(__linux__) || defined(__FreeBSD_kernel__)
++#elif defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__)
+ #define SDLMAME_LINUX 1
+ 
+ #elif defined(__FreeBSD__)
diff --git a/debian/patches/mame_manpage_fixes.patch b/debian/patches/mame_manpage_fixes.patch
index 22116f4..c96abf0 100644
--- a/debian/patches/mame_manpage_fixes.patch
+++ b/debian/patches/mame_manpage_fixes.patch
@@ -2,10 +2,10 @@ Author: Cesare Falco <cesare.falco at gmail.com>
 Description: Fix mame.6 and jedutil.1, update chdman.1
 Forwarded: yes
 
-Index: mame-0.146u1/src/osd/sdl/man/mame.6
+Index: mame-0.146u4/src/osd/sdl/man/mame.6
 ===================================================================
---- mame-0.146u1.orig/src/osd/sdl/man/mame.6	2012-06-14 20:43:29.000000000 +0200
-+++ mame-0.146u1/src/osd/sdl/man/mame.6	2012-06-14 20:43:43.000000000 +0200
+--- mame-0.146u4.orig/src/osd/sdl/man/mame.6	2012-07-31 00:57:13.000000000 +0200
++++ mame-0.146u4/src/osd/sdl/man/mame.6	2012-07-31 00:57:52.000000000 +0200
 @@ -13,7 +13,7 @@
  .\" and updated by Andrew Burton <burtona at gol.com>, July 2003
  .\"
@@ -24,16 +24,26 @@ Index: mame-0.146u1/src/osd/sdl/man/mame.6
  Sets the audio sample rate. Smaller values (e.g. 11025) cause lower
  audio quality but faster emulation speed. Higher values (e.g. 48000)
  cause higher audio quality but slower emulation speed. The default is
-Index: mame-0.146u1/src/osd/sdl/man/chdman.1
+@@ -942,6 +942,9 @@
+ .B \-sixaxis
+ Use special handling for PS3 Sixaxis controllers.
+ .TP
++.B \-lightgun_index[1\-8]
++Map lightgun to specific index in MAME.
++.TP
+ .B \-videodriver, \-vd \fIx11\fR|\fIdirectfb\fR|\fIauto\fR
+ SDL video driver to use; auto selects SDL default.
+ .TP
+Index: mame-0.146u4/src/osd/sdl/man/chdman.1
 ===================================================================
---- mame-0.146u1.orig/src/osd/sdl/man/chdman.1	2012-06-14 20:43:29.000000000 +0200
-+++ mame-0.146u1/src/osd/sdl/man/chdman.1	2012-06-14 20:43:43.000000000 +0200
+--- mame-0.146u4.orig/src/osd/sdl/man/chdman.1	2012-07-31 00:57:13.000000000 +0200
++++ mame-0.146u4/src/osd/sdl/man/chdman.1	2012-07-31 00:58:23.000000000 +0200
 @@ -6,7 +6,7 @@
  .\" Ashley T. Howes <debiandev at ashleyhowes.com>, February 2005
  .\" updated by Cesare Falco <cesare.falco at gmail.com>, February 2007
  .\"
 -.TH CHDMAN 1 2012-03-25 0.145u5 "MAME Compressed Hunks of Data (CHD) manager"
-+.TH CHDMAN 1 2012-06-14 0.146u1 "MAME Compressed Hunks of Data (CHD) manager"
++.TH CHDMAN 1 2012-07-31 0.146u4 "MAME Compressed Hunks of Data (CHD) manager"
  .\"
  .\" NAME chapter
  .SH NAME
@@ -294,16 +304,16 @@ Index: mame-0.146u1/src/osd/sdl/man/chdman.1
 +.TP
 +.B \-\-verbose, \-v
 +Output additional information about the operation.
-Index: mame-0.146u1/src/osd/sdl/man/jedutil.1
+Index: mame-0.146u4/src/osd/sdl/man/jedutil.1
 ===================================================================
---- mame-0.146u1.orig/src/osd/sdl/man/jedutil.1	2012-05-21 19:49:28.000000000 +0200
-+++ mame-0.146u1/src/osd/sdl/man/jedutil.1	2012-06-14 21:44:11.000000000 +0200
+--- mame-0.146u4.orig/src/osd/sdl/man/jedutil.1	2012-07-31 00:57:13.000000000 +0200
++++ mame-0.146u4/src/osd/sdl/man/jedutil.1	2012-07-31 01:04:29.000000000 +0200
 @@ -8,7 +8,7 @@
  .\" References
  .\" http://aarongiles.com/?p=159
  .\"
 -.TH JEDUTIL 1 2012-03-25 0.145u5 "jedutil"
-+.TH JEDUTIL 1 2012-06-14 0.146u1 "jedutil"
++.TH JEDUTIL 1 2012-07-31 0.146u4 "MAME JED files manager"
  .\"
  .\" NAME chapter
  .SH NAME
@@ -316,3 +326,42 @@ Index: mame-0.146u1/src/osd/sdl/man/jedutil.1
  .\"
  .\" DESCRIPTION chapter
  .SH DESCRIPTION
+Index: mame-0.146u4/src/osd/sdl/man/ldverify.1
+===================================================================
+--- mame-0.146u4.orig/src/osd/sdl/man/ldverify.1	2012-05-21 19:49:28.000000000 +0200
++++ mame-0.146u4/src/osd/sdl/man/ldverify.1	2012-07-31 01:01:07.000000000 +0200
+@@ -5,7 +5,7 @@
+ .\" Man page created from source and usage information by 
+ .\" Cesare Falco <cesare.falco at gmail.com>, August 2008
+ .\"
+-.TH LDVERIFY 1 2012-03-25 0.145u5 "ldverify"
++.TH LDVERIFY 1 2012-07-31 0.146u4 "MAME laserdisc data checker"
+ .\"
+ .\" NAME chapter
+ .SH NAME
+Index: mame-0.146u4/src/osd/sdl/man/romcmp.1
+===================================================================
+--- mame-0.146u4.orig/src/osd/sdl/man/romcmp.1	2012-05-21 19:49:28.000000000 +0200
++++ mame-0.146u4/src/osd/sdl/man/romcmp.1	2012-07-31 01:05:38.000000000 +0200
+@@ -9,7 +9,7 @@
+ .\" References
+ .\" http://www.mame.net/mamefaq.html
+ .\"
+-.TH ROMCMP 1 2012-03-25 0.145u5 "romcmp"
++.TH ROMCMP 1 2012-07-31 0.146u4 "MAME romset checking tool"
+ .\"
+ .\" NAME chapter
+ .SH NAME
+Index: mame-0.146u4/src/osd/sdl/man/testkeys.1
+===================================================================
+--- mame-0.146u4.orig/src/osd/sdl/man/testkeys.1	2012-05-21 19:49:28.000000000 +0200
++++ mame-0.146u4/src/osd/sdl/man/testkeys.1	2012-07-31 01:03:18.000000000 +0200
+@@ -5,7 +5,7 @@
+ .\" Man page created from source and usage information
+ .\" Cesare Falco <cesare.falco at gmail.com>, February 2007
+ .\"
+-.TH TESTKEYS 1 2012-03-25 0.145u5 "testkeys"
++.TH TESTKEYS 1 2012-07-31 0.146u4 "MAME SDL keycode checker"
+ .\"
+ .\" NAME chapter
+ .SH NAME
diff --git a/debian/rules b/debian/rules
index db830c4..c2c3e76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ DEB_MAME_OPTS = \
     SUFFIX= \
     DEBUG= \
     PROFILER= \
-    NOWERROR= \
+    NOWERROR=1 \
     MACOSX_USE_LIBSDL= \
     BUILD_EXPAT= \
     BUILD_ZLIB= \
@@ -46,8 +46,7 @@ DEB_MAME_OPTS = \
     VERBOSE= \
     OPTIMIZE=2 \
     LDFLAGS="-Wl,--as-needed" \
-    LDFLAGSEMULATOR="-Wl,--as-needed" \
-    NOWERROR=1 \
+    LDFLAGSEMULATOR="-Wl,--as-needed"
 
 # Override make variables for specific archs
 # Linux architectures

-- 
packaging for the mame arcade game emulator

More information about the Pkg-games-commits mailing list