From 6cceaee699a303db093aabb192714ea05518f5cf Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 10 May 2009 16:36:58 +0200
Subject: Updated the .desktop file and included tmw.menu in tarball
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As suggested by Patrick Matthäi.
---
 Makefile.am               | 4 +++-
 packaging/debian/tmw.menu | 4 ----
 tmw.desktop               | 5 ++---
 tmw.menu                  | 4 ++++
 4 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 packaging/debian/tmw.menu
 create mode 100644 tmw.menu

diff --git a/Makefile.am b/Makefile.am
index 72c7461c..63a237d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,9 @@ desktopdir = $(datadir)/applications
 desktop_DATA = tmw.desktop
 
 # Extra files to include
-EXTRA_DIST = $(desktop_DATA) tmw.cbp
+EXTRA_DIST = $(desktop_DATA) \
+	     tmw.cbp \
+	     tmw.menu
 
 # Autopoint m4 stuff
 ACLOCAL_AMFLAGS = -I m4
diff --git a/packaging/debian/tmw.menu b/packaging/debian/tmw.menu
deleted file mode 100644
index 4af5ad0a..00000000
--- a/packaging/debian/tmw.menu
+++ /dev/null
@@ -1,4 +0,0 @@
-?package(tmw):needs="X11" section="Games/Adventure"\
- title="The Mana World"\
- description="The Mana World is an Online Fantasy adventure game."\
- command="/usr/games/tmw" icon="/usr/share/pixmaps/tmw.xpm"
diff --git a/tmw.desktop b/tmw.desktop
index 398fb439..d15ad3f7 100644
--- a/tmw.desktop
+++ b/tmw.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=The Mana World
 Name[fr]=Le Monde de Mana
 Comment=An on-line fantasy role playing game
@@ -12,5 +11,5 @@ Exec=tmw
 StartupNotify=false
 Terminal=false
 Type=Application
-Icon=tmw.png
-Categories=Application;Game
+Icon=tmw
+Categories=Application;Game;
diff --git a/tmw.menu b/tmw.menu
new file mode 100644
index 00000000..4af5ad0a
--- /dev/null
+++ b/tmw.menu
@@ -0,0 +1,4 @@
+?package(tmw):needs="X11" section="Games/Adventure"\
+ title="The Mana World"\
+ description="The Mana World is an Online Fantasy adventure game."\
+ command="/usr/games/tmw" icon="/usr/share/pixmaps/tmw.xpm"
-- 
cgit v1.2.3-70-g09d2