r7755 - in packages/trunk/game-data-packager: . debian

Jon Dowland jmtd-guest at alioth.debian.org
Thu Jul 17 20:48:59 UTC 2008


Author: jmtd-guest
Date: 2008-07-17 20:48:59 +0000 (Thu, 17 Jul 2008)
New Revision: 7755

Added:
   packages/trunk/game-data-packager/doom.mk
   packages/trunk/game-data-packager/doom2.mk
Modified:
   packages/trunk/game-data-packager/Makefile
   packages/trunk/game-data-packager/debian/rules
Log:
split up Makefile into Makefile;doom.mk;doom2.mk

Modified: packages/trunk/game-data-packager/Makefile
===================================================================
--- packages/trunk/game-data-packager/Makefile	2008-07-17 20:45:14 UTC (rev 7754)
+++ packages/trunk/game-data-packager/Makefile	2008-07-17 20:48:59 UTC (rev 7755)
@@ -1,60 +1,13 @@
-DOOM2DEB=doom2-wad_$(VERSION)_all.deb
+VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2-)
+
 DOOMDEB=doom-wad_$(VERSION)_all.deb
+DOOM2DEB=doom2-wad_$(VERSION)_all.deb
 
-# general targets ############################################################
-
 default: $(DOOM2DEB) $(DOOMDEB)
 
-# necessary as dpkg-source will honour the shell's umask
-fixperms: fixperms_doom2 fixperms_doom
-clean:    clean_doom2 clean_doom
+include doom.mk
+include doom2.mk
 
-.PHONY: clean doom2-wad/DEBIAN/md5sums fixperms
+clean: clean_doom2 clean_doom
 
-# DOOM2 stuff ################################################################
-
-$(DOOM2DEB): doom2-wad/DEBIAN/md5sums fixperms
-	if [ `id -u` -eq 0 ]; then \
-		dpkg-deb -b doom2-wad $@ ; \
-	else \
-		fakeroot dpkg-deb -b doom2-wad $@; \
-	fi
-
-doom2-wad/DEBIAN/md5sums:
-	cd doom2-wad && find usr/ -type f -print0 |\
-		xargs -0 md5sum >DEBIAN/md5sums
-
-fixperms_doom2:
-	find doom2-wad -type f -print0 | xargs -0 chmod 644
-	find doom2-wad -type d -print0 | xargs -0 chmod 755
-	chmod 755 doom2-wad/DEBIAN/postinst
-	chmod 755 doom2-wad/DEBIAN/prerm
-
-install_doom2:
-
-clean_doom2:
-	rm -f $(DOOM2DEB) doom2-wad/DEBIAN/md5sums
-
-# DOOM stuff ################################################################
-
-$(DOOMDEB): doom-wad/DEBIAN/md5sums fixperms
-	if [ `id -u` -eq 0 ]; then \
-		dpkg-deb -b doom-wad $@ ; \
-	else \
-		fakeroot dpkg-deb -b doom-wad $@; \
-	fi
-
-doom-wad/DEBIAN/md5sums:
-	cd doom-wad && find usr/ -type f -print0 |\
-		xargs -0 md5sum >DEBIAN/md5sums
-
-fixperms_doom:
-	find doom-wad -type f -print0 | xargs -0 chmod 644
-	find doom-wad -type d -print0 | xargs -0 chmod 755
-	chmod 755 doom-wad/DEBIAN/postinst
-	chmod 755 doom-wad/DEBIAN/prerm
-
-install_doom:
-
-clean_doom:
-	rm -f $(DOOMDEB) doom-wad/DEBIAN/md5sums
+.PHONY: default clean fixperms

Modified: packages/trunk/game-data-packager/debian/rules
===================================================================
--- packages/trunk/game-data-packager/debian/rules	2008-07-17 20:45:14 UTC (rev 7754)
+++ packages/trunk/game-data-packager/debian/rules	2008-07-17 20:48:59 UTC (rev 7755)
@@ -9,23 +9,9 @@
 	dh_testdir
 	touch configure-stamp
 
-doom-wad/DEBIAN/control:
-	cp doom-wad/DEBIAN/control.in doom-wad/DEBIAN/control
-	echo Version: $(VERSION) >> doom-wad/DEBIAN/control
-
-doom2-wad/DEBIAN/control:
-	cp doom2-wad/DEBIAN/control.in doom2-wad/DEBIAN/control
-	echo Version: $(VERSION) >> doom2-wad/DEBIAN/control
-
 build: configure-stamp build-stamp
-build-stamp: doom-wad/DEBIAN/control doom2-wad/DEBIAN/control
+build-stamp:
 	dh_testdir
-	# we build .debs as that are shipped in the binary
-	# package. Insert our changelog into them
-	gzip -c9 debian/changelog > doom-wad/usr/share/doc/doom-wad/changelog.gz
-	gzip -c9 debian/changelog > doom2-wad/usr/share/doc/doom2-wad/changelog.gz
-	cp -p doom-common/doom2.xpm doom2-wad/usr/share/pixmaps
-	cp -p doom-common/doom2.xpm doom-wad/usr/share/pixmaps/doom.xpm
 	$(MAKE) VERSION=$(VERSION)
 	touch build-stamp
 
@@ -34,12 +20,6 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	$(MAKE) clean VERSION=$(VERSION)
-	rm -f doom-wad/usr/share/doc/doom-wad/changelog.gz \
-		doom2-wad/usr/share/doc/doom2-wad/changelog.gz \
-		doom2-wad/usr/share/pixmaps/doom2.xpm \
-		doom-wad/usr/share/pixmaps/doom.xpm \
-		doom-wad/DEBIAN/control \
-		doom2-wad/DEBIAN/control
 	dh_clean
 
 install: build

Added: packages/trunk/game-data-packager/doom.mk
===================================================================
--- packages/trunk/game-data-packager/doom.mk	                        (rev 0)
+++ packages/trunk/game-data-packager/doom.mk	2008-07-17 20:48:59 UTC (rev 7755)
@@ -0,0 +1,31 @@
+DOOMTARGETS := doom-wad/DEBIAN/md5sums doom-wad/DEBIAN/control doom-wad/usr/share/doc/doom-wad/changelog.gz doom-wad/usr/share/pixmaps/doom.xpm
+
+$(DOOMDEB): $(DOOMTARGETS) fixperms 
+	if [ `id -u` -eq 0 ]; then \
+		dpkg-deb -b doom-wad $@ ; \
+	else \
+		fakeroot dpkg-deb -b doom-wad $@; \
+	fi
+
+doom-wad/DEBIAN/control:
+	cp doom-wad/DEBIAN/control.in doom-wad/DEBIAN/control
+	echo Version: $(VERSION) >> doom-wad/DEBIAN/control
+
+doom-wad/usr/share/doc/doom-wad/changelog.gz:
+	gzip -c9 debian/changelog > doom-wad/usr/share/doc/doom-wad/changelog.gz
+
+doom-wad/usr/share/pixmaps/doom.xpm:
+	cp -p doom-common/doom2.xpm doom-wad/usr/share/pixmaps/doom.xpm
+
+doom-wad/DEBIAN/md5sums:
+	cd doom-wad && find usr/ -type f -print0 |\
+		xargs -r0 md5sum >DEBIAN/md5sums
+
+fixperms_doom:
+	find doom-wad -type f -print0 | xargs -r0 chmod 644
+	find doom-wad -type d -print0 | xargs -r0 chmod 755
+	chmod 755 doom-wad/DEBIAN/postinst
+	chmod 755 doom-wad/DEBIAN/prerm
+
+clean_doom:
+	rm -f $(DOOMDEB) $(DOOMTARGETS)

Added: packages/trunk/game-data-packager/doom2.mk
===================================================================
--- packages/trunk/game-data-packager/doom2.mk	                        (rev 0)
+++ packages/trunk/game-data-packager/doom2.mk	2008-07-17 20:48:59 UTC (rev 7755)
@@ -0,0 +1,31 @@
+DOOM2TARGETS := doom2-wad/DEBIAN/md5sums doom2-wad/DEBIAN/control doom2-wad/usr/share/doc/doom2-wad/changelog.gz doom2-wad/usr/share/pixmaps/doom2.xpm
+
+$(DOOM2DEB): $(DOOM2TARGETS) fixperms 
+	if [ `id -u` -eq 0 ]; then \
+		dpkg-deb -b doom2-wad $@ ; \
+	else \
+		fakeroot dpkg-deb -b doom2-wad $@; \
+	fi
+
+doom2-wad/DEBIAN/control:
+	cp doom2-wad/DEBIAN/control.in doom2-wad/DEBIAN/control
+	echo Version: $(VERSION) >> doom2-wad/DEBIAN/control
+
+doom2-wad/usr/share/doc/doom2-wad/changelog.gz:
+	gzip -c9 debian/changelog > doom2-wad/usr/share/doc/doom2-wad/changelog.gz
+
+doom2-wad/usr/share/pixmaps/doom2.xpm:
+	cp -p doom-common/doom2.xpm doom2-wad/usr/share/pixmaps/doom2.xpm
+
+doom2-wad/DEBIAN/md5sums:
+	cd doom2-wad && find usr/ -type f -print0 |\
+		xargs -r0 md5sum >DEBIAN/md5sums
+
+fixperms_doom2:
+	find doom2-wad -type f -print0 | xargs -r0 chmod 644
+	find doom2-wad -type d -print0 | xargs -r0 chmod 755
+	chmod 755 doom2-wad/DEBIAN/postinst
+	chmod 755 doom2-wad/DEBIAN/prerm
+
+clean_doom2:
+	rm -f $(DOOM2DEB) $(DOOM2TARGETS)




More information about the Pkg-games-commits mailing list