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

[Cesare Falco]

The following commit has been merged in the master branch:
commit e3e772341e4461c112d598f9623b868e4e0cca29
Merge: f643e33aa469bb4cf340d12baafb690c93982037 c2139d20ca7120a5d55dc102d5461f0c5d6fbfed
Author: Cesare Falco <cesare.falco at gmail.com>
Date:   Tue Apr 10 11:48:59 2012 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/mame
    
    Conflicts:
    	debian/patches/build_with_system_libjpeg.patch

diff --combined debian/changelog
index 6baef98,1ec9a43..d00eef0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,33 +1,36 @@@
  mame (0.145-1) UNRELEASED; urgency=low
  
    [ Emmanuel Kasper ]
-   * New upstream release
+   * New upstream release (closes: #663429)
    * New patch: makefile switch to link system flac library
+   * Remove "all" from build target as we build the tools in mess package
+   * Yet another batch of syntax errors in DEP5 copyright file corrected
  
    [ Cesare Falco ]
    * Improve backward compatibility in Ubuntu:
-     * Updated mame.preinst and injected sdlmame.preinst from Ubuntu
      * Added /usr/local/* paths in mame.ini
      * Some cleanup and refactoring in control
    * Make lintian happier:
      * Included BSD licence in copyright
      * Fixed Section: header in control
-     * Replaced -a with -e test in mame.preinst
    * New patch: makefile switch to link system jpeg library
 -  * nplayers packaged is now a supplemental tarball
 +  * Packaged nplayers as a supplemental tarball
 +  * Removed references to mess
 +    * Swept out any remaining debris in debian/*
 +    * Don't compile tools, as mame-tools is now build by mess
  
-  -- Emmanuel Kasper <emmanuel at libera.cc>  Mon, 06 Feb 2012 11:19:26 +0100
- 
- mame (0.144-2) UNRELEASED; urgency=low
- 
-   [ Emmanuel Kasper ]
-   * Yet another batch of syntax errors in DEP5 copyright file corrected
- 
    [ Jordi Mallach ]
    * gnu_fixes.patch: Add a check for __GNU__ to fix builds on the Hurd.
- 
-  -- Jordi Mallach <jordi at debian.org>  Sun, 15 Jan 2012 23:14:16 +0100
+   * Point to the 1.0 machine-readable copyright format spec.
+   * Make get-orig-source target drop tarballs in the current directory,
+     as policy mandates.
+   * Bump Standards-Version to 3.9.3.
+   * Remove leading slashes from mame.dirs.
+   * Add back Section field for transitional packages, but switch to oldlibs
+     (as opposed to metapackages), which apparently is what everyone is doing
+     due to lintian.
+ 
+  -- Jordi Mallach <jordi at debian.org>  Wed, 04 Apr 2012 17:13:35 +0200
  
  mame (0.144-1) unstable; urgency=low
  
diff --combined debian/rules
index 2d53564,117c089..be88024
--- a/debian/rules
+++ b/debian/rules
@@@ -148,8 -148,7 +148,8 @@@ override_dh_auto_build
  override_dh_auto_clean:
  	echo "Starting clean process..."
  	$(MAKE) $(DEB_MAME_OPTS) clean
 -	[ ! -f default.mame.ini ] || rm default.mame.ini
 +	rm -rf obj
 +	rm -f default.mame.ini
  
  # dh_installchangelogs doesn't know about whatsnew.txt,
  # so we need to make an explicit call
@@@ -203,7 -202,7 +203,7 @@@ $(MAME_TARBALL): $(MAME_FILEBASE)s.zi
  	    | sed 's/\ /\\\ /g' \
  	    | xargs sed -i "s/\r$$//"
  	tar -C $(TMPDIR)/sub -cvf - $(MAME_PACKAGE)-$(VERSION) | \
- 	    xz > ../$(MAME_TARBALL)
+ 	    xz > $(MAME_TARBALL)
  	rm -f $(MAME_FILEBASE)s.zip
  
  	rm -rf $(TMPDIR)
@@@ -212,19 -211,18 +212,18 @@@
  NPLAYERS_PACKAGE = nplayers
  NPLAYERS_URL = http://nplayers.arcadebelgium.be/files/
  NPLAYERS_ZIPFILE = $(NPLAYERS_PACKAGE)$(UPSTREAM_VERSION).zip
- NPLAYERS_TARBALL = $(MAME_PACKAGE)_$(VERSION)-$(NPLAYERS_PACKAGE).orig.tar.xz
+ NPLAYERS_TARBALL = $(MAME_PACKAGE)_$(VERSION).orig-$(NPLAYERS_PACKAGE).tar.xz
  
  $(NPLAYERS_ZIPFILE):
  	wget -U '$(AGENT)' \
- 	    $(NPLAYERS_URL)$(NPLAYERS_ZIPFILE) \
- 	    -O $(NPLAYERS_ZIPFILE)
+ 	    $(NPLAYERS_URL)$(NPLAYERS_ZIPFILE)
  
  $(NPLAYERS_TARBALL): $(NPLAYERS_ZIPFILE)
  	mkdir $(TMPDIR)
  	unzip $(NPLAYERS_ZIPFILE) -d $(TMPDIR)/$(NPLAYERS_PACKAGE)
  	# Strip trailing CR
  	find $(TMPDIR)/$(NPLAYERS_PACKAGE) -type f | xargs sed -i "s/\r$$//"
- 	tar -C $(TMPDIR) -cvf - $(NPLAYERS_PACKAGE) | xz > ../$(NPLAYERS_TARBALL)
+ 	tar -C $(TMPDIR) -cvf - $(NPLAYERS_PACKAGE) | xz > $(NPLAYERS_TARBALL)
  	rm -f $(NPLAYERS_ZIPFILE)
  	rm -rf $(TMPDIR)
  

-- 
packaging for the mame arcade game emulator