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

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 9866429b84f64547658b463f8dc71942fdb117d0
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Apr 21 15:51:31 2012 -0400

    move binaries to /usr/games in install files

diff --git a/debian/minetest-server.install b/debian/minetest-server.install
index fbdae2d..4835764 100644
--- a/debian/minetest-server.install
+++ b/debian/minetest-server.install
@@ -1 +1 @@
-usr/games/minetestserver
+usr/bin/minetestserver usr/games
diff --git a/debian/minetest.install b/debian/minetest.install
index 16889c4..b7eeeaa 100644
--- a/debian/minetest.install
+++ b/debian/minetest.install
@@ -1,4 +1,4 @@
-usr/games/minetest
+usr/bin/minetest usr/games
 debian/minetest.desktop /usr/share/applications
 minetest.png usr/share/icons/hicolor/24x24/apps
 minetest.xpm usr/share/icons/hicolor/24x24/apps
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index c2e4c35..ea2ea49 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -2,8 +2,8 @@ Description: install binaries to /usr/games and don't install changelog twice
 Author: Michael Gilbert <michael.s.gilbert at gmail.com>
 Index: minetest/src/CMakeLists.txt
 ===================================================================
---- minetest.orig/src/CMakeLists.txt	2011-11-27 03:35:38.000000000 -0500
-+++ minetest/src/CMakeLists.txt	2011-11-27 03:35:40.000000000 -0500
+--- minetest.orig/src/CMakeLists.txt	2012-04-21 15:46:36.000000000 -0400
++++ minetest/src/CMakeLists.txt	2012-04-21 15:47:03.000000000 -0400
 @@ -265,7 +265,7 @@
  		set(ARCH i386)
  	endif()
@@ -15,16 +15,9 @@ Index: minetest/src/CMakeLists.txt
  	if(USE_GPROF)
 Index: minetest/CMakeLists.txt
 ===================================================================
---- minetest.orig/CMakeLists.txt	2011-11-27 03:35:38.000000000 -0500
-+++ minetest/CMakeLists.txt	2011-11-27 03:35:50.000000000 -0500
-@@ -61,13 +61,12 @@
- 	set(EXAMPLE_CONF_DIR ".")
- elseif(UNIX) # Linux, BSD etc
- 	set(DATADIR "share/${PROJECT_NAME}")
--	set(BINDIR "bin")
-+	set(BINDIR "games")
- 	set(DOCDIR "share/doc/${PROJECT_NAME}")
- 	set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
+--- minetest.orig/CMakeLists.txt	2012-04-21 15:46:36.000000000 -0400
++++ minetest/CMakeLists.txt	2012-04-21 15:47:27.000000000 -0400
+@@ -67,7 +67,6 @@
  endif()
  
  install(FILES "README.txt" DESTINATION "${DOCDIR}")
@@ -34,8 +27,8 @@ Index: minetest/CMakeLists.txt
  #
 Index: minetest/cmake/Modules/FindIrrlicht.cmake
 ===================================================================
---- minetest.orig/cmake/Modules/FindIrrlicht.cmake	2011-11-27 03:35:38.000000000 -0500
-+++ minetest/cmake/Modules/FindIrrlicht.cmake	2011-11-27 03:35:40.000000000 -0500
+--- minetest.orig/cmake/Modules/FindIrrlicht.cmake	2012-04-21 15:46:36.000000000 -0400
++++ minetest/cmake/Modules/FindIrrlicht.cmake	2012-04-21 15:47:03.000000000 -0400
 @@ -50,7 +50,7 @@
  		/usr/include/irrlicht
  	)

-- 
InfiniMiner/Minecraft-inspired open game world