[game-data-packager] 18/20: Install PNG icons in Doom packages

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit 56cc2de76e6c999d19eb879800bda6dbfd8495ee
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 12 00:30:18 2015 +0000

    Install PNG icons in Doom packages
---
 Makefile                                    | 7 +++++--
 data/doom-common.desktop.in                 | 2 +-
 data/hexen-deathkings-data.desktop.in       | 2 +-
 debian/control                              | 1 +
 lib/game_data_packager/games/doom_common.py | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index b7c329b..deba3f4 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,10 @@ default: $(DIRS)
 	install -m644 data/*.desktop.in out/
 	install -m644 data/*.preinst.in out/
 	install -m644 data/*.README.Debian.in out/
-	install -m644 data/*.xpm out/
+	for x in data/*.xpm; do \
+		o=out/$${x#data/}; \
+		convert $$x $${o%.xpm}.png || exit $$?; \
+	done
 	make -f quake.mk LONG="Quake" VERSION=$(VERSION) PACKAGE=quake-registered \
 		FOLDER=id1
 	make -f quake.mk LONG="Quake music" VERSION=$(VERSION) \
@@ -52,7 +55,7 @@ clean:
 	rm -f ./out/*.desktop.in
 	rm -f ./out/*.preinst.in
 	rm -f ./out/*.README.Debian.in
-	rm -f ./out/*.xpm
+	rm -f ./out/*.png
 	rm -f ./out/*.yaml
 	rm -rf lib/game_data_packager/__pycache__
 	make -f quake.mk LONG="Quake" VERSION=$(VERSION) PACKAGE=quake-registered \
diff --git a/data/doom-common.desktop.in b/data/doom-common.desktop.in
index b0eebfd..bc98c00 100644
--- a/data/doom-common.desktop.in
+++ b/data/doom-common.desktop.in
@@ -3,7 +3,7 @@ Name=LONG
 GenericName=First Person Shooter Game
 TryExec=ENGINE
 Exec=ENGINE -iwad /usr/share/games/ENGINE/GAME.wad
-Icon=GAME.xpm
+Icon=GAME.png
 Terminal=false
 Type=Application
 Categories=Game
diff --git a/data/hexen-deathkings-data.desktop.in b/data/hexen-deathkings-data.desktop.in
index 8af839d..7079532 100644
--- a/data/hexen-deathkings-data.desktop.in
+++ b/data/hexen-deathkings-data.desktop.in
@@ -3,7 +3,7 @@ Name=Hexen: Deathkings of the Dark Citadel
 GenericName=First Person Shooter Game
 TryExec=ENGINE
 Exec=ENGINE -iwad /usr/share/games/ENGINE/hexen.wad -file /usr/share/games/ENGINE/GAME.wad
-Icon=GAME.xpm
+Icon=GAME.png
 Terminal=false
 Type=Application
 Categories=Game
diff --git a/debian/control b/debian/control
index b825bd2..c76120e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
  debhelper (>= 9),
  dh-python,
  fakeroot,
+ imagemagick,
  libdynamite-dev,
  m4,
  pyflakes,
diff --git a/lib/game_data_packager/games/doom_common.py b/lib/game_data_packager/games/doom_common.py
index 7d54f13..7999e9b 100644
--- a/lib/game_data_packager/games/doom_common.py
+++ b/lib/game_data_packager/games/doom_common.py
@@ -105,8 +105,8 @@ class DoomGameData(GameData):
             mkdir_p(pixdir)
             # FIXME: would be nice if non-Doom games could replace this
             # Cacodemon with something appropriate
-            install_data(os.path.join(DATADIR, 'doom2.xpm'),
-                    os.path.join(pixdir, '%s.xpm' % wad_base))
+            install_data(os.path.join(DATADIR, 'doom2.png'),
+                    os.path.join(pixdir, '%s.png' % wad_base))
 
             docdir = os.path.join(destdir, 'usr/share/doc/%s' % package.name)
             mkdir_p(docdir)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git