The following commit has been merged in the master branch: commit be3b2b5fdec37a0df1ba10bd7b4bfd73a7b4e08c Author: Emmanuel Kasper <emman...@libera.cc> Date: Thu Dec 1 14:45:59 2011 +0100
unmerge mess-only branch diff --git a/.gitignore b/.gitignore index 105857f..179be2c 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,3 @@ mame_0.139.orig.tar.gz mame_0.141.orig.tar.bz2 .pc hash/ -keymaps/ -sysinfo.dat diff --git a/debian/changelog b/debian/changelog index 3e7af17..4af7c8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,8 @@ -mess (0.144-1) UNRELEASED; urgency=low +mame (0.144-1) UNRELEASED; urgency=low - * New upstream release, switching to mess.org zipfile as upstream - tarball + * New upstream release, handling of mess commented out - -- Emmanuel Kasper <emman...@libera.cc> Sun, 20 Nov 2011 12:02:16 +0100 + -- Emmanuel Kasper <emman...@libera.cc> Sun, 20 Nov 2011 23:44:36 +0100 mame (0.143-4) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 741a4b7..e83598b 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: mess +Source: mame Section: non-free/games Priority: optional Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 8), 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 -Homepage: http://mess.org/ +Homepage: http://mamedev.org/ XS-Autobuild: yes Package: mame diff --git a/debian/copyright b/debian/copyright index c7732d1..a2d4702 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=208&view=co +Format-Specification: http://dep.debian.net/deps/dep5/ Upstream-Name: MAME Source: http://mamedev.org and http://mess.redump.net. The mess source code is a source code layer which is added to the mame source code for building. The mame icons are part of the hydroxygen icon set, downloaded from diff --git a/debian/mame.dirs b/debian/mame.dirs index 7795c14..197a73b 100644 --- a/debian/mame.dirs +++ b/debian/mame.dirs @@ -2,6 +2,6 @@ usr/share/games/mame/artwork usr/share/games/mame/cheat usr/share/games/mame/crosshair usr/share/games/mame/ctrlr -#usr/share/games/mame/hash +usr/share/games/mame/hash usr/share/games/mame/roms usr/share/games/mame/samples diff --git a/debian/mess-data.install b/debian/mess-data.install index 35b15c6..ee3b3b2 100644 --- a/debian/mess-data.install +++ b/debian/mess-data.install @@ -1,4 +1,4 @@ -artwork/* usr/share/games/mess/artwork -hash/* usr/share/games/mess/hash -sysinfo.dat usr/share/games/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 15fb69c..8a2e00b 100755 --- a/debian/rules +++ b/debian/rules @@ -152,7 +152,7 @@ override_dh_auto_clean: # so we need to make an explicit call override_dh_installchangelogs: dh_installchangelogs whatsnew.txt - dh_installchangelogs -pmess docs/messnew.txt + dh_installchangelogs -pmess messdir/docs/messnew.txt # Remove Windows specific documentation override_dh_installdocs: @@ -162,31 +162,56 @@ override_dh_installdocs: # Remove OSX specific keymaps override_dh_install: + # some data files created on windows show up as executables: fix it + chmod 644 messdir/hash/* dh_install --exclude=OSX.txt # Convert upstream sources from zip to tar.bz2 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') - +MAME_PACKAGE = mame +MAME_FILEBASE = $(MAME_PACKAGE)$(VERSION) +MAME_URL = http://mamedev.org/downloader.php?file=releases/ MESS_PACKAGE = mess MESS_FILEBASE = $(MESS_PACKAGE)$(VERSION) MESS_URL = http://mess.redump.net/_media/downloads: -AGENT = Debian MAME/MESS Packagers <m...@packages.debian.org> +AGENT = Debian MAME Packagers <m...@packages.debian.org> TMPDIR := $(shell mktemp --dry-run --directory -p .) # Upstream zip file does not have a dot in its name, so we have to cut it out 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 + $(MESS_FILEBASE)s.zip: wget -U '$(AGENT)' \ "$(MESS_URL)$(MESS_PACKAGE)$(UPSTREAM_VERSION)s.zip" \ -O $(MESS_FILEBASE)s.zip -get-orig-source: $(MESS_FILEBASE)s.zip +get-orig-source: $(MAME_FILEBASE)s.zip $(MESS_FILEBASE)s.zip mkdir $(TMPDIR) - # Create an orig.tar.bz2 tarball for MESS + # Create an orig.tar.bz2 tarball for MAME + unzip $(MAME_FILEBASE)s.zip -d $(TMPDIR) + mkdir -p $(TMPDIR)/sub/$(MAME_PACKAGE)-$(VERSION) + # Not a bug: Mame source needs to be unzipped twice + unzip $(TMPDIR)/$(MAME_PACKAGE).zip \ + -d $(TMPDIR)/sub/$(MAME_PACKAGE)-$(VERSION) + # Strip trailing CR + find $(TMPDIR)/sub/$(MAME_PACKAGE)-$(VERSION) \ + -type f -regextype posix-egrep \ + ! -regex ".*(zip|gif|png|bmp|ico)" \ + | sed 's/\ /\\\ /g' \ + | xargs sed -i "s/\r$$//" + tar -C $(TMPDIR)/sub -cvf - $(MAME_PACKAGE)-$(VERSION) | \ + bzip2 -c9 > ../$(MAME_PACKAGE)_$(VERSION).orig.tar.bz2 + rm -f $(MAME_FILEBASE)s.zip + + # Create an orig-mess.tar.bz2 component tarball for MESS mkdir -p $(TMPDIR)/$(MESS_PACKAGE)-$(VERSION) unzip $(MESS_FILEBASE)s.zip -d $(TMPDIR)/$(MESS_PACKAGE)-$(VERSION) # Strip trailing CR @@ -196,7 +221,7 @@ get-orig-source: $(MESS_FILEBASE)s.zip | sed 's/\ /\\\ /g' \ | xargs sed -i "s/\r$$//" tar -C $(TMPDIR) -cvf - $(MESS_PACKAGE)-$(VERSION) | \ - bzip2 -c9 > ../$(MESS_PACKAGE)_$(VERSION).orig.tar.bz2 + bzip2 -c9 > ../$(MAME_PACKAGE)_$(VERSION).orig-$(MESS_PACKAGE).tar.bz2 rm -f $(MESS_FILEBASE)s.zip rm -rf $(TMPDIR) -- packaging for the mame arcade game emulator _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits