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

[Jordi Mallach]

The following commit has been merged in the master branch:
commit ca24b922625787e21370d1e778101e54ccacdee2
Author: Jordi Mallach <jordi at debian.org>
Date:   Thu May 12 16:59:36 2011 +0200

    Modify get-orig-source to also fetch MESS sources and build a new dpkg source component tarball.

diff --git a/debian/changelog b/debian/changelog
index 7980006..b401d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ mame (0.142-2) UNRELEASED; urgency=low
     alignment issues: amd64, i386, kfreebsd-amd64, kfreebsd-i386, powerpc,
     s390.
   * Add variables in an attempt to fix s390 builds.
+  * Modify get-orig-source to also fetch MESS sources and build a new
+    dpkg source component tarball.
 
- -- Jordi Mallach <jordi at debian.org>  Thu, 12 May 2011 16:27:42 +0200
+ -- Jordi Mallach <jordi at debian.org>  Thu, 12 May 2011 16:37:27 +0200
 
 mame (0.142-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index e850954..edc6ff9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,28 +119,48 @@ clean:
 	$(MAKE) $(DEB_MAME_OPTS) clean
 
 # Convert upstream sources from zip to tar.bz2
-PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
-
-FILEBASE = $(PACKAGE)$(VERSION)
-URL = http://mamedev.org/downloader.php?file=releases/
-AGENT = Debian package mame at packages.qa.debian.org
+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 Packagers <mame at 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/\.//' )
 
-fetch_upstream:
-	wget -U '$(AGENT)' "$(URL)\
-	$(PACKAGE)$(UPSTREAM_VERSION)s.zip" \
-	-O $(FILEBASE)s.zip
+$(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: fetch_upstream
+get-orig-source: $(MAME_FILEBASE)s.zip $(MESS_FILEBASE)s.zip
 	mkdir $(TMPDIR)
-	unzip $(FILEBASE)s.zip -d $(TMPDIR)
-	mkdir -p $(TMPDIR)/sub/$(PACKAGE)-$(VERSION)
-# Not a bug: Mame source needs to be unzipped twice
-	unzip $(TMPDIR)/$(PACKAGE).zip -d $(TMPDIR)/sub/$(PACKAGE)-$(VERSION)
-	tar -C $(TMPDIR)/sub -cvf - . | bzip2 -c9  > ../$(PACKAGE)_$(VERSION).orig.tar.bz2
+
+	# 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)
+	tar -C $(TMPDIR)/sub -cvf - $(MAME_PACKAGE)-$(VERSION) | \
+	  bzip2 -c9  > ../$(MAME_PACKAGE)_$(VERSION).orig.tar.bz2
+	rm $(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)
+	tar -C $(TMPDIR) -cvf - $(MESS_PACKAGE)-$(VERSION) | \
+	  bzip2 -c9  > ../$(MAME_PACKAGE)_$(VERSION).orig-$(MESS_PACKAGE).tar.bz2
+	rm $(MESS_FILEBASE)s.zip
+
 	rm -r $(TMPDIR)
-	rm -r $(FILEBASE)s.zip

-- 
packaging for the mame arcade game emulator