[SCM] InfiniMiner/Minecraft-inspired open game world branch, master, updated. upstream/0.2.20110731.3-29-g29f7114

[Michael Gilbert]

The following commit has been merged in the master branch:
commit a9990e3c5b4b06a6c5ad93bd34ac659a13269a96
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sun Nov 27 03:47:09 2011 -0500

    desktop menu entry

diff --git a/debian/changelog b/debian/changelog
index 466c386..3550f45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ minetest (0.3.1+dfsg-1) unstable; urgency=low
   * Build against jthread 1.3.1.
   * Implement get-orig-source to generate dfsg-free upstream tarball.
   * Build using dfsg-free tarball.
+  * Install freedesktop menu and icons.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sat, 26 Nov 2011 22:27:53 -0500
 
diff --git a/debian/control b/debian/control
index 7e5eae4..4c465a5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends:
  debhelper (>= 8),
  cmake,
  libbz2-dev,
+ imagemagick,
  libpng12-dev,
  libjpeg8-dev,
  libjthread-dev,
diff --git a/debian/minetest.install b/debian/minetest.install
new file mode 100644
index 0000000..145a829
--- /dev/null
+++ b/debian/minetest.install
@@ -0,0 +1,3 @@
+minetest.png usr/share/icons/hicolor/24x24/apps
+minetest.xpm usr/share/icons/hicolor/24x24/apps
+minetest.svg usr/share/icons/hicolor/scalable/apps
diff --git a/debian/minetest.menu b/debian/minetest.menu
new file mode 100644
index 0000000..1b9b042
--- /dev/null
+++ b/debian/minetest.menu
@@ -0,0 +1,7 @@
+?package(minetest):\
+        needs="x11" \
+        section="Games/Adventure" \
+        command="/usr/games/minetest" \
+        title="Minetest" \
+        icon="/usr/share/icons/hicolor/24x24/apps/minetest.xpm" \
+        longtitle="Minetest: minecraft/infiniminer game"
diff --git a/debian/rules b/debian/rules
index 38e6d27..59874b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,10 @@ cleanremovals= bin \
 	       src/cmake_config.h \
 	       src/cmake_install.cmake \
 	       locale \
-	       install_manifest.txt
+	       install_manifest.txt \
+	       minetest.xpm \
+	       minetest.svg \
+	       minetest.png
 
 override_dh_auto_clean:
 	dh_clean
@@ -58,6 +61,9 @@ override_dh_auto_build:
 	sed -e s/JMutex/jthread\:\:JMutex/g -e s/JThread/jthread\:\:JThread/g \
 	    -i ${sources} ${headers}
 	make VERBOSE=1 ${parallel}
+	cp minetest-icon-24x24.png minetest.png
+	cp minetest-icon.svg minetest.svg
+	convert minetest.png minetest.xpm
 
 get-orig-source:
 	uscan && mv ../${version} ../minetest_${version}.orig.tar.gz || true

-- 
InfiniMiner/Minecraft-inspired open game world