--- mame-0.141/debian/changelog 2011-01-05 12:51:46.000000000 +0100 +++ mame-0.143/debian/changelog 2011-07-25 16:02:30.000000000 +0200 @@ -1,3 +1,23 @@ +mame (0.143-0ubuntu1) oneiric; urgency=low + + * New upstream release (LP: #803468) (LP: #770914) + * Compress packages and debian.tar using bzip2 + * added hash files + * let dh_usrlocal take care of /usr/local/share/mame/ and subdirs + * control: + - bumped standards version to 3.9.2 + - rearranged conflicting dependencies + * rules: + - excluded more non-*nix docs + - do not consider compiler warnings as errors + * README.Debian: updated with hash files info + * contrib/mame.ini: added hash file entry + * mame-common: merged with main package (prepares future import from Debian) + * mame-tools: removed ldplayer, in sync with upstream distribution; this also + removed mame-tools dependency on mame-common + + -- Cesare Falco Mon, 25 Jul 2011 11:37:29 +0200 + mame (0.141-0ubuntu1) natty; urgency=low * New upstream release (LP: #671358) --- mame-0.141/debian/contrib/mame.ini 2010-11-05 11:51:25.000000000 +0100 +++ mame-0.143/debian/contrib/mame.ini 2011-07-06 11:30:08.000000000 +0200 @@ -11,9 +11,10 @@ artpath $HOME/.mame/artwork;/usr/local/share/games/mame/artwork ctrlrpath $HOME/.mame;/etc/mame/ctrlr inipath $HOME/.mame;/etc/mame -fontpath /tmp;/usr/share/games/mame-common +fontpath /tmp cheatpath $HOME/.mame/cheat;$HOME/.mame/cheat/cheat;/usr/local/share/games/mame/cheat;/usr/local/share/games/mame/cheat/cheat crosshairpath $HOME/.mame/crosshair;/usr/local/share/games/mame/crosshair +hashpath /usr/share/games/mame/hash # # CORE OUTPUT DIRECTORY OPTIONS @@ -231,11 +232,11 @@ # If you are using one of the available non-us keyboard layouts # set keymap to 1 and uncomment the appropriate line below keymap 0 -#keymap_file /usr/share/games/mame-common/keymaps/km-be.txt -#keymap_file /usr/share/games/mame-common/keymaps/km-ch.txt -#keymap_file /usr/share/games/mame-common/keymaps/km-de.txt -#keymap_file /usr/share/games/mame-common/keymaps/km-fr.txt -#keymap_file /usr/share/games/mame-common/keymaps/km_it.txt +#keymap_file /usr/share/games/mame/keymaps/km-be.txt +#keymap_file /usr/share/games/mame/keymaps/km-ch.txt +#keymap_file /usr/share/games/mame/keymaps/km-de.txt +#keymap_file /usr/share/games/mame/keymaps/km-fr.txt +#keymap_file /usr/share/games/mame/keymaps/km_it.txt # # SDL JOYSTICK MAPPING --- mame-0.141/debian/control 2011-01-05 13:52:18.000000000 +0100 +++ mame-0.143/debian/control 2011-07-25 11:32:53.000000000 +0200 @@ -12,40 +12,34 @@ libsdl-ttf2.0-dev, libxinerama-dev, zlib1g-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 + Package: mame Architecture: i386 amd64 -Provides: sdlmame Depends: ${misc:Depends}, - ${shlibs:Depends}, - mame-common (= ${source:Version}) + ${shlibs:Depends} Suggests: joystick, mame-tools -Description: The Multiple Arcade Machine Emulator - MAME - A software emulator of several arcade games from the past. - . - MAME stands for Multiple Arcade Machine Emulator. When used - in conjunction with images of the original arcade game's ROM - and disk data, MAME attempts to reproduce that game as faithfully - as possible on a more modern general-purpose computer. MAME can - currently emulate several thousand different classic arcade video - games from the late 1970s through the modern era. - -Package: mame-common -Architecture: all -Depends: ${misc:Depends} -Replaces: sdlmame (<< 0.137) -Conflicts: sdlmame (<< 0.137), +Provides: sdlmame +Breaks: mame-common (<< 0.143), + sdlmame (<< 0.137), + xmame-common, + xmame-gl, + xmame-sdl, + xmame-svga, + xmame-tools, + xmame-x +Replaces: mame-common (<< 0.143), + sdlmame (<< 0.137), xmame-common, xmame-gl, xmame-sdl, xmame-svga, xmame-tools, xmame-x -Description: Base files for MAME - A set of files common to every flavour of MAME, including base - configuration and shared local directories. +Description: The Multiple Arcade Machine Emulator - MAME + A software emulator of several arcade games from the past. . MAME stands for Multiple Arcade Machine Emulator. When used in conjunction with images of the original arcade game's ROM @@ -54,26 +48,27 @@ currently emulate several thousand different classic arcade video games from the late 1970s through the modern era. + Package: mame-tools Section: utils Architecture: i386 amd64 Depends: ${misc:Depends}, - ${shlibs:Depends}, - mame-common (= ${source:Version}) + ${shlibs:Depends} Recommends: mame (= ${source:Version}) Provides: sdlmame-tools -Replaces: sdlmame-tools (<< 0.137) -Conflicts: sdlmame-tools (<< 0.137), +Breaks: sdlmame-tools (<< 0.137), + xmame-tools +Replaces: sdlmame-tools (<< 0.137), xmame-tools Description: MAME tools A set of useful tools for the Multiple Arcade Machine Emulator: * chdman - MAME Compressed Hunks of Data (CHD) manager * jedutil - Converts a .JED file into its binary form, and viceversa * ldverify - MAME laserdisc data checker - * ldplayer - MAME laserdisc image player * romcmp - MAME rom and romsets check and comparison tool * testkeys - Returns SDL keycode for key pressed + Package: sdlmame Depends: ${misc:Depends}, mame @@ -83,6 +78,7 @@ . It can be safely removed from your system. + Package: sdlmame-tools Depends: ${misc:Depends}, mame-tools --- mame-0.141/debian/mame-common.dirs 2010-07-19 00:02:43.000000000 +0200 +++ mame-0.143/debian/mame-common.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -etc/mame/ctrlr --- mame-0.141/debian/mame-common.examples 2010-02-15 22:45:15.000000000 +0100 +++ mame-0.143/debian/mame-common.examples 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -debian/contrib/mame.ini -debian/contrib/vector.ini --- mame-0.141/debian/mame-common.install 2010-07-06 00:09:59.000000000 +0200 +++ mame-0.143/debian/mame-common.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -debian/contrib/mame.ini etc/mame -debian/contrib/vector.ini etc/mame -src/osd/sdl/keymaps/*.txt usr/share/games/mame-common/keymaps --- mame-0.141/debian/mame-common.postinst 2010-02-15 22:45:49.000000000 +0100 +++ mame-0.143/debian/mame-common.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -#! /bin/sh - -# postinst script for mame-base -# (c) Copyright 2010 Cesare Falco -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL-2 or . - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# - -# these directories get standard owner:group -LOCAL_DIRS=" \ -/usr/local/share/games \ -/usr/local/share/games/mame \ -/usr/local/share/games/mame/roms \ -/usr/local/share/games/mame/samples \ -/usr/local/share/games/mame/artwork \ -/usr/local/share/games/mame/cheat \ -/usr/local/share/games/mame/crosshair \ -" - -case "$1" in - configure|abort-upgrade|abort-remove|abort-deconfigure) - for DIR in $LOCAL_DIRS; do - if [ ! -d $DIR ]; then - mkdir $DIR - fi - done - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 - - --- mame-0.141/debian/mame-common.postrm 2010-02-15 22:46:00.000000000 +0100 +++ mame-0.143/debian/mame-common.postrm 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -#! /bin/sh - -# postrm script for mame-base -# (c) Copyright 2010 Cesare Falco -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or . - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' overwrit>r> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -# these directories will be deleted *only* if empty -SITE_DIRS=" \ -/usr/local/share/games/mame/roms \ -/usr/local/share/games/mame/samples \ -/usr/local/share/games/mame/artwork \ -/usr/local/share/games/mame/cheat \ -/usr/local/share/games/mame/crosshair \ -/usr/local/share/games/mame \ -/usr/local/share/games \ -" - -case "$1" in - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - purge) - for DIR in $SITE_DIRS; do - if [ -d $DIR ] && ! mount|egrep -q "$DIR" ; then - rmdir --ignore-fail-on-non-empty $DIR - fi - done - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 --- mame-0.141/debian/mame-common.preinst 2010-06-05 14:53:58.000000000 +0200 +++ mame-0.143/debian/mame-common.preinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -#! /bin/sh - -# preinst script for mame-common -# (c) Copyright 2010 Cesare Falco -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL-2 or . - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -# Sweep out wrong directories /usr/share/*/mame-base/ - -case "$1" in - install) - ;; - - upgrade) - if dpkg --compare-versions "$2" lt "0.138u1"; then - rm -rf /usr/share/games/mame-base/ - rm -rf /usr/share/doc/mame-base/ - fi - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - --- mame-0.141/debian/mame.dirs 1970-01-01 01:00:00.000000000 +0100 +++ mame-0.143/debian/mame.dirs 2011-07-25 11:57:49.000000000 +0200 @@ -0,0 +1,6 @@ +etc/mame/ctrlr +/usr/local/share/games/mame/roms +/usr/local/share/games/mame/samples +/usr/local/share/games/mame/artwork +/usr/local/share/games/mame/cheat +/usr/local/share/games/mame/crosshair --- mame-0.141/debian/mame.examples 1970-01-01 01:00:00.000000000 +0100 +++ mame-0.143/debian/mame.examples 2011-07-06 10:06:52.000000000 +0200 @@ -0,0 +1,2 @@ +debian/contrib/mame.ini +debian/contrib/vector.ini --- mame-0.141/debian/mame.install 2010-01-26 19:45:27.000000000 +0100 +++ mame-0.143/debian/mame.install 2011-07-06 10:08:48.000000000 +0200 @@ -1 +1,5 @@ mame usr/games +hash/* usr/share/games/mame/hash +src/osd/sdl/keymaps/*.txt usr/share/games/mame/keymaps +debian/contrib/mame.ini etc/mame +debian/contrib/vector.ini etc/mame --- mame-0.141/debian/mame.preinst 1970-01-01 01:00:00.000000000 +0100 +++ mame-0.143/debian/mame.preinst 2011-07-06 11:37:38.000000000 +0200 @@ -0,0 +1,48 @@ +#! /bin/sh + +# preinst script for mame +# (c) Copyright 2010 Cesare Falco +# +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL-2 or . + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +# Sweep out wrong directories /usr/share/*/mame-base/ + +case "$1" in + install) + ;; + + upgrade) + if dpkg --compare-versions "$2" lt "0.138u1"; then + rm -rf /usr/share/games/mame-base/ + rm -rf /usr/share/doc/mame-base/ + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- mame-0.141/debian/mame-tools.install 2010-11-04 11:28:41.000000000 +0100 +++ mame-0.143/debian/mame-tools.install 2011-07-06 11:39:06.000000000 +0200 @@ -1,6 +1,5 @@ chdman usr/bin jedutil usr/bin romcmp usr/bin -ldplayer usr/bin ldverify usr/bin testkeys usr/bin --- mame-0.141/debian/mame-tools.manpages 2010-11-04 11:29:07.000000000 +0100 +++ mame-0.143/debian/mame-tools.manpages 2011-07-06 11:39:15.000000000 +0200 @@ -1,6 +1,5 @@ src/osd/sdl/man/chdman.1 src/osd/sdl/man/jedutil.1 -src/osd/sdl/man/ldplayer.1 src/osd/sdl/man/ldverify.1 src/osd/sdl/man/romcmp.1 src/osd/sdl/man/testkeys.1 --- mame-0.141/debian/README.Debian 2010-06-26 20:02:48.000000000 +0200 +++ mame-0.143/debian/README.Debian 2011-04-08 18:02:20.000000000 +0200 @@ -30,10 +30,12 @@ * the ctrlr directory is a configuration one, so it lies in /etc/mame/ +* hash files are resources, they are in /usr/share/games/mame/hash + * tools (romcmp, chdman, etc.) are in an optional separate package (mame-tools) Have fun! - -- Cesare Falco Fri, 12 Mar 2010 22:29:51 +0100 + -- Cesare Falco Tue, 05 Apr 2011 22:27:12 +0200 --- mame-0.141/debian/rules 2011-01-05 12:42:48.000000000 +0100 +++ mame-0.143/debian/rules 2011-07-25 12:53:41.000000000 +0200 @@ -8,8 +8,8 @@ DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) -VER=0.141 -MD5SUM=95b3866cc98a2bea789f8b20e6ff7001 +VER=0.143 +MD5SUM=2d95b9d9f79a97a690f62284e4db0e7e # Override relevant make variables in original makefile DEB_MAME_OPTS = \ @@ -24,7 +24,7 @@ SUFFIX= \ DEBUG= \ PROFILER= \ - NOWERROR= \ + NOWERROR=1 \ MACOSX_USE_LIBSDL= \ BUILD_EXPAT= \ BUILD_ZLIB= \ @@ -59,29 +59,26 @@ override_dh_auto_build: $(MAKE) -j3 $(DEB_MAME_OPTS) all - $(MAKE) -j3 $(DEB_MAME_OPTS) TARGET=ldplayer \ - FULLNAME=ldplayer \ - SUBTARGET=ldplayer override_dh_auto_clean: $(MAKE) $(DEB_MAME_OPTS) clean - $(MAKE) $(DEB_MAME_OPTS) TARGET=ldplayer \ - FULLNAME=ldplayer \ - SUBTARGET=ldplayer \ - clean rm -rf obj/ override_dh_installchangelogs: dh_installchangelogs --keep whatsnew.txt override_dh_installdocs: - dh_installdocs --exclude=license.txt \ - --exclude=windows.txt \ - --exclude=whatsnew.txt + dh_installdocs --exclude=hlsl.txt \ + --exclude=license.txt \ + --exclude=whatsnew.txt \ + --exclude=windows.txt override_dh_install: dh_install --exclude=OSX.txt +override_dh_builddeb: + dh_builddeb -- -Zbzip2 + get-orig-source: mame$(subst .,,$(VER))s.zip echo "$(MD5SUM) *mame$(subst .,,$(VER))s.zip" | md5sum -c - --- mame-0.141/debian/source/options 1970-01-01 01:00:00.000000000 +0100 +++ mame-0.143/debian/source/options 2011-02-10 11:02:43.000000000 +0100 @@ -0,0 +1,2 @@ +compression = "bzip2" +compression-level = 9