r7763 - in packages/trunk/game-data-packager: ! dirs' list truncated !

[Jon Dowland]

Author: jmtd-guest
Date: 2008-07-18 00:07:40 +0000 (Fri, 18 Jul 2008)
New Revision: 7763

Added:
   packages/trunk/game-data-packager/doom-common/usr/
   packages/trunk/game-data-packager/doom-common/usr/share/
   packages/trunk/game-data-packager/doom-common/usr/share/applications/
   packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-wad.desktop.in
Removed:
   packages/trunk/game-data-packager/doom-wad/usr/share/applications/doom-wad.desktop
   packages/trunk/game-data-packager/doom2-wad/usr/share/applications/doom2-wad.desktop
Modified:
   packages/trunk/game-data-packager/Makefile
   packages/trunk/game-data-packager/doom-common.mk
Log:
generalize desktop file

Modified: packages/trunk/game-data-packager/Makefile
===================================================================
--- packages/trunk/game-data-packager/Makefile	2008-07-17 23:47:55 UTC (rev 7762)
+++ packages/trunk/game-data-packager/Makefile	2008-07-18 00:07:40 UTC (rev 7763)
@@ -1,11 +1,11 @@
 VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2-)
 
 default:
-	make -f doom-common.mk IWAD=doom VERSION=$(VERSION)
-	make -f doom-common.mk IWAD=doom2 VERSION=$(VERSION)
+	make -f doom-common.mk IWAD=doom  LONG="Doom"   VERSION=$(VERSION)
+	make -f doom-common.mk IWAD=doom2 LONG="Doom 2" VERSION=$(VERSION)
 
 clean:
-	make -f doom-common.mk IWAD=doom VERSION=$(VERSION) clean
-	make -f doom-common.mk IWAD=doom2 VERSION=$(VERSION) clean
+	make -f doom-common.mk IWAD=doom  LONG="Doom"   VERSION=$(VERSION) clean
+	make -f doom-common.mk IWAD=doom2 LONG="Doom 2" VERSION=$(VERSION) clean
 
 .PHONY: default clean

Added: packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-wad.desktop.in
===================================================================
--- packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-wad.desktop.in	                        (rev 0)
+++ packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-wad.desktop.in	2008-07-18 00:07:40 UTC (rev 7763)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=GAME
+GenericName=LONG
+Comment=First Person Shooter Game
+Exec=doom -iwad /usr/share/games/game-data-packager/GAME.wad
+Icon=GAME.xpm
+Terminal=false
+Type=Application
+Categories=Game

Modified: packages/trunk/game-data-packager/doom-common.mk
===================================================================
--- packages/trunk/game-data-packager/doom-common.mk	2008-07-17 23:47:55 UTC (rev 7762)
+++ packages/trunk/game-data-packager/doom-common.mk	2008-07-18 00:07:40 UTC (rev 7763)
@@ -3,7 +3,7 @@
 
 $(IWAD)DEB=$(IWAD)-wad_$(VERSION)_all.deb
 
-$(IWAD)TARGETS := $(IWAD)-wad/DEBIAN/md5sums $(IWAD)-wad/DEBIAN/control $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz $(IWAD)-wad/usr/share/pixmaps/$(IWAD).xpm $(IWAD)-wad/DEBIAN/postinst $(IWAD)-wad/DEBIAN/prerm
+$(IWAD)TARGETS := $(IWAD)-wad/DEBIAN/md5sums $(IWAD)-wad/DEBIAN/control $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz $(IWAD)-wad/usr/share/pixmaps/$(IWAD).xpm $(IWAD)-wad/DEBIAN/postinst $(IWAD)-wad/DEBIAN/prerm $(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop
 
 $($(IWAD)DEB): $($(IWAD)TARGETS) fixperms 
 	if [ `id -u` -eq 0 ]; then \
@@ -12,6 +12,11 @@
 		fakeroot dpkg-deb -b $(IWAD)-wad $@; \
 	fi
 
+$(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop:
+	m4 -DGAME=$(IWAD) -DLONG="$(LONG)" \
+		doom-common/usr/share/applications/doom-wad.desktop.in \
+	> $(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop
+
 $(IWAD)-wad/DEBIAN/prerm:
 	m4 -DIWAD=$(IWAD).wad \
 		doom-common/DEBIAN/prerm.in > $(IWAD)-wad/DEBIAN/prerm

Deleted: packages/trunk/game-data-packager/doom-wad/usr/share/applications/doom-wad.desktop
===================================================================
--- packages/trunk/game-data-packager/doom-wad/usr/share/applications/doom-wad.desktop	2008-07-17 23:47:55 UTC (rev 7762)
+++ packages/trunk/game-data-packager/doom-wad/usr/share/applications/doom-wad.desktop	2008-07-18 00:07:40 UTC (rev 7763)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Doom
-GenericName=Doom
-Comment=First Person Shooter Game
-Exec=doom -iwad /usr/share/games/game-data-packager/doom.wad
-Icon=doom.xpm
-Terminal=false
-Type=Application
-Categories=Game

Deleted: packages/trunk/game-data-packager/doom2-wad/usr/share/applications/doom2-wad.desktop
===================================================================
--- packages/trunk/game-data-packager/doom2-wad/usr/share/applications/doom2-wad.desktop	2008-07-17 23:47:55 UTC (rev 7762)
+++ packages/trunk/game-data-packager/doom2-wad/usr/share/applications/doom2-wad.desktop	2008-07-18 00:07:40 UTC (rev 7763)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Doom 2
-GenericName=Doom 2: Hell on Earth
-Comment=First Person Shooter Game
-Exec=doom -iwad /usr/share/games/game-data-packager/doom2.wad
-Icon=doom2.xpm
-Terminal=false
-Type=Application
-Categories=Game