Bug#731838: colobot: missing menu file Jessie Release Goal

[Didier 'OdyX' Raboud]

Control: tags -1 +pending

Le mardi, 10 décembre 2013, 11.37:44 Markus Koschany a écrit :
> colobot does not supply a menu file hence the game is not well
> integrated into the user's desktop environment. Please add an icon
> entry to your menu file too.

Indeed; thanks for the report. I have committed the attached patch.

Cheers, OdyX
-------------- next part --------------
>From a59d1606c3592fad39194c0bc6b49e555acf9f6f Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx at debian.org>
Date: Tue, 17 Dec 2013 13:49:01 +0100
Subject: [PATCH] Add menu file and xpm icon

Therefore add imagemagick to Build-Depends to convert the icon from the 32x32 png

Closes: #731838
---
 debian/colobot.install | 1 +
 debian/colobot.menu    | 6 ++++++
 debian/control         | 3 ++-
 debian/rules           | 6 ++++++
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 debian/colobot.menu

diff --git a/debian/colobot.install b/debian/colobot.install
index 6d594f1..ecd08f8 100644
--- a/debian/colobot.install
+++ b/debian/colobot.install
@@ -4,6 +4,7 @@ usr/share/applications/colobot.desktop
 usr/share/icons/hicolor/scalable/apps/colobot.svg
 usr/share/icons/hicolor/48x48/apps/colobot.png
 usr/share/icons/hicolor/32x32/apps/colobot.png
+debian/colobot.xpm usr/share/pixmaps/
 usr/share/icons/hicolor/16x16/apps/colobot.png
 usr/share/man/man6/colobot.6
 usr/share/man/*/man6/colobot.6
diff --git a/debian/colobot.menu b/debian/colobot.menu
new file mode 100644
index 0000000..6b8e812
--- /dev/null
+++ b/debian/colobot.menu
@@ -0,0 +1,6 @@
+?package(colobot):needs="X11" \
+  section="Games/Adventure" \
+  title="Colobot" \
+  longtitle="Colobot - Colonize with bots - Game to learn programming" \
+  icon="/usr/share/pixmaps/colobot.xpm" \
+  command="/usr/games/colobot"
diff --git a/debian/control b/debian/control
index 4102536..064d3f7 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,8 @@ Build-Depends:
  po4a,
  perl,
  google-mock,
- libgtest-dev
+ libgtest-dev,
+ imagemagick
 Build-Depends-Indep: doxygen, graphviz
 Vcs-Git: git://anonscm.debian.org/collab-maint/colobot.git -b debian
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/colobot.git
diff --git a/debian/rules b/debian/rules
index 171cbb8..67410d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,3 +14,9 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	dh_auto_build -a
 	dh_auto_build -i -- doc
+	# obj-* is the default builddirectory in debhelper
+	convert obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)/desktop/32/colobot.png debian/colobot.xpm
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f debian/colobot.xpm
-- 
1.8.4.rc3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 665 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.alioth.debian.org/pipermail/pkg-games-devel/attachments/20131217/621c3b22/attachment.sig>