Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package mess Dear Release Team The mame package available in wheezy FTBFS on armel due to an arbitrary high number of make jobs. This has been reported in #690962 and fixed in mess/0.146-4, by introducing DEB_BUILD_OPTIONS=parallel support. The other changed introduced by this package is a minor change in the default configuration files of the packages, to bring it in sync with the similar mame package. Thank you unblock mess/0.146-4 -- System Information: Debian Release: wheezy/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores) Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru mess-0.146/debian/changelog mess-0.146/debian/changelog --- mess-0.146/debian/changelog 2012-11-17 22:25:59.000000000 +0100 +++ mess-0.146/debian/changelog 2012-11-16 19:39:34.000000000 +0100 @@ -1,3 +1,12 @@ +mess (0.146-4) unstable; urgency=low + + * Add support for DEB_BUILD_OPTIONS=parallel=n (closes:#690962) + * Reorganize default paths: + $HOME/.mess for ini file and output files + $HOME/mess for data search paths + + -- Emmanuel Kasper <emman...@libera.cc> Tue, 13 Nov 2012 15:45:55 +0100 + mess (0.146-3) unstable; urgency=low [ Cesare Falco ] @@ -7,7 +16,7 @@ [ Emmanuel Kasper ] * Add xmess-x.preinst and xmess-sdl.preinst to remove danglink symlinks - when upgrading from squeeze (#685470 and #689718) + when upgrading from squeeze (closes: bug#685470, #689718) -- Cesare Falco <cesare.fa...@gmail.com> Sun, 05 Aug 2012 22:56:44 +0200 diff -Nru mess-0.146/debian/mess.ini mess-0.146/debian/mess.ini --- mess-0.146/debian/mess.ini 2012-11-17 22:25:59.000000000 +0100 +++ mess-0.146/debian/mess.ini 2012-11-11 17:16:34.000000000 +0100 @@ -6,14 +6,13 @@ inipath $HOME/.mess;/etc/mess # Default data search paths -rompath $HOME/.mess/roms;/usr/local/share/games/mess/roms;/usr/share/games/mess/roms -hashpath $HOME/.mess/hash;/usr/local/share/games/mess/hash;/usr/share/games/mess/hash -samplepath $HOME/.mess/samples;/usr/local/share/games/mess/samples;/usr/share/games/mess/samples -artpath $HOME/.mess/artwork;/usr/local/share/games/mess/artwork;/usr/share/games/mess/artwork -ctrlrpath $HOME/.mess/ctrlr;/etc/mess/ctrlr -fontpath /tmp -cheatpath $HOME/.mess/cheat;$HOME/.mess/cheat/cheat;/usr/local/share/games/mess/cheat;/usr/local/share/games/mess/cheat/cheat;/usr/share/games/mess/cheat;/usr/share/games/mess/cheat/cheat -crosshairpath $HOME/.mess/crosshair;/usr/local/share/games/mess/crosshair;/usr/share/games/mess/crosshair +rompath $HOME/mess/roms;/usr/local/share/games/mess/roms;/usr/share/games/mess/roms +samplepath $HOME/mess/samples;/usr/local/share/games/mess/samples;/usr/share/games/mess/samples +artpath $HOME/mess/artwork;/usr/local/share/games/mess/artwork;/usr/share/games/mess/artwork +cheatpath $HOME/mess/cheat;/usr/local/share/games/mess/cheat;/usr/share/games/mess/cheat +crosshairpath $HOME/mess/crosshair;/usr/local/share/games/mess/crosshair;/usr/share/games/mess/crosshair +hashpath $HOME/mess/hash;/usr/local/share/games/mess/hash;/usr/share/games/mess/hash +ctrlrpath /etc/mess/ctrlr # Default data output paths cfg_directory $HOME/.mess/cfg @@ -26,9 +25,7 @@ comment_directory $HOME/.mess/comments # Debian feature defaults -# Set key to toggle full/partial emulation to Ins -uimodekey INSERT -# Set video to 'opengl' if DRI is enabled and reliable on your hardware +# Set video to 'soft' if DRI is not reliable on your hardware video opengl # Set multithreading to '1' if you have more than one core multithreading 0 diff -Nru mess-0.146/debian/rules mess-0.146/debian/rules --- mess-0.146/debian/rules 2012-11-17 22:25:59.000000000 +0100 +++ mess-0.146/debian/rules 2012-11-16 19:39:34.000000000 +0100 @@ -13,6 +13,12 @@ DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +# taken verbatim from debian policy +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + # Override relevant make variables in original makefile DEB_MESS_OPTS = \ OPT_FLAGS="-D'INI_PATH=\"/etc/mess\"'" \ @@ -133,7 +139,7 @@ dh $@ override_dh_auto_build: - $(MAKE) -j5 $(DEB_MESS_OPTS) all + $(MAKE) $(DEB_MESS_OPTS) all $(CURDIR)/mess -createconfig mv mess.ini default.mess.ini