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

[Cesare Falco]

The following commit has been merged in the master branch:
commit df1e4bebefb252356720541342014977dc70b6a0
Author: Cesare Falco <cesare.falco at gmail.com>
Date:   Fri Jun 10 00:19:10 2011 +0200

    Some reformatting and clean-up in various files

diff --git a/debian/control b/debian/control
index 6c42bc8..cb916e0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,14 @@ Uploaders: Félix Arreola Rodríguez <fgatuno.123 at gmail.com>,
            Emmanuel Kasper <emmanuel at libera.cc>,
            Ludovic Lechapt <ludomatic at gmail.com>,
            Jordi Mallach <jordi at debian.org>
-Build-Depends: debhelper (>= 8), libexpat1-dev, libsdl1.2-dev, zlib1g-dev, libxinerama-dev, libgconf2-dev, libgtk2.0-dev, libsdl-ttf2.0-dev
+Build-Depends: debhelper (>= 8),
+ libexpat1-dev,
+ libsdl1.2-dev,
+ libgconf2-dev,
+ libgtk2.0-dev,
+ libsdl-ttf2.0-dev,
+ libxinerama-dev,
+ zlib1g-dev
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-games/mame.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/mame.git
@@ -29,7 +36,6 @@ Description: Multiple Arcade Machine Emulator (MAME)
  illegal to use them if you do not own the arcade machine.
  .
  This package provides the MAME binary and configuration files.
- .
 
 Package: mame-tools
 Section: non-free/utils
@@ -51,6 +57,7 @@ Description: Tools for Multiple Arcade Machine Emulator (MAME)
   imgtool -- generic image manipulation tool for MESS
   jedutil -- binary to/from JEDEC file converter
   ldresample -- Laserdisc audio synchronizer and resampler
+  ldplayer -- Laserdisc dump player
   ldverify -- Laserdisc AVI/CHD verifier
   romcmp -- ROM comparison utility program
   testkeys -- keyboard code viewer
diff --git a/debian/mame-tools.install b/debian/mame-tools.install
index 9fd0204..9b404eb 100644
--- a/debian/mame-tools.install
+++ b/debian/mame-tools.install
@@ -1,8 +1,9 @@
-castool     usr/bin/
-chdman      usr/bin/
-imgtool     usr/bin/
-jedutil     usr/bin/
-ldresample  usr/bin/
-ldverify    usr/bin/
-romcmp      usr/bin/
-testkeys    usr/bin/
+castool usr/bin/
+chdman usr/bin/
+imgtool usr/bin/
+jedutil usr/bin/
+ldplayer usr/bin/
+ldresample usr/bin/
+ldverify usr/bin/
+romcmp usr/bin/
+testkeys usr/bin/
diff --git a/debian/mame-tools.manpages b/debian/mame-tools.manpages
index 9b60680..3347e77 100644
--- a/debian/mame-tools.manpages
+++ b/debian/mame-tools.manpages
@@ -1,10 +1,9 @@
+debian/man/castool.1
+debian/man/imgtool.1
+debian/man/ldresample.1
 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
-
-debian/man/castool.1
-debian/man/imgtool.1
-debian/man/ldresample.1
diff --git a/debian/mame.docs b/debian/mame.docs
index 8d9501e..a188e06 100644
--- a/debian/mame.docs
+++ b/debian/mame.docs
@@ -1,2 +1 @@
 docs/*
-
diff --git a/debian/mame.install b/debian/mame.install
index ef769b7..f288c62 100644
--- a/debian/mame.install
+++ b/debian/mame.install
@@ -1,10 +1,6 @@
-mame				usr/games
-
-src/osd/sdl/keymaps		usr/share/games/mame
-
-debian/install/mame.xpm		usr/share/pixmaps
-debian/install/mame.desktop	usr/share/applications
-
-debian/mame.ini			etc/mame
-
-hash.mame/*	usr/share/games/mame/hash
+mame usr/games
+debian/install/mame.xpm usr/share/pixmaps
+debian/install/mame.desktop usr/share/applications
+debian/mame.ini etc/mame
+hash/* usr/share/games/mame/hash
+src/osd/sdl/keymaps/*.txt usr/share/games/mame/keymaps
diff --git a/debian/mess.install b/debian/mess.install
index 98c7553..55fb183 100644
--- a/debian/mess.install
+++ b/debian/mess.install
@@ -1,8 +1,6 @@
-mess				usr/games
-
-src/osd/sdl/keymaps		usr/share/games/mess
-
-debian/mess.ini			etc/mess
-
-messdir/artwork			usr/share/games/mess
-messdir/hash/*			usr/share/games/mess/hash
+mess usr/games
+debian/mess.ini etc/mess
+messdir/artwork/* usr/share/games/mess/artwork
+messdir/hash/* usr/share/games/mess/hash
+messdir/sysinfo.dat usr/share/games/mess
+src/osd/sdl/keymaps/*.txt usr/share/games/mess/keymaps
diff --git a/debian/rules b/debian/rules
index 17f9bcf..0658e70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -195,14 +195,14 @@ TMPDIR := $(shell mktemp --dry-run --directory -p .)
 UPSTREAM_VERSION := $(shell echo $(VERSION) | sed -e 's/\.//' )
 
 $(MAME_FILEBASE)s.zip:
-	wget -U '$(AGENT)' "$(MAME_URL)\
-	$(MAME_PACKAGE)$(UPSTREAM_VERSION)s.zip" \
-	-O $(MAME_FILEBASE)s.zip
+	wget -U '$(AGENT)' \
+        "$(MAME_URL)$(MAME_PACKAGE)$(UPSTREAM_VERSION)s.zip" \
+        -O $(MAME_FILEBASE)s.zip
 
 $(MESS_FILEBASE)s.zip:
-	wget -U '$(AGENT)' "$(MESS_URL)\
-	$(MESS_PACKAGE)$(UPSTREAM_VERSION)s.zip" \
-	-O $(MESS_FILEBASE)s.zip
+	wget -U '$(AGENT)' \
+        "$(MESS_URL)$(MESS_PACKAGE)$(UPSTREAM_VERSION)s.zip" \
+        -O $(MESS_FILEBASE)s.zip
 
 get-orig-source: $(MAME_FILEBASE)s.zip $(MESS_FILEBASE)s.zip
 	mkdir $(TMPDIR)
@@ -220,7 +220,7 @@ get-orig-source: $(MAME_FILEBASE)s.zip $(MESS_FILEBASE)s.zip
 	    | xargs sed -i "s/\r$$//"
 	tar -C $(TMPDIR)/sub -cvf - $(MAME_PACKAGE)-$(VERSION) | \
 	    bzip2 -c9  > ../$(MAME_PACKAGE)_$(VERSION).orig.tar.bz2
-	rm $(MAME_FILEBASE)s.zip
+	rm -f $(MAME_FILEBASE)s.zip
 
 	# Create an orig-mess.tar.bz2 component tarball for MESS
 	mkdir -p $(TMPDIR)/$(MESS_PACKAGE)-$(VERSION)
@@ -232,6 +232,6 @@ get-orig-source: $(MAME_FILEBASE)s.zip $(MESS_FILEBASE)s.zip
 	    | xargs sed -i "s/\r$$//"
 	tar -C $(TMPDIR) -cvf - $(MESS_PACKAGE)-$(VERSION) | \
 	    bzip2 -c9  > ../$(MAME_PACKAGE)_$(VERSION).orig-$(MESS_PACKAGE).tar.bz2
-	rm $(MESS_FILEBASE)s.zip
+	rm -f $(MESS_FILEBASE)s.zip
 
-	rm -r $(TMPDIR)
+	rm -rf $(TMPDIR)

-- 
packaging for the mame arcade game emulator