[SCM] team based FPS game - packaging branch, debian, updated. debian/1.1.0-4.1-33-g855d6ce

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 8600314fcdb567fe1e68a4f3d1a45fd58e101052
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jul 17 13:47:25 2010 +0100

    Correct .desktop categories, and remove obsolete Encoding key

diff --git a/debian/changelog b/debian/changelog
index c77013e..029316b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ tremulous (1.1.0-5) UNRELEASED; urgency=low
   * Fix hyphen/minus confusion in man pages
   * Fail prerm on errors
   * Stop creating empty directories
+  * Correct .desktop categories, and remove obsolete Encoding key
 
  -- Simon McVittie <smcv at debian.org>  Mon, 12 Jul 2010 22:22:25 +0100
 
diff --git a/debian/tremulous.desktop b/debian/tremulous.desktop
index 734cc6f..4464914 100644
--- a/debian/tremulous.desktop
+++ b/debian/tremulous.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=Tremulous
 Comment=Aliens vs Humans, First Person Shooter game with elements of Real Time Strategy
 Comment[de]=Ein 3D Egoshooter in dem es um Menschen gegen Aliens geht
@@ -9,4 +8,4 @@ Exec=/usr/games/tremulous --quiet
 Icon=/usr/share/pixmaps/tremulous.xpm
 Terminal=false
 Type=Application
-Categories=Application;Game;ArcadeGame;
+Categories=Game;ActionGame;StrategyGame;

-- 
team based FPS game - packaging