[game-data-packager] 01/01: doom2 masterlevels: Cacodemon got MIA, put it back

[Alexandre Detiste]

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

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

commit d3e03af35f5a0b0a2be0f0863d28bbab4a26a966
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sat Jan 2 15:39:25 2016 +0100

    doom2 masterlevels: Cacodemon got MIA, put it back
    
    make it sure icon is there even if only the launcher is installed
    but both GDP & .wad package are not installed
---
 Makefile                           | 2 ++
 runtime/doom2-masterlevels.desktop | 2 +-
 runtime/doom2-masterlevels.py      | 8 +++++---
 tools/game-data-packager.spec      | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 02c17a4..f214eab 100644
--- a/Makefile
+++ b/Makefile
@@ -142,9 +142,11 @@ install: default
 	install -m0644 etc/*-mirrors                           $(DESTDIR)/etc/game-data-packager/
 
 	mkdir -p $(DESTDIR)/usr/share/applications
+	mkdir -p $(DESTDIR)/usr/share/pixmaps
 	install -m0755 runtime/doom2-masterlevels.py           $(DESTDIR)$(bindir)/doom2-masterlevels
 	install -m0644 runtime/doom2-masterlevels.desktop      $(DESTDIR)/usr/share/applications/
 	install -m0644 doc/doom2-masterlevels.6                $(DESTDIR)/usr/share/man/man6/
+	install -m0644 out/doom-common.png                     $(DESTDIR)/usr/share/pixmaps/doom2-masterlevels.png
 
 # Requires additional setup, so not part of "make check"
 manual-check:
diff --git a/runtime/doom2-masterlevels.desktop b/runtime/doom2-masterlevels.desktop
index 094432f..3cbf41b 100644
--- a/runtime/doom2-masterlevels.desktop
+++ b/runtime/doom2-masterlevels.desktop
@@ -3,7 +3,7 @@ Name=Doom 2: Master Levels
 GenericName=First Person Shooter Game
 Exec=doom2-masterlevels
 TryExec=/usr/share/games/doom/doom2-masterlevels-tryexec
-Icon=doom2
+Icon=doom2-masterlevels
 Terminal=false
 Type=Application
 Categories=Game;
diff --git a/runtime/doom2-masterlevels.py b/runtime/doom2-masterlevels.py
index 2b9f7a1..eed74bd 100755
--- a/runtime/doom2-masterlevels.py
+++ b/runtime/doom2-masterlevels.py
@@ -32,6 +32,8 @@ def which(exe):
 
     return None
 
+CACODEMON = '/usr/share/pixmaps/doom2-masterlevels.png'
+
 if os.path.isdir('/usr/share/doom'):
     DIR = '/usr/share/doom'
 else:
@@ -116,8 +118,8 @@ class Launcher:
 
         self.window = Gtk.Window()
         self.window.set_default_size(1020, 650)
-        if os.path.isfile('/usr/share/pixmaps/doom2.png'):
-            self.window.set_icon_from_file('/usr/share/pixmaps/doom2.png')
+        if os.path.isfile(CACODEMON):
+            self.window.set_icon_from_file(CACODEMON)
         self.window.connect("delete_event", Gtk.main_quit)
 
         grid = Gtk.Grid()
@@ -156,7 +158,7 @@ class Launcher:
         grid.attach(label, 1, 0, 1, 1)
 
         logo = Gtk.Image()
-        logo.set_from_file('/usr/share/pixmaps/doom2.png')
+        logo.set_from_file(CACODEMON)
         grid.attach(logo, 2, 0, 1, 1)
 
         # description
diff --git a/tools/game-data-packager.spec b/tools/game-data-packager.spec
index 449de80..6cef900 100644
--- a/tools/game-data-packager.spec
+++ b/tools/game-data-packager.spec
@@ -99,6 +99,7 @@ find $RPM_BUILD_ROOT/etc/game-data-packager -empty -exec sh -c "echo '# we need
 %{_mandir}/man6/doom2-masterlevels.*
 /usr/bin/doom2-masterlevels
 /usr/share/applications/doom2-masterlevels.desktop
+/usr/share/pixmaps/doom2-masterlevels.png
 %license COPYING
 
 %changelog

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