From 1085e678c07a6d2ccc7258695a5e68da9723c8a3 Mon Sep 17 00:00:00 2001
From: HEXcube <hexcubed@gmail.com>
Date: Wed, 2 Sep 2015 16:22:12 +0530
Subject: [PATCH] Rename minetest-icon.svg to minetest.svg - Fixes #1564

-Complies with the Linux standard freedesktop icon naming specs: http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html#guidelines
-Ensures compatibility with icon themes
-Edit minetest.desktop, CMakeLists.txt and README.md to reflect this change
---
 CMakeLists.txt                           | 2 +-
 README.txt                               | 2 +-
 misc/minetest.desktop                    | 2 +-
 misc/{minetest-icon.svg => minetest.svg} | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename misc/{minetest-icon.svg => minetest.svg} (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92ef53ef3..15774d564 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,7 @@ if(UNIX AND NOT APPLE)
 	install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
 	install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
 	install(FILES "misc/minetest.appdata.xml" DESTINATION "${APPDATADIR}")
-	install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
+	install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
 endif()
 
 if(APPLE)
diff --git a/README.txt b/README.txt
index 06122dee1..0760faf67 100644
--- a/README.txt
+++ b/README.txt
@@ -381,7 +381,7 @@ BlockMen:
 erlehmann:
   misc/minetest-icon-24x24.png
   misc/minetest-icon.ico
-  misc/minetest-icon.svg
+  misc/minetest.svg
   textures/base/pack/logo.png
 
 License of Minetest source code
diff --git a/misc/minetest.desktop b/misc/minetest.desktop
index 4257cef37..1d2430a2c 100644
--- a/misc/minetest.desktop
+++ b/misc/minetest.desktop
@@ -9,7 +9,7 @@ Comment[ja]=マルチプレイに対応した、無限の世界のブロック
 Comment[ru]=Игра-песочница с безграничным миром, состоящим из блоков
 Comment[tr]=Tek-Çok oyuncuyla küplerden sonsuz dünyalar inşa et
 Exec=minetest
-Icon=minetest-icon
+Icon=minetest
 Terminal=false
 Type=Application
 Categories=Game;
diff --git a/misc/minetest-icon.svg b/misc/minetest.svg
similarity index 99%
rename from misc/minetest-icon.svg
rename to misc/minetest.svg
index 46c9ac702..fe036c3dd 100644
--- a/misc/minetest-icon.svg
+++ b/misc/minetest.svg
@@ -14,7 +14,7 @@
    id="svg2856"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="minetest-icon.svg"
+   sodipodi:docname="minetest.svg"
    inkscape:export-filename="/home/erlehmann/pics/icons/minetest/minetest-icon-24x24.png"
    inkscape:export-xdpi="45"
    inkscape:export-ydpi="45">