[minetest-v04x] 03/10: Rename minetest icons and use the upstream name again.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository minetest-v04x.

commit 804d6b6fe2a77a9244c4878df34d6ac03c5114e9
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Jan 22 20:17:12 2015 +0100

    Rename minetest icons and use the upstream name again.
    
    Install minetest.xpm to /usr/share/pixmaps which is a better location for xpm
    files.
---
 debian/minetest.menu | 2 +-
 debian/rules         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/minetest.menu b/debian/minetest.menu
index bc139a4..621503f 100644
--- a/debian/minetest.menu
+++ b/debian/minetest.menu
@@ -3,5 +3,5 @@
         section="Games/Adventure" \
         command="/usr/games/minetest" \
         title="Minetest" \
-        icon="/usr/share/icons/hicolor/24x24/apps/minetest.xpm" \
+        icon="/usr/share/pixmaps/minetest.xpm" \
         longtitle="Multiplayer infinite-world block sandbox"
diff --git a/debian/rules b/debian/rules
index c9c58bf..7e81963 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,11 +80,11 @@ override_dh_install:
 	done
 	# copy the logo
 	mkdir -p debian/minetest/usr/share/icons/hicolor/24x24/apps/
-	cp misc/minetest-icon-24x24.png debian/minetest/usr/share/icons/hicolor/24x24/apps/minetest.png
-	convert debian/minetest/usr/share/icons/hicolor/24x24/apps/minetest.png \
-	        debian/minetest/usr/share/icons/hicolor/24x24/apps/minetest.xpm
+	cp misc/minetest-icon-24x24.png debian/minetest/usr/share/icons/hicolor/24x24/apps/minetest-icon.png
+	convert debian/minetest/usr/share/icons/hicolor/24x24/apps/minetest-icon.png \
+		debian/minetest/usr/share/pixmaps/minetest.xpm
 	mkdir -p debian/minetest/usr/share/icons/hicolor/scalable/apps/
-	cp misc/minetest-icon.svg       debian/minetest/usr/share/icons/hicolor/scalable/apps/minetest.svg
+	cp misc/minetest-icon.svg debian/minetest/usr/share/icons/hicolor/scalable/apps/
 	# take care of the fonts we need
 	mkdir -p debian/minetest-data/usr/share/games/minetest/fonts/
 	ln -s /usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf \

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