[nethack] 20/31: Replace menu files and the xpm icon with desktop files and a png

[James Cowgill]

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

jcowgill-guest pushed a commit to branch master
in repository nethack.

commit e975de58b0d86abd954e291e8d0da93b087afada
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat Mar 5 02:02:21 2016 +0000

    Replace menu files and the xpm icon with desktop files and a png
---
 debian/nethack-common.install  |   2 +-
 debian/nethack-console.desktop |   8 ++++++
 debian/nethack-console.install |   1 +
 debian/nethack-console.menu    |   6 -----
 debian/nethack-x11.desktop     |   4 +--
 debian/nethack-x11.menu        |   6 -----
 debian/nethack.png             | Bin 0 -> 418 bytes
 debian/nethack.xpm             |  56 -----------------------------------------
 8 files changed, 12 insertions(+), 71 deletions(-)

diff --git a/debian/nethack-common.install b/debian/nethack-common.install
index 65d2281..8127c55 100644
--- a/debian/nethack-common.install
+++ b/debian/nethack-common.install
@@ -8,7 +8,7 @@ util/dgn_comp         usr/lib/games/nethack
 util/dlb              usr/lib/games/nethack
 util/lev_comp         usr/lib/games/nethack
 util/recover          usr/lib/games/nethack
-debian/nethack.xpm    usr/share/pixmaps
+debian/nethack.png    usr/share/icons/hicolor/48x48/apps
 dat/mapbg.xpm         usr/share/pixmaps/nethack
 dat/pet_mark.xbm      usr/share/pixmaps/nethack
 dat/pilemark.xbm      usr/share/pixmaps/nethack
diff --git a/debian/nethack-console.desktop b/debian/nethack-console.desktop
new file mode 100644
index 0000000..0303ff5
--- /dev/null
+++ b/debian/nethack-console.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=NetHack (No GUI)
+Icon=nethack
+Exec=/usr/games/nethack-console
+Terminal=true
+Categories=Game;AdventureGame;ConsoleOnly
+Keywords=adventure;roguelike;maze;dungeon
diff --git a/debian/nethack-console.install b/debian/nethack-console.install
index 18b7b6a..9ebf8fe 100644
--- a/debian/nethack-console.install
+++ b/debian/nethack-console.install
@@ -1,3 +1,4 @@
 debian/console/nethackrc.console  etc/nethack
 debian/console/nethack-console.sh usr/lib/games/nethack
 src/nethack-console               usr/lib/games/nethack
+debian/nethack-console.desktop    usr/share/applications
diff --git a/debian/nethack-console.menu b/debian/nethack-console.menu
deleted file mode 100644
index 3fc183e..0000000
--- a/debian/nethack-console.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(nethack-console):needs="text" \
-        command="/usr/games/nethack-console" \
-	hints="Roguelike,Maze,Dungeon" \
-        section="Games/Adventure" \
-	title="NetHack (No GUI)" \
-	icon="/usr/share/pixmaps/nethack.xpm"
diff --git a/debian/nethack-x11.desktop b/debian/nethack-x11.desktop
index 61203c9..b9b37dd 100644
--- a/debian/nethack-x11.desktop
+++ b/debian/nethack-x11.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Name=X NetHack
-GenericName=NetHack (X interface)
 Icon=nethack
 Exec=/usr/games/xnethack
 Terminal=false
-Categories=Game;AdventureGame;
+Categories=Game;AdventureGame
+Keywords=adventure;roguelike;maze;dungeon
diff --git a/debian/nethack-x11.menu b/debian/nethack-x11.menu
deleted file mode 100644
index f019663..0000000
--- a/debian/nethack-x11.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(nethack-x11):needs="x11" \
-        command="/usr/games/xnethack" \
-	hints="Roguelike,Maze,Dungeon" \
-        section="Games/Adventure" \
-	title="X NetHack" \
-	icon="/usr/share/pixmaps/nethack.xpm"
diff --git a/debian/nethack.png b/debian/nethack.png
new file mode 100644
index 0000000..22da744
Binary files /dev/null and b/debian/nethack.png differ
diff --git a/debian/nethack.xpm b/debian/nethack.xpm
deleted file mode 100644
index 38a87ad..0000000
--- a/debian/nethack.xpm
+++ /dev/null
@@ -1,56 +0,0 @@
-/* XPM */
-static char *nethack[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 18 1",
-"  c black",
-". c #191919",
-"X c gray20",
-"o c #007f00",
-"O c #007f7f",
-"+ c #7f7f00",
-"@ c #4c4c4c",
-"# c #666667",
-"$ c gray50",
-"% c blue",
-"& c cyan",
-"* c yellow",
-"= c gray60",
-"- c #b2b2b2",
-"; c gray80",
-": c gray90",
-"> c white",
-", c None",
-/* pixels */
-",,,, ,  , ,     .   , , ., ,,,,,",
-",,,,, ,  , . , ,, ,  ,,  , ,,,,,",
-" ,   ,#X, , =$=$$=$., ,.#,   , ,",
-", , .,-: ,$:>>>>:::;=,,=-,. , ,,",
-" ,.X ,=>-#>>::::;;*::$+:-, .X, ,",
-" ,=>#.=>>>>>>:>:;;;;;;;;=.@;-, ,",
-".,=>>$=::>>:>>::;::;;;;;=+::-, ,",
-" ,O-$@->=-=-=$-=+=$#+=$;- .## .,",
-" ,#-#O;>--===-OOO$####@;- .##  ,",
-" ,=>>-->=====O-$$O#OOO#;=@::-  ,",
-" ,=>-$;>==-=-===#######;-.@;; .,",
-" ,.X  =>-====$==$Oo#O#o--. ..  ,",
-", , . =>====$$-O#$O###O;-     , ",
-" , ,  =>-==-=OO$O$O##O@;-   ,  ,",
-", , .,=>======O$O#####@;-.. , , ",
-",, , ,=>--====-O$##OO#@;-   , ,,",
-",,,, ,$>-====$$=#$O#O##-=.. , ,,",
-",,,,, ,::====$=OO$O##@-:   , ,,,",
-",,, , ,@:--==$=$#####$;#   ,  ,,",
-",, ,    :;--O=O=O#O#o=:.   , , ,",
-", , .,->->-OO==O$$#@$:X--.  ,  ,",
-"     =>>O::==--=$OO$:@ -:-. ,   ",
-", ,,->;-;$;:$O$$##$:XX$=-:-. , ,",
-"  ,->:O$>= ::O=#O=:@ #:=$$:-.,  ",
-" ,=>=-$O;+..;>>;;:@  @:$#$o:- , ",
-".,=>$OO$:=. .;>:;@ . @:+O=#-;. ,",
-" ,=>;;-:;.   X#@+    .-----;@  ,",
-" ,.;>>:;X   , , , , .,$:;:;;  , ",
-", ,.;;--.  ,          ,=---X , ,",
-" ,  , ,,, ,  , ,,,,,,,,,,, ,  , ",
-", ,        ,  ,,,,,,  ,   .  , ,",
-",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"
-};

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